From afcae9b7a0a6009d33581fac78416fc9623a8a18 Mon Sep 17 00:00:00 2001 From: "jk7744.park" Date: Tue, 8 Sep 2015 22:24:27 +0900 Subject: [PATCH] tizen 2.3.1 release --- .gitignore | 2 + .mailmap | 7 + CMakeLists.txt | 253 + ChangeLog | 6629 ++++---- ChangeLog.21 | 2 +- ChangeLog.23 | 2 +- ChangeLog.24 | 6360 ++++++++ Jamfile | 12 +- LICENSE | 169 + LICENSE.GPL-2.0 | 340 + README | 60 +- README.git | 6 +- TC/_export_env.sh | 9 - TC/_export_target_env.sh | 7 - TC/build.sh | 16 - TC/clean.sh | 11 - TC/config | 2 - TC/execute.sh | 15 - TC/testcase/Makefile | 24 - TC/testcase/tslist | 9 - TC/testcase/utc_ft_bench.c | 36 - TC/testcase/utc_ft_diff.c | 36 - TC/testcase/utc_ft_dump.c | 36 - TC/testcase/utc_ft_gamma.c | 36 - TC/testcase/utc_ft_grid.c | 36 - TC/testcase/utc_ft_lint.c | 36 - TC/testcase/utc_ft_multi.c | 36 - TC/testcase/utc_ft_string.c | 36 - TC/testcase/utc_ft_view.c | 36 - TC/tet_scen | 7 - TC/tetbuild.cfg | 5 - TC/tetclean.cfg | 5 - TC/tetexec.cfg | 5 - autogen.sh | 8 +- builds/amiga/README | 13 +- .../amiga/include/{freetype => }/config/ftconfig.h | 8 +- .../amiga/include/{freetype => }/config/ftmodule.h | 0 builds/amiga/makefile | 4 +- builds/amiga/makefile.os4 | 4 +- builds/amiga/smakefile | 4 +- builds/amiga/src/base/ftdebug.c | 50 +- builds/amiga/src/base/ftsystem.c | 14 +- builds/atari/deflinejoiner.awk | 6 +- builds/cmake/iOS.cmake | 275 + builds/compiler/bcc-dev.mk | 2 +- builds/detect.mk | 10 +- builds/dos/detect.mk | 8 +- builds/exports.mk | 2 +- builds/freetype.mk | 42 +- builds/mac/README | 20 +- builds/mac/freetype-Info.plist | 36 + builds/mac/ftmac.c | 92 +- builds/modules.mk | 4 +- builds/symbian/bld.inf | 92 +- builds/toplevel.mk | 15 +- builds/unix/.gitignore | 1 + builds/unix/aclocal.m4 | 87 +- builds/unix/config.guess | 184 +- builds/unix/config.sub | 106 +- builds/unix/configure | 15424 ++++++++++--------- builds/unix/configure.ac | 450 +- builds/unix/configure.raw | 448 +- builds/unix/detect.mk | 7 +- builds/unix/freetype-config.in | 49 +- builds/unix/freetype2.in | 16 +- builds/unix/freetype2.m4 | 6 +- builds/unix/ft2unix.h | 61 - builds/unix/ftconfig.in | 292 +- builds/unix/ftsystem.c | 17 +- builds/unix/install-sh | 14 +- builds/unix/install.mk | 60 +- builds/unix/ltmain.sh | 32 +- builds/unix/pkg.m4 | 199 + builds/unix/unix-def.in | 91 +- builds/vms/ftconfig.h | 169 +- builds/vms/ftsystem.c | 8 +- builds/win32/vc2010/freetype.vcxproj | 832 - builds/win32/vc2010/index.html | 37 - builds/wince/ftdebug.c | 33 +- builds/wince/vc2005-ce/freetype.vcproj | 86 +- builds/wince/vc2005-ce/index.html | 10 +- builds/wince/vc2008-ce/freetype.vcproj | 86 +- builds/wince/vc2008-ce/index.html | 10 +- builds/windows/.gitignore | 5 + builds/{win32 => windows}/detect.mk | 13 +- builds/{win32 => windows}/ftdebug.c | 39 +- builds/{win32 => windows}/vc2005/freetype.sln | 0 builds/{win32 => windows}/vc2005/freetype.vcproj | 22 +- builds/{win32 => windows}/vc2005/index.html | 10 +- builds/{win32 => windows}/vc2008/freetype.sln | 0 builds/{win32 => windows}/vc2008/freetype.vcproj | 22 +- builds/{win32 => windows}/vc2008/index.html | 10 +- builds/{win32 => windows}/vc2010/freetype.sln | 32 +- builds/windows/vc2010/freetype.user.props | 68 + builds/windows/vc2010/freetype.vcxproj | 1718 +++ .../vc2010/freetype.vcxproj.filters | 10 +- builds/windows/vc2010/index.html | 52 + builds/{win32 => windows}/visualc/freetype.dsp | 48 +- .../visualce => windows/visualc}/freetype.dsw | 0 builds/{win32 => windows}/visualc/freetype.sln | 0 builds/{win32 => windows}/visualc/freetype.vcproj | 22 +- builds/{win32 => windows}/visualc/index.html | 10 +- builds/{win32 => windows}/visualce/freetype.dsp | 48 +- .../visualc => windows/visualce}/freetype.dsw | 0 builds/{win32 => windows}/visualce/freetype.vcproj | 94 +- builds/{win32 => windows}/visualce/index.html | 10 +- builds/{win32 => windows}/w32-bcc.mk | 4 +- builds/{win32 => windows}/w32-bccd.mk | 4 +- builds/{win32 => windows}/w32-dev.mk | 4 +- builds/{win32 => windows}/w32-gcc.mk | 4 +- builds/{win32 => windows}/w32-icc.mk | 4 +- builds/{win32 => windows}/w32-intl.mk | 4 +- builds/{win32 => windows}/w32-lcc.mk | 4 +- builds/{win32 => windows}/w32-mingw32.mk | 4 +- builds/{win32 => windows}/w32-vcc.mk | 4 +- builds/{win32 => windows}/w32-wat.mk | 4 +- builds/{win32 => windows}/win32-def.mk | 6 +- configure | 34 +- debian/changelog | 104 - debian/compat | 1 - debian/control | 68 - debian/copyright | 22 - debian/dirs | 2 - debian/docs | 6 - debian/libfreetype6-dev.install.in | 7 - debian/libfreetype6.install.in | 1 - debian/rules | 119 - devel/ft2build.h | 29 +- devel/ftoption.h | 172 +- docs/CHANGES | 538 +- docs/CMAKE | 2 + docs/CUSTOMIZE | 47 +- docs/DEBUG | 182 +- docs/INSTALL | 9 +- docs/INSTALL.ANY | 34 +- docs/INSTALL.CROSS | 96 +- docs/INSTALL.GNU | 26 +- docs/INSTALL.UNIX | 27 +- docs/LICENSE.TXT | 3 + docs/VERSION.DLL | 64 +- docs/formats.txt | 2 +- docs/freetype-config.1 | 108 + docs/reference/ft2-base_interface.html | 3608 ----- docs/reference/ft2-basic_types.html | 1173 -- docs/reference/ft2-bdf_fonts.html | 260 - docs/reference/ft2-bitmap_handling.html | 302 - docs/reference/ft2-cache_subsystem.html | 1170 -- docs/reference/ft2-cid_fonts.html | 204 - docs/reference/ft2-computations.html | 832 - docs/reference/ft2-font_formats.html | 84 - docs/reference/ft2-gasp_table.html | 142 - docs/reference/ft2-glyph_management.html | 673 - docs/reference/ft2-glyph_stroker.html | 938 -- docs/reference/ft2-glyph_variants.html | 267 - docs/reference/ft2-gx_validation.html | 356 - docs/reference/ft2-gzip.html | 94 - docs/reference/ft2-header_file_macros.html | 853 - docs/reference/ft2-incremental.html | 401 - docs/reference/ft2-index.html | 294 - docs/reference/ft2-lcd_filtering.html | 192 - docs/reference/ft2-list_processing.html | 486 - docs/reference/ft2-lzw.html | 94 - docs/reference/ft2-mac_specific.html | 368 - docs/reference/ft2-module_management.html | 667 - docs/reference/ft2-multiple_masters.html | 511 - docs/reference/ft2-ot_validation.html | 208 - docs/reference/ft2-outline_processing.html | 1125 -- docs/reference/ft2-pfr_fonts.html | 206 - docs/reference/ft2-quick_advance.html | 185 - docs/reference/ft2-raster.html | 606 - docs/reference/ft2-sfnt_names.html | 232 - docs/reference/ft2-sizes_management.html | 164 - docs/reference/ft2-system_interface.html | 415 - docs/reference/ft2-toc.html | 219 - docs/reference/ft2-truetype_engine.html | 132 - docs/reference/ft2-truetype_tables.html | 1223 -- docs/reference/ft2-type1_tables.html | 689 - docs/reference/ft2-user_allocation.html | 47 - docs/reference/ft2-version.html | 219 - docs/reference/ft2-winfnt_fonts.html | 278 - docs/release | 47 +- ft2demos/ftbench | Bin 46956 -> 0 bytes ft2demos/ftdiff | Bin 277845 -> 0 bytes ft2demos/ftdump | Bin 49731 -> 0 bytes ft2demos/ftgamma | Bin 252489 -> 0 bytes ft2demos/ftgrid | Bin 283609 -> 0 bytes ft2demos/ftlint | Bin 29199 -> 0 bytes ft2demos/ftmulti | Bin 229917 -> 0 bytes ft2demos/ftstring | Bin 265571 -> 0 bytes ft2demos/ftview | Bin 279965 -> 0 bytes include/{freetype => }/config/ftconfig.h | 231 +- include/{freetype => }/config/ftheader.h | 153 +- include/{freetype => }/config/ftmodule.h | 0 include/{freetype => }/config/ftoption.h | 172 +- include/{freetype => }/config/ftstdlib.h | 4 +- include/{freetype => }/freetype.h | 519 +- include/freetype/internal/internal.h | 51 - include/ft2build.h | 23 +- include/{freetype => }/ftadvanc.h | 32 +- include/ftautoh.h | 402 + include/{freetype => }/ftbbox.h | 7 +- include/{freetype => }/ftbdf.h | 9 +- include/{freetype => }/ftbitmap.h | 15 +- include/{freetype => }/ftbzip2.h | 2 +- include/{freetype => }/ftcache.h | 95 +- include/ftcffdrv.h | 262 + include/{freetype => }/ftchapters.h | 19 +- include/{freetype => }/ftcid.h | 3 +- include/{freetype => }/fterrdef.h | 184 +- include/{freetype => }/fterrors.h | 23 +- include/{freetype => }/ftgasp.h | 3 +- include/{freetype => }/ftglyph.h | 31 +- include/{freetype => }/ftgxval.h | 35 +- include/{freetype => }/ftgzip.h | 50 +- include/{freetype => }/ftimage.h | 235 +- include/{freetype => }/ftincrem.h | 5 +- include/{freetype => }/ftlcdfil.h | 44 +- include/{freetype => }/ftlist.h | 15 +- include/{freetype => }/ftlzw.h | 2 +- include/{freetype => }/ftmac.h | 6 +- include/{freetype => }/ftmm.h | 11 +- include/{freetype => }/ftmodapi.h | 202 +- include/{freetype => }/ftmoderr.h | 64 +- include/{freetype => }/ftotval.h | 19 +- include/{freetype => }/ftoutln.h | 66 +- include/{freetype => }/ftpfr.h | 2 +- include/{freetype => }/ftrender.h | 1 - include/{freetype => }/ftsizes.h | 4 +- include/{freetype => }/ftsnames.h | 6 +- include/{freetype => }/ftstroke.h | 56 +- include/{freetype => }/ftsynth.h | 10 +- include/{freetype => }/ftsystem.h | 12 +- include/{freetype => }/fttrigon.h | 14 +- include/ftttdrv.h | 170 + include/{freetype => }/fttypes.h | 40 +- include/{freetype => }/ftwinfnt.h | 9 +- include/{freetype => }/ftxf86.h | 7 +- include/{freetype => }/internal/autohint.h | 71 +- include/{freetype => }/internal/ftcalc.h | 323 +- include/{freetype => }/internal/ftdebug.h | 29 +- include/{freetype => }/internal/ftdriver.h | 398 +- include/{freetype => }/internal/ftgloadr.h | 30 +- include/{freetype => }/internal/ftmemory.h | 176 +- include/{freetype => }/internal/ftobjs.h | 832 +- include/{freetype => }/internal/ftpic.h | 32 +- include/{freetype => }/internal/ftrfork.h | 49 +- include/{freetype => }/internal/ftserv.h | 143 +- include/{freetype => }/internal/ftstream.h | 87 +- include/{freetype => }/internal/fttrace.h | 12 +- include/{freetype => }/internal/ftvalid.h | 37 +- include/internal/internal.h | 63 + include/{freetype => }/internal/psaux.h | 10 +- include/{freetype => }/internal/pshints.h | 44 +- include/{freetype => }/internal/services/svbdf.h | 0 include/{freetype => }/internal/services/svcid.h | 0 .../{freetype => }/internal/services/svgldict.h | 0 include/{freetype => }/internal/services/svgxval.h | 0 include/{freetype => }/internal/services/svkern.h | 0 include/{freetype => }/internal/services/svmm.h | 0 include/{freetype => }/internal/services/svotval.h | 0 include/{freetype => }/internal/services/svpfr.h | 0 .../{freetype => }/internal/services/svpostnm.h | 0 include/internal/services/svprop.h | 81 + .../{freetype => }/internal/services/svpscmap.h | 0 .../{freetype => }/internal/services/svpsinfo.h | 0 include/{freetype => }/internal/services/svsfnt.h | 0 .../{freetype => }/internal/services/svttcmap.h | 4 +- include/{freetype => }/internal/services/svtteng.h | 0 .../{freetype => }/internal/services/svttglyf.h | 0 .../{freetype => }/internal/services/svwinfnt.h | 0 .../{freetype => }/internal/services/svxf86nm.h | 0 include/{freetype => }/internal/sfnt.h | 468 +- include/{freetype => }/internal/t1types.h | 6 +- include/{freetype => }/internal/tttypes.h | 229 +- include/{freetype => }/t1tables.h | 120 +- include/{freetype => }/ttnameid.h | 250 +- include/{freetype => }/tttables.h | 114 +- include/{freetype => }/tttags.h | 6 +- include/{freetype => }/ttunpat.h | 3 +- modules.cfg | 50 +- objs/.gitignore | 6 + packaging/freetype.manifest | 5 + packaging/freetype.spec | 21 +- src/Jamfile | 4 +- src/autofit/afangles.c | 125 +- src/autofit/afblue.c | 177 + src/autofit/afblue.cin | 39 + src/autofit/afblue.dat | 337 + src/autofit/afblue.h | 203 + src/autofit/afblue.hin | 142 + src/autofit/afcjk.c | 752 +- src/autofit/afcjk.h | 67 +- src/autofit/afcover.h | 105 + src/autofit/afdummy.c | 46 +- src/autofit/afdummy.h | 8 +- src/autofit/afglobal.c | 399 +- src/autofit/afglobal.h | 97 +- src/autofit/afhints.c | 561 +- src/autofit/afhints.h | 140 +- src/autofit/afindic.c | 61 +- src/autofit/afindic.h | 9 +- src/autofit/aflatin.c | 1063 +- src/autofit/aflatin.h | 77 +- src/autofit/aflatin2.c | 227 +- src/autofit/aflatin2.h | 10 +- src/autofit/afloader.c | 111 +- src/autofit/afloader.h | 34 +- src/autofit/afmodule.c | 264 +- src/autofit/afmodule.h | 24 +- src/autofit/afpic.c | 120 +- src/autofit/afpic.h | 69 +- src/autofit/afranges.c | 220 + src/autofit/afranges.h | 41 + src/autofit/afscript.h | 139 + src/autofit/afstyles.h | 164 + src/autofit/aftypes.h | 471 +- src/autofit/afwrtsys.h | 52 + src/autofit/autofit.c | 7 +- src/autofit/hbshim.c | 545 + src/autofit/hbshim.h | 56 + src/autofit/rules.mk | 13 +- src/base/basepic.c | 49 +- src/base/basepic.h | 45 +- src/base/ftadvanc.c | 26 +- src/base/ftbbox.c | 512 +- src/base/ftbdf.c | 43 +- src/base/ftbitmap.c | 269 +- src/base/ftcalc.c | 537 +- src/base/ftcid.c | 8 +- src/base/ftdbgmem.c | 105 +- src/base/ftdebug.c | 30 +- src/base/ftfstype.c | 4 +- src/base/ftgloadr.c | 12 +- src/base/ftglyph.c | 100 +- src/base/ftgxval.c | 20 +- src/base/ftinit.c | 32 +- src/base/ftlcdfil.c | 56 +- src/base/ftmac.c | 98 +- src/base/ftmm.c | 50 +- src/base/ftobjs.c | 814 +- src/base/ftotval.c | 10 +- src/base/ftoutln.c | 356 +- src/base/ftpfr.c | 23 +- src/base/ftpic.c | 5 +- src/base/ftrfork.c | 76 +- src/base/ftsnames.c | 2 +- src/base/ftstream.c | 60 +- src/base/ftstroke.c | 106 +- src/base/ftsynth.c | 37 +- src/base/ftsystem.c | 8 +- src/base/fttrigon.c | 368 +- src/base/fttype1.c | 45 +- src/base/ftutil.c | 142 +- src/base/ftwinfnt.c | 22 +- src/base/md5.c | 296 + src/base/md5.h | 45 + src/base/rules.mk | 16 +- src/bdf/bdfdrivr.c | 67 +- src/bdf/bdflib.c | 226 +- src/bzip2/ftbzip2.c | 38 +- src/cache/Jamfile | 4 +- src/cache/ftcbasic.c | 354 +- src/cache/ftccache.c | 11 +- src/cache/ftccache.h | 13 +- src/cache/ftccback.h | 5 +- src/cache/ftccmap.c | 120 +- src/cache/ftcmanag.c | 101 +- src/cache/ftcmanag.h | 6 +- src/cache/ftcmru.h | 4 +- src/cache/ftcsbits.c | 16 +- src/cff/cf2arrst.c | 241 + src/cff/cf2arrst.h | 100 + src/cff/cf2blues.c | 579 + src/cff/cf2blues.h | 185 + src/cff/cf2error.c | 52 + src/cff/cf2error.h | 119 + src/cff/cf2fixed.h | 95 + src/cff/cf2font.c | 512 + src/cff/cf2font.h | 116 + src/cff/cf2ft.c | 691 + src/cff/cf2ft.h | 147 + src/cff/cf2glue.h | 144 + src/cff/cf2hints.c | 1847 +++ src/cff/cf2hints.h | 289 + src/cff/cf2intrp.c | 1545 ++ src/cff/cf2intrp.h | 83 + src/cff/cf2read.c | 112 + src/cff/cf2read.h | 68 + src/cff/cf2stack.c | 205 + src/cff/cf2stack.h | 106 + src/cff/cf2types.h | 78 + src/cff/cff.c | 13 +- src/cff/cffcmap.c | 16 +- src/cff/cffdrivr.c | 229 +- src/cff/cffgload.c | 259 +- src/cff/cffgload.h | 41 +- src/cff/cffload.c | 115 +- src/cff/cffobjs.c | 106 +- src/cff/cffobjs.h | 14 +- src/cff/cffparse.c | 163 +- src/cff/cffpic.c | 72 +- src/cff/cffpic.h | 81 +- src/cff/cfftypes.h | 5 +- src/cff/rules.mk | 19 +- src/cid/cidgload.c | 12 +- src/cid/cidload.c | 57 +- src/cid/cidobjs.c | 19 +- src/cid/cidparse.c | 14 +- src/cid/cidparse.h | 22 +- src/cid/cidriver.c | 17 +- src/gxvalid/gxvbsln.c | 56 +- src/gxvalid/gxvcommn.c | 284 +- src/gxvalid/gxvcommn.h | 80 +- src/gxvalid/gxverror.h | 6 +- src/gxvalid/gxvfeat.c | 38 +- src/gxvalid/gxvjust.c | 188 +- src/gxvalid/gxvkern.c | 156 +- src/gxvalid/gxvlcar.c | 36 +- src/gxvalid/gxvmod.c | 10 +- src/gxvalid/gxvmort.c | 53 +- src/gxvalid/gxvmort.h | 14 +- src/gxvalid/gxvmort0.c | 16 +- src/gxvalid/gxvmort1.c | 54 +- src/gxvalid/gxvmort2.c | 46 +- src/gxvalid/gxvmort4.c | 18 +- src/gxvalid/gxvmort5.c | 30 +- src/gxvalid/gxvmorx.c | 36 +- src/gxvalid/gxvmorx.h | 10 +- src/gxvalid/gxvmorx0.c | 16 +- src/gxvalid/gxvmorx1.c | 50 +- src/gxvalid/gxvmorx2.c | 52 +- src/gxvalid/gxvmorx4.c | 4 +- src/gxvalid/gxvmorx5.c | 34 +- src/gxvalid/gxvopbd.c | 32 +- src/gxvalid/gxvprop.c | 38 +- src/gxvalid/gxvtrak.c | 46 +- src/gzip/ftgzip.c | 136 +- src/gzip/inftrees.c | 10 +- src/gzip/rules.mk | 57 +- src/lzw/ftlzw.c | 30 +- src/lzw/ftzopen.h | 2 +- src/otvalid/otvbase.c | 50 +- src/otvalid/otvcommn.c | 170 +- src/otvalid/otvcommn.h | 158 +- src/otvalid/otverror.h | 4 +- src/otvalid/otvgdef.c | 36 +- src/otvalid/otvgpos.c | 186 +- src/otvalid/otvgsub.c | 108 +- src/otvalid/otvjstf.c | 83 +- src/otvalid/otvmath.c | 72 +- src/otvalid/otvmod.c | 8 +- src/pcf/README | 2 +- src/pcf/pcfdrivr.c | 88 +- src/pcf/pcfread.c | 252 +- src/pcf/pcfutil.c | 12 +- src/pfr/pfrcmap.c | 23 +- src/pfr/pfrdrivr.c | 18 +- src/pfr/pfrgload.c | 18 +- src/pfr/pfrload.c | 31 +- src/pfr/pfrobjs.c | 22 +- src/pfr/pfrsbit.c | 22 +- src/psaux/afmparse.c | 45 +- src/psaux/psconv.c | 215 +- src/psaux/psconv.h | 10 +- src/psaux/psobjs.c | 155 +- src/psaux/t1cmap.c | 22 +- src/psaux/t1decode.c | 80 +- src/pshinter/pshalgo.c | 20 +- src/pshinter/pshalgo.h | 11 +- src/pshinter/pshglob.c | 57 +- src/pshinter/pshglob.h | 4 +- src/pshinter/pshmod.c | 17 +- src/pshinter/pshpic.c | 17 +- src/pshinter/pshpic.h | 16 +- src/pshinter/pshrec.c | 54 +- src/pshinter/pshrec.h | 4 +- src/psnames/psmodule.c | 58 +- src/psnames/pspic.c | 19 +- src/psnames/pspic.h | 23 +- src/psnames/rules.mk | 4 +- src/raster/ftmisc.h | 21 + src/raster/ftraster.c | 155 +- src/raster/ftrend1.c | 21 +- src/raster/rastpic.c | 32 +- src/raster/rastpic.h | 18 +- src/sfnt/pngshim.c | 377 + src/sfnt/pngshim.h | 49 + src/sfnt/rules.mk | 10 +- src/sfnt/sfdriver.c | 342 +- src/sfnt/sferrors.h | 4 +- src/sfnt/sfnt.c | 3 +- src/sfnt/sfntpic.c | 37 +- src/sfnt/sfntpic.h | 81 +- src/sfnt/sfobjs.c | 545 +- src/sfnt/ttbdf.c | 16 +- src/sfnt/ttcmap.c | 505 +- src/sfnt/ttcmap.h | 99 +- src/sfnt/ttcmapc.h | 19 +- src/sfnt/ttkern.c | 10 +- src/sfnt/ttload.c | 118 +- src/sfnt/ttmtx.c | 216 +- src/sfnt/ttmtx.h | 4 +- src/sfnt/ttpost.c | 32 +- src/sfnt/ttsbit.c | 2262 ++- src/sfnt/ttsbit.h | 22 +- src/sfnt/ttsbit0.c | 1011 -- src/smooth/ftgrays.c | 265 +- src/smooth/ftsmooth.c | 177 +- src/smooth/ftspic.c | 37 +- src/smooth/ftspic.h | 17 +- src/tools/afblue.pl | 548 + src/tools/apinames.c | 28 +- src/tools/chktrcmp.py | 4 +- src/tools/cordic.py | 62 +- src/tools/docmaker/content.py | 229 +- src/tools/docmaker/docmaker.py | 39 +- src/tools/docmaker/formatter.py | 73 +- src/tools/docmaker/sources.py | 236 +- src/tools/docmaker/tohtml.py | 478 +- src/tools/docmaker/utils.py | 81 +- src/tools/ftrandom/README | 2 +- src/tools/ftrandom/ftrandom.c | 38 +- src/tools/test_afm.c | 2 +- src/tools/test_bbox.c | 34 +- src/tools/test_trig.c | 98 +- src/truetype/rules.mk | 5 +- src/truetype/truetype.c | 3 +- src/truetype/ttdriver.c | 137 +- src/truetype/ttgload.c | 734 +- src/truetype/ttgload.h | 1 + src/truetype/ttgxvar.c | 109 +- src/truetype/ttinterp.c | 1938 ++- src/truetype/ttinterp.h | 102 +- src/truetype/ttobjs.c | 258 +- src/truetype/ttobjs.h | 35 +- src/truetype/ttpic.c | 21 +- src/truetype/ttpic.h | 39 +- src/truetype/ttpload.c | 38 +- src/truetype/ttsubpix.c | 1011 ++ src/truetype/ttsubpix.h | 110 + src/type1/t1afm.c | 22 +- src/type1/t1driver.c | 45 +- src/type1/t1gload.c | 16 +- src/type1/t1load.c | 236 +- src/type1/t1objs.c | 25 +- src/type1/t1parse.c | 68 +- src/type42/t42drivr.c | 21 +- src/type42/t42objs.c | 44 +- src/type42/t42parse.c | 137 +- src/winfonts/winfnt.c | 105 +- vms_make.com | 4 +- 551 files changed, 55965 insertions(+), 47322 deletions(-) create mode 100644 .gitignore create mode 100644 .mailmap create mode 100644 CMakeLists.txt create mode 100644 ChangeLog.24 create mode 100644 LICENSE create mode 100644 LICENSE.GPL-2.0 delete mode 100755 TC/_export_env.sh delete mode 100755 TC/_export_target_env.sh delete mode 100755 TC/build.sh delete mode 100755 TC/clean.sh delete mode 100755 TC/config delete mode 100755 TC/execute.sh delete mode 100755 TC/testcase/Makefile delete mode 100755 TC/testcase/tslist delete mode 100755 TC/testcase/utc_ft_bench.c delete mode 100755 TC/testcase/utc_ft_diff.c delete mode 100755 TC/testcase/utc_ft_dump.c delete mode 100755 TC/testcase/utc_ft_gamma.c delete mode 100755 TC/testcase/utc_ft_grid.c delete mode 100755 TC/testcase/utc_ft_lint.c delete mode 100755 TC/testcase/utc_ft_multi.c delete mode 100755 TC/testcase/utc_ft_string.c delete mode 100755 TC/testcase/utc_ft_view.c delete mode 100755 TC/tet_scen delete mode 100755 TC/tetbuild.cfg delete mode 100755 TC/tetclean.cfg delete mode 100755 TC/tetexec.cfg mode change 100644 => 100755 autogen.sh rename builds/amiga/include/{freetype => }/config/ftconfig.h (90%) rename builds/amiga/include/{freetype => }/config/ftmodule.h (100%) create mode 100644 builds/cmake/iOS.cmake create mode 100644 builds/mac/freetype-Info.plist delete mode 100644 builds/unix/ft2unix.h mode change 100755 => 100644 builds/unix/ltmain.sh create mode 100644 builds/unix/pkg.m4 delete mode 100644 builds/win32/vc2010/freetype.vcxproj delete mode 100644 builds/win32/vc2010/index.html create mode 100644 builds/windows/.gitignore rename builds/{win32 => windows}/detect.mk (95%) rename builds/{win32 => windows}/ftdebug.c (90%) rename builds/{win32 => windows}/vc2005/freetype.sln (100%) rename builds/{win32 => windows}/vc2005/freetype.vcproj (97%) rename builds/{win32 => windows}/vc2005/index.html (76%) rename builds/{win32 => windows}/vc2008/freetype.sln (100%) rename builds/{win32 => windows}/vc2008/freetype.vcproj (94%) rename builds/{win32 => windows}/vc2008/index.html (76%) rename builds/{win32 => windows}/vc2010/freetype.sln (56%) create mode 100644 builds/windows/vc2010/freetype.user.props create mode 100644 builds/windows/vc2010/freetype.vcxproj rename builds/{win32 => windows}/vc2010/freetype.vcxproj.filters (91%) create mode 100644 builds/windows/vc2010/index.html rename builds/{win32 => windows}/visualc/freetype.dsp (86%) rename builds/{win32/visualce => windows/visualc}/freetype.dsw (100%) rename builds/{win32 => windows}/visualc/freetype.sln (100%) rename builds/{win32 => windows}/visualc/freetype.vcproj (94%) rename builds/{win32 => windows}/visualc/index.html (77%) rename builds/{win32 => windows}/visualce/freetype.dsp (86%) rename builds/{win32/visualc => windows/visualce}/freetype.dsw (100%) rename builds/{win32 => windows}/visualce/freetype.vcproj (95%) rename builds/{win32 => windows}/visualce/index.html (80%) rename builds/{win32 => windows}/w32-bcc.mk (88%) rename builds/{win32 => windows}/w32-bccd.mk (86%) rename builds/{win32 => windows}/w32-dev.mk (88%) rename builds/{win32 => windows}/w32-gcc.mk (89%) rename builds/{win32 => windows}/w32-icc.mk (89%) rename builds/{win32 => windows}/w32-intl.mk (88%) rename builds/{win32 => windows}/w32-lcc.mk (87%) rename builds/{win32 => windows}/w32-mingw32.mk (89%) rename builds/{win32 => windows}/w32-vcc.mk (88%) rename builds/{win32 => windows}/w32-wat.mk (88%) rename builds/{win32 => windows}/win32-def.mk (89%) delete mode 100644 debian/changelog delete mode 100644 debian/compat delete mode 100644 debian/control delete mode 100644 debian/copyright delete mode 100644 debian/dirs delete mode 100644 debian/docs delete mode 100644 debian/libfreetype6-dev.install.in delete mode 100644 debian/libfreetype6.install.in delete mode 100755 debian/rules create mode 100644 docs/CMAKE create mode 100644 docs/freetype-config.1 delete mode 100644 docs/reference/ft2-base_interface.html delete mode 100644 docs/reference/ft2-basic_types.html delete mode 100644 docs/reference/ft2-bdf_fonts.html delete mode 100644 docs/reference/ft2-bitmap_handling.html delete mode 100644 docs/reference/ft2-cache_subsystem.html delete mode 100644 docs/reference/ft2-cid_fonts.html delete mode 100644 docs/reference/ft2-computations.html delete mode 100644 docs/reference/ft2-font_formats.html delete mode 100644 docs/reference/ft2-gasp_table.html delete mode 100644 docs/reference/ft2-glyph_management.html delete mode 100644 docs/reference/ft2-glyph_stroker.html delete mode 100644 docs/reference/ft2-glyph_variants.html delete mode 100644 docs/reference/ft2-gx_validation.html delete mode 100644 docs/reference/ft2-gzip.html delete mode 100644 docs/reference/ft2-header_file_macros.html delete mode 100644 docs/reference/ft2-incremental.html delete mode 100644 docs/reference/ft2-index.html delete mode 100644 docs/reference/ft2-lcd_filtering.html delete mode 100644 docs/reference/ft2-list_processing.html delete mode 100644 docs/reference/ft2-lzw.html delete mode 100644 docs/reference/ft2-mac_specific.html delete mode 100644 docs/reference/ft2-module_management.html delete mode 100644 docs/reference/ft2-multiple_masters.html delete mode 100644 docs/reference/ft2-ot_validation.html delete mode 100644 docs/reference/ft2-outline_processing.html delete mode 100644 docs/reference/ft2-pfr_fonts.html delete mode 100644 docs/reference/ft2-quick_advance.html delete mode 100644 docs/reference/ft2-raster.html delete mode 100644 docs/reference/ft2-sfnt_names.html delete mode 100644 docs/reference/ft2-sizes_management.html delete mode 100644 docs/reference/ft2-system_interface.html delete mode 100644 docs/reference/ft2-toc.html delete mode 100644 docs/reference/ft2-truetype_engine.html delete mode 100644 docs/reference/ft2-truetype_tables.html delete mode 100644 docs/reference/ft2-type1_tables.html delete mode 100644 docs/reference/ft2-user_allocation.html delete mode 100644 docs/reference/ft2-version.html delete mode 100644 docs/reference/ft2-winfnt_fonts.html delete mode 100755 ft2demos/ftbench delete mode 100755 ft2demos/ftdiff delete mode 100755 ft2demos/ftdump delete mode 100755 ft2demos/ftgamma delete mode 100755 ft2demos/ftgrid delete mode 100755 ft2demos/ftlint delete mode 100755 ft2demos/ftmulti delete mode 100755 ft2demos/ftstring delete mode 100755 ft2demos/ftview rename include/{freetype => }/config/ftconfig.h (77%) rename include/{freetype => }/config/ftheader.h (87%) rename include/{freetype => }/config/ftmodule.h (100%) rename include/{freetype => }/config/ftoption.h (86%) rename include/{freetype => }/config/ftstdlib.h (98%) rename include/{freetype => }/freetype.h (93%) delete mode 100644 include/freetype/internal/internal.h rename include/{freetype => }/ftadvanc.h (89%) create mode 100644 include/ftautoh.h rename include/{freetype => }/ftbbox.h (97%) rename include/{freetype => }/ftbdf.h (96%) rename include/{freetype => }/ftbitmap.h (94%) rename include/{freetype => }/ftbzip2.h (99%) rename include/{freetype => }/ftcache.h (94%) create mode 100644 include/ftcffdrv.h rename include/{freetype => }/ftchapters.h (85%) rename include/{freetype => }/ftcid.h (99%) rename include/{freetype => }/fterrdef.h (95%) rename include/{freetype => }/fterrors.h (93%) rename include/{freetype => }/ftgasp.h (99%) rename include/{freetype => }/ftglyph.h (95%) rename include/{freetype => }/ftgxval.h (91%) rename include/{freetype => }/ftgzip.h (74%) rename include/{freetype => }/ftimage.h (88%) rename include/{freetype => }/ftincrem.h (99%) rename include/{freetype => }/ftlcdfil.h (80%) rename include/{freetype => }/ftlist.h (96%) rename include/{freetype => }/ftlzw.h (99%) rename include/{freetype => }/ftmac.h (98%) rename include/{freetype => }/ftmm.h (98%) rename include/{freetype => }/ftmodapi.h (75%) rename include/{freetype => }/ftmoderr.h (63%) rename include/{freetype => }/ftotval.h (91%) rename include/{freetype => }/ftoutln.h (90%) rename include/{freetype => }/ftpfr.h (99%) rename include/{freetype => }/ftrender.h (99%) rename include/{freetype => }/ftsizes.h (98%) rename include/{freetype => }/ftsnames.h (98%) rename include/{freetype => }/ftstroke.h (93%) rename include/{freetype => }/ftsynth.h (91%) rename include/{freetype => }/ftsystem.h (95%) rename include/{freetype => }/fttrigon.h (95%) create mode 100644 include/ftttdrv.h rename include/{freetype => }/fttypes.h (96%) rename include/{freetype => }/ftwinfnt.h (97%) rename include/{freetype => }/ftxf86.h (96%) rename include/{freetype => }/internal/autohint.h (84%) rename include/{freetype => }/internal/ftcalc.h (51%) rename include/{freetype => }/internal/ftdebug.h (93%) rename include/{freetype => }/internal/ftdriver.h (54%) rename include/{freetype => }/internal/ftgloadr.h (88%) rename include/{freetype => }/internal/ftmemory.h (71%) rename include/{freetype => }/internal/ftobjs.h (72%) rename include/{freetype => }/internal/ftpic.h (80%) rename include/{freetype => }/internal/ftrfork.h (89%) rename include/{freetype => }/internal/ftserv.h (82%) rename include/{freetype => }/internal/ftstream.h (88%) rename include/{freetype => }/internal/fttrace.h (94%) rename include/{freetype => }/internal/ftvalid.h (88%) create mode 100644 include/internal/internal.h rename include/{freetype => }/internal/psaux.h (98%) rename include/{freetype => }/internal/pshints.h (93%) rename include/{freetype => }/internal/services/svbdf.h (100%) rename include/{freetype => }/internal/services/svcid.h (100%) rename include/{freetype => }/internal/services/svgldict.h (100%) rename include/{freetype => }/internal/services/svgxval.h (100%) rename include/{freetype => }/internal/services/svkern.h (100%) rename include/{freetype => }/internal/services/svmm.h (100%) rename include/{freetype => }/internal/services/svotval.h (100%) rename include/{freetype => }/internal/services/svpfr.h (100%) rename include/{freetype => }/internal/services/svpostnm.h (100%) create mode 100644 include/internal/services/svprop.h rename include/{freetype => }/internal/services/svpscmap.h (100%) rename include/{freetype => }/internal/services/svpsinfo.h (100%) rename include/{freetype => }/internal/services/svsfnt.h (100%) rename include/{freetype => }/internal/services/svttcmap.h (97%) rename include/{freetype => }/internal/services/svtteng.h (100%) rename include/{freetype => }/internal/services/svttglyf.h (100%) rename include/{freetype => }/internal/services/svwinfnt.h (100%) rename include/{freetype => }/internal/services/svxf86nm.h (100%) rename include/{freetype => }/internal/sfnt.h (66%) rename include/{freetype => }/internal/t1types.h (98%) rename include/{freetype => }/internal/tttypes.h (94%) rename include/{freetype => }/t1tables.h (76%) rename include/{freetype => }/ttnameid.h (86%) rename include/{freetype => }/tttables.h (87%) rename include/{freetype => }/tttags.h (94%) rename include/{freetype => }/ttunpat.h (99%) create mode 100644 packaging/freetype.manifest create mode 100644 src/autofit/afblue.c create mode 100644 src/autofit/afblue.cin create mode 100644 src/autofit/afblue.dat create mode 100644 src/autofit/afblue.h create mode 100644 src/autofit/afblue.hin create mode 100644 src/autofit/afcover.h create mode 100644 src/autofit/afranges.c create mode 100644 src/autofit/afranges.h create mode 100644 src/autofit/afscript.h create mode 100644 src/autofit/afstyles.h create mode 100644 src/autofit/afwrtsys.h create mode 100644 src/autofit/hbshim.c create mode 100644 src/autofit/hbshim.h create mode 100644 src/base/md5.c create mode 100644 src/base/md5.h create mode 100644 src/cff/cf2arrst.c create mode 100644 src/cff/cf2arrst.h create mode 100644 src/cff/cf2blues.c create mode 100644 src/cff/cf2blues.h create mode 100644 src/cff/cf2error.c create mode 100644 src/cff/cf2error.h create mode 100644 src/cff/cf2fixed.h create mode 100644 src/cff/cf2font.c create mode 100644 src/cff/cf2font.h create mode 100644 src/cff/cf2ft.c create mode 100644 src/cff/cf2ft.h create mode 100644 src/cff/cf2glue.h create mode 100644 src/cff/cf2hints.c create mode 100644 src/cff/cf2hints.h create mode 100644 src/cff/cf2intrp.c create mode 100644 src/cff/cf2intrp.h create mode 100644 src/cff/cf2read.c create mode 100644 src/cff/cf2read.h create mode 100644 src/cff/cf2stack.c create mode 100644 src/cff/cf2stack.h create mode 100644 src/cff/cf2types.h create mode 100644 src/sfnt/pngshim.c create mode 100644 src/sfnt/pngshim.h delete mode 100644 src/sfnt/ttsbit0.c create mode 100644 src/tools/afblue.pl create mode 100644 src/truetype/ttsubpix.c create mode 100644 src/truetype/ttsubpix.h diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b5db9d8 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +config.mk +objs/vc2010/ diff --git a/.mailmap b/.mailmap new file mode 100644 index 0000000..a3c5f94 --- /dev/null +++ b/.mailmap @@ -0,0 +1,7 @@ +Alexei Podtelezhnikov (Алексей Подтележников) +Behdad Esfahbod +Bram Tassyns bram tassyns +Bram Tassyns +Suzuki, Toshiya (鈴木俊哉) +Suzuki, Toshiya (鈴木俊哉) sssa +Suzuki, Toshiya (鈴木俊哉) suzuki toshiya diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..8b859a5 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,253 @@ +# CMakeLists.txt +# +# Copyright 2013, 2014 by +# David Turner, Robert Wilhelm, and Werner Lemberg. +# +# Written by John Cary +# +# This file is part of the FreeType project, and may only be used, modified, +# and distributed under the terms of the FreeType project license, +# LICENSE.TXT. By continuing to use, modify, or distribute this file you +# indicate that you have read the license and understand and accept it +# fully. +# +# +# Say +# +# cmake CMakeLists.txt +# +# to create a Makefile that builds a static version of the library. +# +# For a dynamic library, use +# +# cmake CMakeLists.txt -DBUILD_SHARED_LIBS:BOOL=true +# +# For a framework on OS X, use +# +# cmake CMakeLists.txt -DBUILD_FRAMEWORK:BOOL=true -G Xcode +# +# instead. +# +# For an iOS static library, use +# +# cmake CMakeLists.txt -DIOS_PLATFORM=OS -G Xcode +# +# or +# +# cmake CMakeLists.txt -DIOS_PLATFORM=SIMULATOR -G Xcode +# +# Please refer to the cmake manual for further options, in particular, how +# to modify compilation and linking parameters. +# +# Some notes. +# +# . `cmake' will overwrite FreeType's original (top-level) `Makefile' file. +# +# . You can use `cmake' directly on a freshly cloned FreeType git +# repository. +# +# . `CMakeLists.txt' is provided as-is since it is not used by the +# developer team. + + +cmake_minimum_required(VERSION 2.6) + +# CMAKE_TOOLCHAIN_FILE must be set before `project' is called, which +# configures the base build environment and references the toolchain file +if (APPLE) + if (DEFINED IOS_PLATFORM) + if (NOT "${IOS_PLATFORM}" STREQUAL "OS" + AND NOT "${IOS_PLATFORM}" STREQUAL "SIMULATOR") + message(FATAL_ERROR + "IOS_PLATFORM must be set to either OS or SIMULATOR") + endif () + if (NOT "${CMAKE_GENERATOR}" STREQUAL "Xcode") + message(AUTHOR_WARNING + "You should use Xcode generator with IOS_PLATFORM enabled to get Universal builds.") + endif () + if (BUILD_SHARED_LIBS) + message(FATAL_ERROR + "BUILD_SHARED_LIBS can not be on with IOS_PLATFORM enabled") + endif () + if (BUILD_FRAMEWORK) + message(FATAL_ERROR + "BUILD_FRAMEWORK can not be on with IOS_PLATFORM enabled") + endif () + + # iOS only uses static libraries + set(BUILD_SHARED_LIBS OFF) + + set(CMAKE_TOOLCHAIN_FILE + ${PROJECT_SOURCE_DIR}/builds/cmake/iOS.cmake) + endif () +else () + if (DEFINED IOS_PLATFORM) + message(FATAL_ERROR "IOS_PLATFORM is not supported on this platform") + endif () +endif () + +project(freetype) + +if (BUILD_FRAMEWORK) + if (NOT "${CMAKE_GENERATOR}" STREQUAL "Xcode") + message(FATAL_ERROR + "You should use Xcode generator with BUILD_FRAMEWORK enabled") + endif () + set(CMAKE_OSX_ARCHITECTURES "$(ARCHS_STANDARD_32_64_BIT)") + set(BUILD_SHARED_LIBS ON) +endif () + +set(VERSION_MAJOR "2") +set(VERSION_MINOR "5") +set(VERSION_PATCH "5") +set(PROJECT_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) + +# Compiler definitions for building the library +add_definitions(-DFT2_BUILD_LIBRARY) + +# Specify library include directories +include_directories("${PROJECT_SOURCE_DIR}/include") + +# Create the configuration file +message(STATUS "Creating directory, ${PROJECT_BINARY_DIR}/include/freetype2.") +file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/include/freetype2) + +# For the auto-generated ftconfig.h file +include_directories(BEFORE "${PROJECT_BINARY_DIR}/include/freetype2") +message(STATUS "Creating ${PROJECT_BINARY_DIR}/include/freetype2/ftconfig.h.") +execute_process( + COMMAND sed -e "s/FT_CONFIG_OPTIONS_H//" -e "s/FT_CONFIG_STANDARD_LIBRARY_H//" -e "s?/undef ?#undef ?" + INPUT_FILE ${PROJECT_SOURCE_DIR}/builds/unix/ftconfig.in + OUTPUT_FILE ${PROJECT_BINARY_DIR}/include/freetype2/ftconfig.h +) + +file(GLOB PUBLIC_HEADERS "include/*.h") +file(GLOB PUBLIC_CONFIG_HEADERS "include/config/*.h") +file(GLOB PRIVATE_HEADERS "include/internal/*.h") + +set(BASE_SRCS + src/autofit/autofit.c + src/base/ftadvanc.c + src/base/ftbbox.c + src/base/ftbdf.c + src/base/ftbitmap.c + src/base/ftcalc.c + src/base/ftcid.c + src/base/ftdbgmem.c + src/base/ftdebug.c + src/base/ftfstype.c + src/base/ftgasp.c + src/base/ftgloadr.c + src/base/ftglyph.c + src/base/ftgxval.c + src/base/ftinit.c + src/base/ftlcdfil.c + src/base/ftmm.c + src/base/ftobjs.c + src/base/ftotval.c + src/base/ftoutln.c + src/base/ftpatent.c + src/base/ftpfr.c + src/base/ftrfork.c + src/base/ftsnames.c + src/base/ftstream.c + src/base/ftstroke.c + src/base/ftsynth.c + src/base/ftsystem.c + src/base/fttrigon.c + src/base/fttype1.c + src/base/ftutil.c + src/base/ftwinfnt.c + src/base/ftxf86.c + src/bdf/bdf.c + src/bzip2/ftbzip2.c + src/cache/ftcache.c + src/cff/cff.c + src/cid/type1cid.c + src/gzip/ftgzip.c + src/lzw/ftlzw.c + src/pcf/pcf.c + src/pfr/pfr.c + src/psaux/psaux.c + src/pshinter/pshinter.c + src/psnames/psmodule.c + src/raster/raster.c + src/sfnt/sfnt.c + src/smooth/smooth.c + src/truetype/truetype.c + src/type1/type1.c + src/type42/type42.c + src/winfonts/winfnt.c +) + +include_directories("src/truetype") +include_directories("src/sfnt") +include_directories("src/autofit") +include_directories("src/smooth") +include_directories("src/raster") +include_directories("src/psaux") +include_directories("src/psnames") + +if (BUILD_FRAMEWORK) + set(BASE_SRCS + ${BASE_SRCS} + builds/mac/freetype-Info.plist + ) +endif () + +add_library(freetype + ${PUBLIC_HEADERS} + ${PUBLIC_CONFIG_HEADERS} + ${PRIVATE_HEADERS} + ${BASE_SRCS} +) + +if (BUILD_FRAMEWORK) + set_property(SOURCE ${PUBLIC_CONFIG_HEADERS} + PROPERTY MACOSX_PACKAGE_LOCATION Headers/config + ) + set_target_properties(freetype PROPERTIES + FRAMEWORK TRUE + MACOSX_FRAMEWORK_INFO_PLIST builds/mac/freetype-Info.plist + PUBLIC_HEADER "${PUBLIC_HEADERS}" + XCODE_ATTRIBUTE_INSTALL_PATH "@rpath" + ) +endif () + +# Installations +# Note the trailing slash in the argument to the `DIRECTORY' directive +install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/ + DESTINATION include/freetype2 + PATTERN "internal" EXCLUDE +) +install(TARGETS freetype + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + FRAMEWORK DESTINATION Library/Frameworks +) + +# Packaging +# CPack version numbers for release tarball name. +set(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR}) +set(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR}) +set(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH}}) +if (NOT DEFINED CPACK_PACKAGE_DESCRIPTION_SUMMARY) + set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${CMAKE_PROJECT_NAME}") +endif () +if (NOT DEFINED CPACK_SOURCE_PACKAGE_FILE_NAME) + set(CPACK_SOURCE_PACKAGE_FILE_NAME + "${CMAKE_PROJECT_NAME}-${PROJECT_VERSION}-r${PROJECT_REV}" + CACHE INTERNAL "tarball basename" + ) +endif () +set(CPACK_SOURCE_GENERATOR TGZ) +set(CPACK_SOURCE_IGNORE_FILES + "/CVS/;/.svn/;.swp$;.#;/#;/build/;/serial/;/ser/;/parallel/;/par/;~;/preconfig.out;/autom4te.cache/;/.config") +set(CPACK_GENERATOR TGZ) +include(CPack) + +# add make dist target +add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source) + +# eof diff --git a/ChangeLog b/ChangeLog index 9afc1aa..5a857ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4066 +1,5151 @@ -2012-03-08 Werner Lemberg +2014-12-30 Werner Lemberg - * Version 2.4.9 released. + * Version 2.5.5 released. ========================= - Tag sources with `VER-2-4-9'. - - * docs/CHANGES: Updated. + Tag sources with `VER-2-5-5'. * docs/VERSION.DLL: Update documentation and bump version number to - 2.4.9. - - * README, Jamfile (RefDoc), - builds/win32/vc2005/freetype.vcproj, builds/win32/vc2005/index.html, - builds/win32/vc2008/freetype.vcproj, builds/win32/vc2008/index.html, - builds/win32/vc2010/freetype.vcxproj, builds/win32/vc2010/index.html, - builds/win32/visualc/freetype.dsp, - builds/win32/visualc/freetype.vcproj, - builds/win32/visualc/index.html, builds/win32/visualce/freetype.dsp, - builds/win32/visualce/freetype.vcproj, - builds/win32/visualce/index.html, + 2.5.5. + + * 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.4.8/2.4.9/, s/248/249/. + builds/wince/vc2008-ce/index.html: s/2.5.4/2.5.5/, s/254/255/. - * include/freetype/freetype.h (FREETYPE_PATCH): Set to 9. + * include/freetype/freetype.h (FREETYPE_PATCH): Set to 5. - * builds/unix/configure.raw (version_info): Set to 14:1:8. + * builds/unix/configure.raw (version_info): Set to 17:4:11. + * CMakeLists.txt (VERSION_PATCH): Set to 5. + * docs/CHANGES: Updated. -2012-03-08 Werner Lemberg + * builds/toplevel.mk (dist): Fix typos. - [bdf] Add missing overflow check. +2014-12-24 Alexei Podtelezhnikov - * src/bdf/bdflib.c (_bdf_parse_glyphs) : Add threshold for - `glyph->bpr'. + [base] Formatting and nanooptimizations. -2012-03-07 Vinnie Falco + * src/base/ftcalc.c, + * src/base/fttrigon.c: Revise sign restoration. - Prepare source code for amalgamation. +2014-12-13 Werner Lemberg - * src\autofit\aferrors.h, src\bdf\bdferror.h, src\bzip2\ftbzip2.c, - src\cache\ftcerror.h, src\cff\cfferrs.h, src\cid\ciderrs.h, - src\gxvalid\gxverror.h, src\gzip\ftgzip.c, src\lzw\ftlzw.c, - src\otvalid\otverror.h, src\pcf\pcferror.h, src\pfr\pfrerror.h, - src\psaux\psauxerr.h, src\pshinter\pshnterr.h, - src\psnames\psnamerr.h, src\raster\rasterrs.h, src\sfnt\sferrors.h, - src\smooth\ftsmerrs.h, src\truetype\tterrors.h, - src\type1\t1errors.h, src\type42\t42error.h, src\winfonts\fnterrs.h: - Add #undef FT_ERR_PREFIX before #define FT_ERR_PREFIX. + * src/pcf/pcfread.c (pcf_read_TOC): Improve fix from 2014-12-08. -2012-03-03 Werner Lemberg +2014-12-11 Werner Lemberg - Fix Savannah bug #35660. + * builds/toplevel.mk (dist): Use older POSIX standard for `tar'. - For some divisions, we use casts to 32bit entities. Always guard - against division by zero with these casts also. + Apparently, BSD tar isn't capable yet of handling POSIX-1.2001 + (contrary to GNU tar), so force the POSIX-1.1988 format. - * src/base/ftcalc.c (ft_div64by32): Remove redundant cast. - (FT_MulDiv, FT_MulDiv_No_Round): Add 32bit cast. - (FT_DivFix): Add 32bit cast (this omission triggered the bug). + Problem reported by Stephen Fisher . -2012-03-03 Werner Lemberg +2014-12-11 Werner Lemberg - [psaux] Fix handling of track kerning. + * src/type42/t42parse.c (t42_parse_sfnts): Reject invalid TTF size. - * src/psaux/afmparse.c (afm_parse_track_kern): Don't inverse sign - for `min_kern'. It is indeed quite common that track kerning - *increases* spacing for very small sizes. +2014-12-11 Werner Lemberg -2012-03-02 Werner Lemberg + * src/base/ftobjs.c (FT_Get_Glyph_Name): Fix off-by-one check. - [truetype] Fix Savannah bug #35689. + Problem reported by Dennis Felsing . - * src/truetype/ttgload.c (TT_Load_Simple_Glyph): Check first outline - point. +2014-12-11 Werner Lemberg -2012-03-01 Werner Lemberg + * src/type42/t42parse.c (t42_parse_sfnts): Check `string_size'. - [bdf] Fix Savannah bug #35656. + Problem reported by Dennis Felsing . - * src/bdf/bdflib.c (_bdf_parse_glyphs) <_BDF_BITMAP>: Check validity - of nibble characters instead of accessing `a2i' array. +2014-12-09 suzuki toshiya -2012-03-01 Werner Lemberg + [gxvalid] Fix a naming convention conflicting with ftvalid. - [winfonts] Fix Savannah bug #35659. + See previous changeset for otvalid. - * src/winfonts/winfnt.c (FNT_Face_Init): Check number of glyphs. + * src/gxvalid/{gxvcommn.h, gxvmort.h, gxvmorx.h}: Replace + `valid' by `gxvalid'. + * src/gxvalid/{gxvbsln.c, gxvcommn.c, gxvfeat.c, gxvjust.c, + gxvkern.c, gxvlcar.c, gxvmort.c, gxvmort0.c, gxvmort1.c, + gxvmort2.c, gxvmort4.c, gxvmort5.c, gxvmorx.c, gxvmorx0.c, + gxvmorx1.c, gxvmorx2.c, gxvmorx4.c, gxvmorx5.c, gxvopbd.c, + gxvprop.c, gxvtrak.c}: Replace `valid' by `gxvalid' if + it is typed as GXV_Validator. -2012-03-01 Werner Lemberg +2014-12-09 suzuki toshiya - [bdf] Fix Savannah bug #35658. + [otvalid] Fix a naming convention conflicting with ftvalid. - * src/bdf/bdflib.c (_bdf_list_split): Initialize `field' elements - properly. + Some prototypes in ftvalid.h use `valid' for the variables + typed as FT_Validator. Their implementations in src/base/ + ftobjs.c and utilizations in src/sfnt/ttcmap.c do similar. -2012-03-01 Werner Lemberg + Some macros in otvcommn.h assume the exist of the variable + `valid' typed as OTV_Validator in the caller. - [psaux] Fix Savannah bug #35657. + Mixing these two conventions cause invalid pointer conversion + and unexpected SEGV in longjmp. To prevent it, all variables + typed as OTV_Validator are renamed to `otvalid'. - If in function `skip_spaces' the routine `skip_comment' comes to the - end of buffer, `cur' is still increased by one, so we need to check - for `p >= limit' and not `p == limit'. + * src/otvalid/otvcommn.h: Replace `valid' by `otvalid'. + * src/otvalid/{otvcommn.c, otvbase.c, otvgdef.c, otvgpos.c, + otvgsub.c, otvjstf.c, otvmath.c}: Replace `valid' by `otvalid' + if it is typed as OTV_Validator. - * src/psaux/psconv.c (PS_Conv_Strtol, PS_Conv_ToFixed, - PS_Conv_ASCIIHexDecode, PS_Conv_EexecDecode): Fix boundary checking. +2014-12-09 suzuki toshiya -2012-03-01 Werner Lemberg + [ftvalid] Introduce FT_THROW() in FT_INVALID_XXX macros. - [truetype] Fix Savannah bug #35646. + Original patch is designed by Werner Lemberg. Extra part + for otvalid and gxvalid are added by suzuki toshiya, see + discussion: + http://lists.nongnu.org/archive/html/freetype-devel/2014-12/msg00002.html + http://lists.nongnu.org/archive/html/freetype-devel/2014-12/msg00007.html - * src/truetype/ttinterp.c (Ins_MIRP): Typo, present since ages. The - code is now in sync with the other operators (e.g. MSIRP) which - modify twilight points. + * include/internal/ftvalid.h: Introduce FT_THROW() in FT_INVALID_(). + * src/gxvalid/gxvcommn.h: Ditto. + * src/otvalid/otvcommn.h: Ditto. -2012-03-01 Werner Lemberg +2014-12-08 Werner Lemberg - [bdf] Fix Savannah bug #35643. + [pcf] Fix Savannah bug #43774. - * src/bdf/bdflib.c (_bdf_list_ensure): Bring code in sync with - comment before `_bdf_list_split', this is, really allocate at least - five `field' elements. + Work around `features' of X11's `pcfWriteFont' and `pcfReadFont' + functions. Since the PCF format doesn't have an official + specification, we have to exactly follow these functions' behaviour. -2012-03-01 Werner Lemberg + The problem was unveiled with a patch from 2014-11-06, fixing issue + #43547. - [bdf] Fix Savannah bug #35641. + * src/pcf/pcfread.c (pcf_read_TOC): Don't check table size for last + element. Instead, assign real size. - * src/bdf/bdflib.c (_bdf_parse_glyphs) : Abort if - _BDF_ENCODING isn't set. We need this because access to the `glyph' - variable might be undefined otherwise. +2014-12-07 Werner Lemberg -2012-03-01 Werner Lemberg + Work around a bug in Borland's C++ compiler. - [truetype] Fix Savannah bug #35640. + See - * src/truetype/ttinterp.c (SkipCode, TT_RunIns): Fix boundary check - for NPUSHB and NPUSHW instructions. + http://qc.embarcadero.com/wc/qcmain.aspx?d=118998 -2012-02-29 Werner Lemberg + for Borland's bug tracker entry. - [truetype] Fix Savannah bug #35601. + Reported by Yuliana Zigangirova , + http://lists.gnu.org/archive/html/freetype-devel/2014-04/msg00001.html. - * src/truetype/ttinterp.c (Ins_SHZ): Use number of points instead of - last point for loop. - Also remove redundant boundary check. + * include/internal/ftvalid.h (FT_ValidatorRec), src/smooth/ftgrays.c + (gray_TWorker_): Move `ft_jmp_buf' field to be the first element. -2012-02-29 Werner Lemberg +2014-12-07 Werner Lemberg - [truetype] Remove redundant check. + */*: Decorate hex constants with `U' and `L' where appropriate. - * src/truetype/ttgload.c (TT_Load_Simple_Glyph): Remove redundant - second check for ordered contour start points. +2014-12-07 Werner Lemberg -2012-02-29 Werner Lemberg + [truetype] Prevent memory leak for buggy fonts. - [truetype] Make SHC instruction behave similar to MS rasterizer. + * src/truetype/ttobjs.c (tt_size_done): Unconditionally call + `tt_size_done_bytecode'. - * src/truetype/ttinterp.c (Ins_SHC): Handle virtual contour in - twilight zone. +2014-12-06 Werner Lemberg -2012-02-29 Alexei Podtelezhnikov + * Version 2.5.4 released. + ========================= - Avoid modulo operators against a power-of-two denominator. - * src/afcjk.c (af_hint_normal_stem), src/base/ftoutln.c - (ft_contour_has), src/cff/cffgload.c (cff_decoder_parse_charstrings) - , - src/gxvalid/gxvcommn.c (GXV_32BIT_ALIGNMENT_VALIDATE), - src/gxvalid/gxvfeat.c (gxv_feat_setting_validate): Replace `%' with - `&' operator. + Tag sources with `VER-2-5-4'. -2012-02-29 Werner Lemberg + * docs/VERSION.DLL: Update documentation and bump version number to + 2.5.4. + + * 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.5.3/2.5.4/, s/253/254/. - [autofit] Don't synchronize digit widths for light rendering mode. + * include/freetype/freetype.h (FREETYPE_PATCH): Set to 4. - We don't hint horizontally in this mode. + * builds/unix/configure.raw (version_info): Set to 17:3:11. + * CMakeLists.txt (VERSION_PATCH): Set to 4. + * docs/CHANGES: Updated. - * src/autofit/afloader.c (af_loader_load_g) : - Implement it. +2014-12-04 Werner Lemberg -2012-02-26 Alexei Podtelezhnikov + docs/CHANGES: Updated, formatted. - [type42] Minor code optimization (again). +2014-12-04 Dave Arnold - * src/type42/t42parse.c (t42_parse_sfnts): Simplify previous change. + [cff] Modify an FT_ASSERT. -2012-02-26 Mateusz Jurczyk - Werner Lemberg + * src/cff/cf2hints.c (cf2_hintmap_map): After the fix for Savannah + bug #43661, the test font `...aspartam.otf' still triggers an + FT_ASSERT. Since hintmap still works with count==0, ... + (cf2_glyphpath_lineTo, cf2_glyphpath_curveTo): ... add that term to + suppress the assert. - [smooth] Fix Savannah bug #35604. +2014-12-04 Dave Arnold - * src/smooth/ftsmooth.c (ft_smooth_render_generic): Use `FT_Pos' - instead of `FT_UInt' for some variables and update comparisons - accordingly. A detailed analysis can be found in the bug report. + [cff] Fix Savannah bug #43661. -2012-02-26 Alexei Podtelezhnikov + * src/cff/cf2intrp.c (cf2_interpT2CharString) : Don't append to stem arrays after + hintmask is constructed. - [type42] Minor code optimization. + * src/cff/cf2hints.c (cf2_hintmap_build): Add defensive code to + avoid reading past end of hintmask. - * src/type42/t42parse.c (t42_parse_sfnts): Use bitmask instead of - modulo operator. +2014-12-03 Werner Lemberg -2012-02-26 Werner Lemberg + docs/CHANGES: Updated. - * docs/CHANGES: Updated. +2014-12-03 Werner Lemberg -2012-02-26 Werner Lemberg + [autofit] Better fix for conversion specifiers in debug messages. - [type1] Fix Savannah bug #35608. + Using `%ld' for pointer differences causes warnings on 32bit + platforms. The correct type would be (the relatively new) `%td', + however, this is missing on some important platforms. - * src/type1/t1parse.c (T1_Get_Private_Dict): Reject too short - dictionaries. + This patch improves the change from 2014-11-28. -2012-02-26 Werner Lemberg + * src/autofit/afhints.c (AF_INDEX_NUM): Use `int' typecast. Our + pointer differences are always sufficiently small. + (af_glyph_hints_dump_points, af_glyph_hints_dump_segments, + af_glyph_hints_dump_edge): Revert to `%d' and use `AF_INDEX_NUM'. - [bdf] Support `ENCODING -1 ' format. +2014-12-03 Werner Lemberg - * src/bdf/bdflib.c (_bdf_parse_glyphs) : Implement it. + FT_Sfnt_Tag: s/ft_sfnt_xxx/FT_SFNT_XXX/ for orthogonality. -2012-02-26 Werner Lemberg + All public FreeType enumeration and flag values are uppercase... - [bdf] Fix Savannah bug #35607. + * include/tttables.h (FT_Sfnt_Tag): Implement it. For backwards + compatilibity, retain the old values as macros. - * src/bdf/bdflib.c (_bdf_parse_glyphs) : Normalize - negative encoding values. + * src/base/ftfstype.c (FT_Get_FSType_Flags), src/sfnt/sfdriver.c + (get_sfnt_table): Updated. -2012-02-26 Werner Lemberg +2014-12-02 Werner Lemberg - [type1] Fix Savannah bug #35606. + * include/*: Improve structure of documentation. - * src/type1/t1load.c (parse_subrs): Add proper guards for `strncmp'. + . Add and update many `' tags. + . Apply various documentation fixes. + . Remove details to deprecated (or never implemented) data. - * src/psaux/psobjs.c (ps_parser_skip_PS_token): Emit error message - only if cur < limit. +2014-12-02 Werner Lemberg -2012-02-25 Werner Lemberg + [docmaker] Always handle `' section elements. - [pcf] Fix Savannah bug #35603. + Previously, those elements were handled only for sections present in + a `' chapter element. - * src/pcf/pcfread.c (pcf_get_properties): Assure final zero byte in - `strings' array. + * src/tools/docmaker/content.py (ContentProcessor::finish): + Implement it. -2012-02-25 Werner Lemberg +2014-12-02 Werner Lemberg - [type42] Fix Savannah bug #35602. + [docmaker] Properly handle empty rows in Synopsis. - * src/type42/t42parse.c (t42_parse_sfnts): Check `string_size' more - thoroughly. + * src/tools/docmaker/tohtml.py (HtmlFormatter::section_enter): Emit + ` ' for empty fields. -2012-02-25 Werner Lemberg +2014-12-02 Werner Lemberg - [bdf] Fix Savannah bugs #35599 and #35600. + [docmaker] Thinko. - * src/bdf/bdflib.c (ACMSG16): New warning message. - (_bdf_parse_glyphs) <_BDF_BITMAP>: Check line length. + * src/tools/docmaker/content.py (DocBlock::get_markup_words_all): + Emit `/empty/' string for first element also. -2012-02-24 Werner Lemberg +2014-12-02 Werner Lemberg - [bdf] Fix Savannah bugs #35597 and #35598. + [docmaker] Honour empty lines in `' section element. - * src/bdf/bdflib.c (_bdf_is_atom): Fix handling of property value. + This greatly improves the readability of the `Synopsis' links. -2012-02-24  Vinnie Falco + * src/tools/docmaker/content.py (DocBlock::get_markup_words_all): + Insert string `/empty/' between items. - Prepare source code for amalgamation (6/6). + * src/tools/docmaker/formatter.py (Formatter::section_dump): Make it + robust against nonexistent keys. - * src/cff/cffdrivr.c: s/Load_Glyph/cff_glyph_load/. + * src/tools/docmaker/tohtml.py (HtmlFormatter::section_enter): Emit + empty elements for `/empty/'. - * src/cid/cidload.c: s/parse_font_matrix/cid_parse_font_matrix/. - s/t1_init_loader/cid_init_loader/. - s/t1_done_loader/cid_done_loader/. +2014-12-02 Werner Lemberg - * src/pxaux/t1cmap.c: s/t1_get_glyph_name/psaux_get_glyph_name/. + [docmaker] Ensure Python 3 compatibility. - * src/truetype/ttdriver.c: s/Load_Glyph/tt_glyph_load/. + * src/tools/docmaker/content.py (ContentProcessor::set_section, + ContentProcessor::finish): Replace `has_key' function with `in' + keyword. - * src/type1/t1load.c: s/parse_font_matrix/t1_parse_font_matrix/. + * src/tools/docmaker/formatter.py (Formatter::__init__): Replace + sorting function with a key generator. + (Formatter::add_identifier): Replace `has_key' function with `in' + keyword. -2012-02-24  Vinnie Falco + * src/tools/docmaker/tohtml.py (HtmlFormatter::html_source_quote): + Replace `has_key' function with `in' keyword. + (HtmlFormatter::index_exit, HtmlFormatter::section_enter): Use + integer division. + s/<>/>/. - Prepare source code for amalgamation (5/6). + * src/tools/docmaker/utils.py: Import `itertools'. + (index_sort): Replaced by... + (index_key): ... this new key generator (doing exactly the same). - * include/freetype/fterrors.h: Undefine FT_KEEP_ERR_PREFIX after - using it. +2014-11-29 Werner Lemberg -2012-02-22  Vinnie Falco + [docmaker] Don't output a block multiple times. - Prepare source code for amalgamation (4/6). + This bug was hidden by not processing all lines of `' blocks. - * src/smooth/ftgrays.c, src/raster/ftraster.c: Undefine RAS_ARG, - RAS_ARGS, RAS_VAR, and RAS_VARS before defining it. + * src/tools/docmaker/formatter.py (Formatter::section_dump): Filter + out field names. - * src/smooth/ftgrays.c: s/TRaster/black_TRaster/, - s/PRaster/black_PRaster/. - * src/raster/ftraster.c: s/TRaster/gray_TRaster/, - s/PRaster/gray_PRaster/. +2014-11-29 Werner Lemberg -2012-02-20  Vinnie Falco + [docmaker] Use field values as HTML link targets where possible. - Prepare source code for amalgamation (3/6). + * src/tools/docmaker/tohtml.py (HtmlFormatter::make_block_url): + Accept second, optional argument to specify a name. + (HtmlFormatter::html_source_quote): Link to field ID if possible. + (HtmlFormatter::print_html_field_list): Emit `id' attribute. - * src/smooth/ftgrays.c: s/TWorker/black_TWorker/, - s/PWorker/black_PWorker/. - * src/raster/ftraster.c: s/TWorker/gray_TWorker/, - s/PWorker/gray_PWorker/. +2014-11-29 Werner Lemberg -2012-02-20  Vinnie Falco + [docmaker] Allow empty lines in `' blocks. - Prepare source code for amalgamation (2/6). + Before this patch, the suggested order of entries stopped at the + first empty line. - * src/smooth/ftgrays.c, src/raster/ftraster.c: Undefine FLOOR, - CEILING, TRUNC, and SCALED before defining it. + Obviously, nobody noticed that this problem caused a much reduced + set of links in the `Synopsis' sections; in particular, the + `' blocks contain a lot of entries that wouldn't be listed + otherwise... -2012-02-20  Vinnie Falco + * src/tools/docmaker/content.py (DocBlock::get_markup_words_all): + New function to iterate over all items. + (DocSection::process): Use it. - Prepare source code for amalgamation (1/6). +2014-11-29 Werner Lemberg - See discussion starting at + * src/tools/docmaker/sources.py (column) [Format 2]: Fix regexp. - http://lists.gnu.org/archive/html/freetype-devel/2012-01/msg00037.html + After the single asterisk there must be no other immediately following + asterisk. - * src/smooth/ftgrays.c: s/TBand/gray_TBand/. - * src/raster/ftraster.c: s/TBand/black_TBand/. +2014-11-29 Werner Lemberg -2012-02-17 Alexei Podtelezhnikov + * src/tools/docmaker/tohtml.py: Improve CSS for vertical spacing. - [autofit] Fix outline flags. +2014-11-29 Werner Lemberg - * src/autofit/afloader.c (af_loader_load_g): Don't reassign - `outline.flags' so that this information is preserved. See - discussion starting at + [docmaker] Improve HTML code for table of contents. - http://lists.gnu.org/archive/html/freetype-devel/2012-02/msg00046.html + * src/tools/docmaker/tohtml.py: Introduce a new table class `toc', + together with proper CSS. -2012-02-11 Werner Lemberg +2014-11-29 Werner Lemberg - [truetype] Fix Savannah bug #35466. + [docmaker] Provide higher-level markup and simplify HTML. - Jump instructions are now bound to the current function. The MS - Windows rasterizer behaves the same, as confirmed by Greg Hitchcock. + * src/tools/docmaker/tohtml.py: Instead of using extraneous `
' + elements, use CSS descendants (of class `section') to format the + data. - * src/truetype/ttinterp.h (TT_CallRec): Add `Cur_End' element. - * src/truetype/ttobjs.h (TT_DefRecord): Add `end' element. + Also remove reduntant

and
elements, replacing them with + proper CSS. - * src/truetype/ttinterp.c (DO_JROT, DO_JMPR, DO_JROF): Check upper - bound of jump address. - (Ins_FDEF, Ins_CALL, Ins_LOOPCALL, Ins_UNKNOWN, TT_RunIns): Updated. + Globally reduce page width to 75%. -2012-02-11 Werner Lemberg + (block_header): Rename

class to `section'. - We don't use `extensions'. +2014-11-29 Werner Lemberg - * include/freetype/internal/ftobjs.h (FT_DriverRec): Remove - `extensions' field. + [docmaker] Add `top' links after blocks. -2012-02-11 Werner Lemberg + * src/tools/docmaker/tohtml.py (block_footer_middle): Implement it. - Clean up `generic' fields. +2014-11-29 Werner Lemberg - * include/freetype/internal/ftobjs.h (FT_ModuleRec, FT_LibraryRec): - Remove `generic' field since users can't access it. + * src/tools/docmaker/tohtml.py: Improve CSS for fields. - * src/base/ftobjs.c (FT_Done_GlyphSlot): Call `generic.finalizer' as - advertised in the documentation of FT_Generic. - (Destroy_Module, FT_Done_Library): Updated to changes in `ftobjs.h'. + Make fields align horizontally relative to full line width. -2012-02-07 Werner Lemberg +2014-11-29 Werner Lemberg - [autofit] Harmonize function arguments. + * src/tools/docmaker/tohtml.py: Fix index and TOC templates. - * src/autofit/afloader.c, src/autofit/afloader.h: Use `FT_Int32' for - `load_flags'. + This thinko was introduced 2014-11-27. -2012-02-07 Werner Lemberg +2014-11-28 Werner Lemberg - * src/cff/cffobjs.c (cff_face_init): Remove unnecessary casts. + [docmaker] Format field lists with CSS. -2012-01-17 suzuki toshiya + This also simplifies the inserted HTML code. - [gxvalid] Fix Savannah bug #35286. + * src/tools/docmaker/tohtml.py + (HtmlFormatter::print_html_field_list): Do it. - Patch submitted by anonymous reporter. +2014-11-28 suzuki toshiya - * src/gxvalid/gxvcommn.c (gxv_XStateTable_subtable_setup): - gxv_set_length_by_ulong_offset() must be called with 3, not 4, - the number of the subtables in the state tables; classTable, - stateArray, entryTable. + Fix compiler warning to the comparison between signed and + unsigned variable. -2012-01-17 suzuki toshiya + * src/pfr/pfrsbit.c (pfr_slot_load_bitmap): Fix the comparison + between `ypos + ysize' and FT_INT_{MAX,MIN}. - [raccess] Modify for PIC build. +2014-11-28 Werner Lemberg - Based on the patch provided by Erik Dahlstrom , - http://lists.gnu.org/archive/html/freetype-devel/2012-01/msg00010.html + [docmaker] Replace empty `' with CSS. - Also `raccess_guess_table[]' and `raccess_rule_by_darwin_vfs()' - are renamed with `ft_' suffixes. + * src/tools/docmaker/tohtml.py (HtmlFormatter::section_enter): Do + it. - * src/base/ftbase.h: `raccess_rule_by_darwin_vfs()' is renamed - to `ft_raccess_rule_by_darwin_vfs()'. - * src/base/ftobjs.c: Ditto. +2014-11-28 Werner Lemberg - * src/base/ftrfork.c: Declarations of FT_RFork_Rule, - raccess_guess_rec, are moved to... - * include/freetype/internal/ftrfork.h: Here. + [docmaker] Replace some `' tags with `

' and `
'. - * include/freetype/internal/ftrfork.h: - FT_RFORK_RULE_ARRAY_{BEGIN,ENTRY,END} macros are defined - to replace raccess_guess_table[] in both of PIC and non-PIC - modes. - * src/base/ftrfork.c: raccess_guess_table[] array is rewritten - by FT_RFORK_RULE_ARRAY_{BEGIN,ENTRY,END}. + * src/tools/docmaker/tohtml.py (marker_*): Use `

'. + (source_*): Use `
'. + (HtmlFormatter::block_enter): s/

/

/. - * src/base/basepic.h (BasePIC): Add `ft_raccess_guess_table' - storage. (FT_RACCESS_GUESS_TABLE_GET): New macro to retrieve - the function pointer from `ft_raccess_guess_table' storage in - `BasePIC' structure. - * src/base/ftrfork.c (FT_Raccess_Guess): Rewritten with - FT_RACCESS_GUESS_TABLE_GET. - (raccess_get_rule_type_from_rule_index): Add `library' as the - first argument to the function, to retrieve the storage of - `ft_raccess_guess_table' from it. Also `raccess_guess_table' - is replaced by FT_RACCESS_GUESS_TABLE_GET. - (ft_raccess_rule_by_darwin_vfs): Ditto. +2014-11-28 suzuki toshiya -2012-01-16 suzuki toshiya + Fix compiler warning to conversion specifiers in debug messages. - Remove trailing spaces. + * src/autofit/afhints.c (af_glyph_hints_dump_points): Add length + modifier to dump long integers. + (af_glyph_hints_dump_segments, af_glyph_hints_dump_edges): Ditto. -2012-01-16 suzuki toshiya +2014-11-27 Werner Lemberg - Formatting PIC related sources. + * src/tools/docmaker/tohtml.py: Use more CSS for index. - * src/autofit/afpic.c: Harmonize to FT2 coding conventions. - * src/base/basepic.c: Ditto. - * src/base/ftpic.c: Ditto. - * src/cff/cffpic.c: Ditto. - * src/pshinter/pshpic.c: Ditto. - * src/psnames/pspic.c: Ditto. - * src/raster/rastpic.c: Ditto. - * src/sfnt/sfntpic.c: Ditto. - * src/smooth/ftspic.c: Ditto. - * src/truetype/ttpic.c: Ditto. +2014-11-27 Werner Lemberg -2012-01-16 suzuki toshiya + [docmaker] Replace `name' attribute of `' with `id'. - [autofit] Fix the inclusion of `aflatin2.h' in PIC file. + * src/tools/docmaker/tohtml.py (HtmlFormatter::block_enter): Do it. - * src/autofit/afpic.c: Include `aflatin2.h' when - FT_OPTION_AUTOFIT2 is defined, as afglobal.c does so. - Unconditionally inclusion causes declared but unimplemented - warning by GCC 4.6. +2014-11-27 Werner Lemberg -2012-01-16 suzuki toshiya + * src/tools/docmaker/tohtml.py: Remove remaining `width' attributes. - [cff] Remove redundant declarations of cff_cmap_XXX_class_rec. + For `Index' and `TOC' links, we now simply use the `text-align' CSS + property of `

' to enforce flush-left and flush-right, + eliminating the hack with an empty, full-width `' element + inbetween. - * src/cff/cffpic.c: The declarations of - FT_Init_Class_cff_cmap_encoding_class_rec() and - FT_Init_Class_cff_cmap_unicode_class_rec() are removed. - They can be obtained by the inclusion of cffcmap.h. - cffcmap.h invokes FT_DECLARE_CMAP_CLASS() and it declares - FT_Init_Class_cff_cmap_encoding_class_rec() etc in PIC mode. + The change also enforces the same (smaller) size for all index and + TOC links. -2012-01-15 suzuki toshiya +2014-11-27 suzuki toshiya - Fix redundant declaration warning in PIC mode. + * src/cff/cf2font.c: Include `ftcalc.h' to use FT_MSB(), + cf2font.c could not find it under `make multi' build. - Originally FT_DEFINE_{DRIVER,MODULE,RENDERER}() macros were - designed to declare xxx_pic_{free,init} by themselves. - Because these macros are used at the end of the module - interface (e.g. ttdriver.c) and the wrapper source to build - a module as a single object (e.g. truetype.c) includes - the PIC file (e.g. ttpic.c) before the module interface, - these macros are expanded AFTER xxx_pic_{free,init} body - when the modules are built as single object. - The declaration after the implementation causes the redundant - declaration warnings, so the declarations are moved to module - PIC headers (e.g. ttpic.h). Separating to other header files - are needed for multi build. +2014-11-27 suzuki toshiya - * include/freetype/internal/ftdriver.h (FT_DEFINE_DRIVER): - Remove class_##_pic_free and class_##_pic_init declarations. - * include/freetype/internal/ftobjs.h (FT_DEFINE_RENDERER, - FT_DEFINE_MODULE): Ditto. + * src/smooth/ftsmooth.c (ft_smooth_render_generic): Remove + unrequired negative value check for `width' and `height'. - * src/base/basepic.h: Insert a comment and fix coding style. - * src/autofit/afpic.h: Declare autofit_module_class_pic_{free, - init}. - * src/cff/cffpic.h: Declare cff_driver_class_pic_{free,init}. - * src/pshinter/pshpic.h: Declare pshinter_module_class_pic_{free, - init}. - * src/psnames/pspic.h: Declare psnames_module_class_pic_{free, - init}. - * src/raster/rastpic.h: Declare - ft_raster{1,5}_renderer_class_pic_{free,init} - * src/sfnt/sfntpic.h: Declare sfnt_module_class_pic_{free,init}. - * src/smooth/ftspic.h: Declare - ft_smooth_{,lcd_,lcdv_}renderer_class_pic_{free,init}. - * src/truetype/ttpic.h: Declare tt_driver_class_pic_{free,init}. +2014-11-27 Werner Lemberg -2012-01-15 suzuki toshiya + * src/tools/docmaker/tohtml.py: More HTML table refactoring. - Make pspic.c to include module error header to fix multi build. + Replace some `' tags with `
' to simplify structure. - * src/psnames/pspic.c: Include `psnamerr.h'. + Move `bgcolor' attribute to CSS. -2012-01-14 suzuki toshiya + Replace most `width' attributes with CSS. The remaining instances + (providing a similar effect as LaTeX's `\hfill' command) are removed + in a later patch. - [base] Fix a dereference of uninitialized variable in PIC mode. +2014-11-27 Werner Lemberg - * src/base/ftglyph.c (FT_Glyph_To_Bitmap): `glyph' must be - set before derefering to obtain `library'. The initialization - of `clazz', `glyph', `library' and NULL pointer check are - reordered to minimize PIC conditonals. + * src/tools/docmaker/tohtml.py: Replace with CSS. -2012-01-14 suzuki toshiya +2014-11-27 Werner Lemberg - [base] Insert explicit cast for GCC 4.6 in PIC mode. + * src/tools/docmaker/tohtml.py: Center
with CSS. - * src/base/ftinit.c (FT_Add_Default_Modules): Under PIC - configuration, FT_DEFAULT_MODULES_GET returns - FT_Module_Class** pointer, GCC 4.6 warns that - const FT_Module_Class* const* variable is warned as - inappropriate to store it. To calm it, explicit cast is - inserted. Also `library' is checked to prevent the NULL - pointer dereference in FT_DEFAULT_MODULES_GET. +2014-11-27 Werner Lemberg -2012-01-13 suzuki toshiya + * src/tools/docmaker/tohtml.py: Replace `
' with `
'. - Fix PIC build broken by d9145241fe378104ba4c12a42534549faacc92e6. +2014-11-27 Werner Lemberg - Under PIC configuration, FT_{CFF,PSCMAPS,SFNT,TT}_SERVICES_GET - take no arguments but derefer the variable named `library' - internally. + * src/tools/docmaker/tohtml.py: Remove redundant `
' tags. - * src/cff/cffdrivr.c (cff_get_interface): Declare `library' and - set it if non-NULL driver is passed. - * src/truetype/ttdriver.c (tt_get_interface): Ditto. + This starts a series of commits into the direction of generating + valid HTML 5 code, especially using much more CSS. - * src/sfnt/sfdriver.c (sfnt_get_interface): Declare `library' - under PIC configuration, and set it if non-NULL module is given. - * src/psnames/psmodule.c (psnames_get_interface): Ditto. +2014-11-27 suzuki toshiya -2012-01-13 suzuki toshiya + Prevent too negative values (< FT_INT_MIN) in bitmap metrics, + suggested by Alexei. - Make PIC files include module error headers, to use the error codes - with per-module prefix. + * src/pfr/pfrsbit.c (pfr_slot_load_bitmap): Prevent too + negative values in `xpos' and `ypos + ysize'. + * src/smooth/ftsmooth.c (ft_smooth_render_generic): Prevent + too negative values in `x_left' and `y_top'. Either negative + values in `width' and `height' are checked. - * src/autofit/afpic.c: Include `aferrors.h'. - * src/cff/cffpic.c: Include `cfferrs.h'. - * src/pshinter/pshpic.c: Include `pshnterr.h'. - * src/raster/rastpic.c: Include `rasterrs.h'. - * src/sfnt/sfntpic.c: Include `sferrors.h'. - * src/smooth/ftspic.c: Include `ftsmerrs.h'. - * src/truetype/ttpic.c: Include `tterrors.h'. +2014-11-27 Werner Lemberg -2012-01-04 Tobias Ringström + [docmaker] Produce better HTML code. - [truetype] Fix IP instruction if x_ppem != y_ppem. + * src/tools/docmaker/tohtml.py: Always use double quotes for + attribute values. + (source_footer): Close `td' and `tr' groups. - * src/truetype/ttinterp.c (Ins_IP): Scale `orus' coordinates - properly. +2014-11-27 Werner Lemberg -2012-01-02 Werner Lemberg + Use better way to disable creation of .pyc files for `make refdoc'. - Fix tracing message for `loca' table. + Python 2.6 was released in 2008... - * src/truetype/ttpload.c (tt_face_get_location): Don't emit a - warning message if the last `loca' entry references an empty glyph. + * builds/freetype.mk (refdoc): Use python's `-B' option. -2011-12-10 Werner Lemberg + * builds/detect.mk (std_setup, dos_setup): Mention required python + version for `refdoc' target. - Add some variable initializations. - Reported by Richard COOK . +2014-11-27 Werner Lemberg - * src/type1/t1driver.c (t1_ps_get_font_value): Initialize `val'. - * src/smooth/ftgrays.c (gray_render_conic): Initialize `levels' - earlier. + * src/tools/docmaker/sources.py (re_bold, re_italic): Use + non-grouping parentheses. + * src/tools/docmaker/tohtml.py (HtmlFormatter::make_html_word): + Updated. -2011-12-08 Werner Lemberg +2014-11-27 Werner Lemberg - Fix serious scaling bug in `FT_Get_Advances'. + * src/base/ftobjs.c (FT_Get_Glyph_Name): Fix compiler warning. - * src/base/ftadvanc.c (FT_Get_Advances): Advance values returned by - `FT_Load_Glyph' must be simply multiplied by 1024. + Introdruced in previous change. Reported by Alexei. -2011-12-08 Werner Lemberg +2014-11-26 Werner Lemberg - * src/bdf/bdflib.c (_bdf_parse_start): Drop redundant error tracing. + * src/*: Add checks for parameters of API functions where missing. -2011-12-02 suzuki toshiya + `API functions' are functions tagged with `FT_EXPORT_DEF'. - [mac] Unify DARWIN_NO_CARBON with FT_MACINTOSH. + Besides trivial fixes, the following changes are included, too. - Originally FT_MACINTOSH was a pure auto macro and DARWIN_NO_CARBON - was a configurable macro to disable Carbon-dependent code. Because - now configure script sets DARWIN_NO_CARBON by default and disables - Darwin & Carbon-dependent codes, these macros can be unified. - FT_MACINTOSH (undefined by default) is kept and DARWIN_NO_CARBON - (defined by default) is removed, because DARWIN_NO_CARBON violates - FT_XXX naming convention of public macros, and a macro configured by - default is not portable for the building without configure (e.g. - make devel). + * src/base/ftbdf.c (FT_Get_BDF_Charset_ID, FT_Get_BDF_Property): Set + error code if no service is available. - * builds/unix/configure.raw: Define FT_MACINTOSH if Carbon-based - old Mac font support is requested and Carbon is available. - * builds/unix/ftconfig.in: Undefine FT_MACINTOSH when the support - for Mac OS X without Carbon (e.g. Mac OS X 10.4 for ppc64) is - requested. - * include/freetype/config/ftconfig.in: Ditto. - * builds/vms/ftconfig.h: Ditto. + * src/base/ftinit.c (FT_Done_FreeType): Change return value for + invalid `library' parameter to `Invalid_Library_Handle'. - * src/base/ftbase.h: Remove DARWIN_NO_CARBON. - * src/base/ftbase.c: Ditto. - * src/base/ftobjs.c: Ditto. - * src/base/ftrfork.c: Ditto. + * src/base/ftobjs.c (FT_New_Size): Change return value for invalid + `asize' parameter to `Invalid_Argument'. - * src/base/ftmac.c: Compile the body if FT_MACINTOSH is defined - (same with TT_USE_BYTECODE_INTERPRETER in ttinterp.c). - * builds/mac/ftmac.c: Ditto. + * src/base/ftoutln.c (FT_Outline_Copy): Change return value for + invalid `source' and `target' parameters to `Invalid_Outline'. + (FT_Outline_Done_Internal): Change return value for invalid + `outline' parameter to `Invalid_Outline'. - * builds/mac/FreeType.m68k_cfm.make.txt: Define FT_MACINTOSH. - * builds/mac/FreeType.m68k_far.make.txt: Ditto. - * builds/mac/FreeType.ppc_classic.make.txt: Ditto. - * builds/mac/FreeType.ppc_carbon.make.txt: Ditto. +2014-11-26 Werner Lemberg -2011-11-30 suzuki toshiya + * src/cache/ftcbasic.c: Use single calls to `FT_TRACE'. - Fix Savannah bug #34728 (`make devel' on Mac OS X). +2014-11-26 suzuki toshiya - * builds/toplevel.mk: Check `/dev/null' to identify the Unix- - like systems without `init' nor `hurd' (e.g. Mac OS X >= 10.4). - * builds/unix/detect.mk: Ditto. + * src/base/ftobj.c (Mac_Read_POST_Resource): Additional + overflow check in the summation of POST fragment lengths, + suggested by Mateusz Jurczyk . -2011-11-30 suzuki toshiya +2014-11-26 suzuki toshiya - [apinames] Fix the overflow of signed integer hash. + * src/base/ftobjs.c (Mac_Read_POST_Resource): Insert comments + and fold too long tracing messages. - * src/tools/apinames.c (names_add): Change the type of `h' from - int to unsigned int, to prevent undefined behaviour in the - overflow of signed integers (overflow of unsigned int is defined - to be wrap around). Found by clang test suggested by Sean - McBride. +2014-11-26 suzuki toshiya -2011-11-30 Werner Lemberg + Fix Savannah bug #43540. - [winfonts] Remove casts. + * src/base/ftmac.c (parse_fond): Prevent a buffer overrun + caused by a font including too many (> 63) strings to store + names[] table. - * src/winfonts/winfnt.c (winfnt_driver_class): Remove all casts and - update affected functions. - (FNT_Size_Select): Fix number of arguments. +2014-11-26 suzuki toshiya -2011-11-30 Werner Lemberg + * src/base/ftobjs.c (Mac_Read_POST_Resource): Use unsigned long + variables to read the lengths in POST fragments. Suggested by + Mateusz Jurczyk . - [type42] Remove casts. +2014-11-26 suzuki toshiya - * src/type42/t42driver.c (t42_driver_class): Remove all casts and - update affected functions. + Fix Savannah bug #43539. - * src/type42/t42objs.c, src/type42/t42objs.h: Updated for t42driver - changes. + * src/base/ftobjs.c (Mac_Read_POST_Resource): Fix integer overflow + by a broken POST table in resource-fork. -2011-11-30 Werner Lemberg +2014-11-26 suzuki toshiya - [type1] Remove casts. + Fix Savannah bug #43538. - * src/type1/t1driver.c (t1_driver_class): Remove all casts and - update affected functions. + * src/base/ftobjs.c (Mac_Read_POST_Resource): Fix integer overflow + by a broken POST table in resource-fork. - * src/type1/t1gload.c, src/type1/t1gload.h, src/type1/t1objs.c: - Updated for t1driver changes. - src/type1/t1objs.h (T1_Driver): Remove unused typedef. - Updated for t1driver changes. +2014-11-26 suzuki toshiya -2011-11-27 Werner Lemberg + * src/base/ftobjs.c (Mac_Read_POST_Resource): Avoid memory leak + by a broken POST table in resource-fork. Return after freeing + the buffered POST table when it is found to be broken. - [bdf] Fix Savannah bug #34896. +2014-11-25 Werner Lemberg - ENCODING now covers the whole Unicode range. + */*: s/Invalid_Argument/Invalid_Size_Handle/ where appropriate. - Note, however, that this change is quite expensive since it - increases the size of three arrays by almost 400kByte in total. The - right fix is to replace the logic with something smarter. - Additionally, there exist very old BDFs for three-byte CCCII - encoding which exceeds the range of Unicode (another reason to have - a smarter logic). +2014-11-25 Werner Lemberg - * src/bdf/bdf.h (bdf_font_t): Increase size of `nmod' and `umod' - arrays. - * src/bdf/bdflib.c (bdf_parse_t): Increase size of `have' array. + */*: s/Invalid_Argument/Invalid_Stream_Handle/ where appropriate. -2011-11-27 Werner Lemberg +2014-11-25 Werner Lemberg - [bdf] Improve tracing. + */*: s/Invalid_Argument/Invalid_Library_Handle/ where appropriate. - * src/bdf/bdflib.c (DBGMSG1, DBGMSG2): New macros. - (_bdf_parse_glyphs): Use them. +2014-11-25 Werner Lemberg -2011-11-26 Werner Lemberg + */*: s/Invalid_Argument/Invalid_Outline/ where appropriate. - Improve tracing. +2014-11-25 Werner Lemberg - * src/bdf/bdfdrivr.c (BDF_Face_Done), src/pcf/pcfdrivr.c - (PCF_Face_Done): Remove tracing message. + */*: s/Invalid_Argument/Invalid_Face_Handle/ where appropriate. - * src/bdf/bdfdrivr.c (BDF_Face_Init), src/cff/cffobjs.c - (cff_face_init), src/cid/cidobjs.c (cid_face_init), - src/pfr/pfrobjs.c (pfr_face_init), src/sfnt/sfobjs.c - (sfnt_init_face), src/truetype/ttobjs.c (tt_face_init), - src/type1/t1objs.c (T1_Face_Init), src/type42/t42objs.c - (T42_Face_Init), src/winfonts/winfnt.c (FNT_Face_Init): Add - `greeting' message. +2014-11-24 Werner Lemberg - * src/sfnt/sfobjs.c (sfnt_open_font), src/type42/t42objs.c - (T42_Open_Face): Improve tracing. + [Savannah bug #43682] Adjust some renderer callbacks. -2011-11-26 Werner Lemberg + * src/raster/ftraster.c (ft_black_set_mode): Change return type to + `int' to stay in sync with `FT_Renderer_SetModeFunc' prototype. - [cid] Fix error code. + * src/smooth/ftgrays.c (gray_raster_set_mode): New dummy function + for orthogonality. + (ft_grays_raster): Use it. - * src/cid/cidparse.c (cid_parser_new): Do it. +2014-11-25 Werner Lemberg -2011-11-26 Werner Lemberg + [Savannah bug #43682] Properly handle missing return errors. - [cff] Fix error code. + The functions in this patch *do* return non-trivial errors that must + be taken care of. - * src/cff/cffload.c (cff_font_load): Do it. + * src/autofit/afloader.c (af_loader_load_g), src/base/ftobjs.c + (FT_Render_Glyph_Internal), src/base/ftoutln.c (FT_Outline_Render), + src/cff/cffgload.c (cff_decoder_parse_charstrings) , + src/psaux/psobjs.c (ps_parser_load_field_table), src/psaux/t1decode + (t1_decoder_parse_charstrings) , src/truetype/ttgload.c + (load_truetype_glyph , tt_loader_init, + TT_Load_Glyph), src/truetype/ttgxvar.c (TT_Set_MM_Blend), + src/truetype/ttobjs.c (tt_size_run_fpgm, tt_size_run_prep): Do it. -2011-11-26 Werner Lemberg +2014-11-25 Werner Lemberg - Add new error code FT_Err_Missing_Module. + [Savannah bug #43682] Add/remove `void' casts to some functions. - Previously, FreeType misleadingly returned - FT_Err_Unknown_File_Format if a module was missing (or a test was - missing completely). + We use a cast to indicate that we intentionally ignore a function's + return value. However, this doesn't apply to API functions where + errors can only happen for trivially invalid input. - * include/freetype/fterrdef.h (FT_Err_Missing_Module): Define. + * src/base/ftstroke.c (FT_Glyph_Stroke, FT_Glyph_StrokeBorder), + src/base/ftsynth.c (FT_GlyphSlot_Embolden), src/cff/cffgload.c + (cff_slot_load), src/pfr/pfrdrivr.c (pfr_get_kerning), + src/type1/t1load.c (parse_encoding), src/type42/t42parse.c + (t42_parse_encoding): Do it. - * src/cff/cffobjs.c (cff_face_init), src/cff/cffdrivr.c - (cff_get_glyph_name), src/cid/cidobjs.c (cid_face_init), - src/sfnt/sfobjs.c (sfnt_init_face), src/truetype/ttobjs.c - (tt_face_init), src/type1/t1objs.c (T1_Face_Init), - src/type42/t42objs.c (T42_Face_Init, T42_Driver_Init): Updated. +2014-11-25 Werner Lemberg - * src/type1/t1afm.c (T1_Read_Metrics), src/type/t1objs.c - (T1_Face_Init), src/type42/t42objs.c (T42_Face_Init): Remove now - redundant test for `psaux'. + [Savannah bug #43682] Change some signatures to `void' return type. -2011-11-25 Werner Lemberg + * include/internal/pshints.h (PSH_Globals_SetScaleFunc), + include/internal/sfnt.h (TT_Get_Metrics_Func), + src/pshinter/pshglob.c (psh_globals_set_scale), + src/pshinter/pshrec.c (ps_hints_init), src/sfnt/ttmtx.c + (tt_face_get_metrics), src/truetype/ttinterp.c (TT_Goto_CodeRange, + TT_Set_CodeRange, TT_Clear_CodeRange, TT_Done_Context, + TT_Save_Context): Do it. - [bdf] Add more error messages. + * src/pshinter/pshglob.h, src/pshinter/pshrec.h, src/sfnt/ttmtx.h, + src/truetype/ttgload.c (TT_Hint_Glyph), src/truetype/ttinterp.c + (TT_Run_Context), src/truetype/ttinterp.h, src/truetype/ttobjs.c + (tt_size_run_fpgm, tt_size_run_prep): Updated. - * src/bdf/bdflib.c (_bdf_set_default_spacing, _bdf_add_property): - Add line number argument. - Update all callers. - (ERRMSG5, ERRMSG6, ERRMSG7, ERRMSG8, ERRMSG9): New macros. - (_bdf_readstream, _bdf_set_default_spacing, _bdf_add_property, - _bdf_parse_glyphs, _bdf_parse_start): Add error messages. +2014-11-24 Werner Lemberg -2011-11-24 Werner Lemberg + Remove all code related to FT_MAX_CHARMAP_CACHEABLE. - * include/freetype/fterrors.h: Remove dead code. + This is no longer used. -2011-11-15 Werner Lemberg + * src/base/ftobjs.c, src/cache/ftccmap.c, src/cff/cffobjs.c, + src/sfnt/ttcmap.c: Do it. - * docs/releases: Updated. +2014-11-24 Werner Lemberg -2011-11-15 Werner Lemberg + [sfnt] Fix Savannah bug #43680. - * Version 2.4.8 released. - ========================= + This adds an additional constraint to make the fix from 2013-01-25 + really work. + * src/sfnt/ttsbit.c (tt_sbit_decoder_load_image) : + Check `p' before `num_glyphs'. - Tag sources with `VER-2-4-8'. +2014-11-24 Werner Lemberg - * docs/CHANGES: Updated. + [truetype] Fix Savannah bug #43679. - * docs/VERSION.DLL: Update documentation and bump version number to - 2.4.8. + * src/truetype/ttpload.c (tt_face_load_hdmx): Check minimum size of + `record_size'. - * README, Jamfile (RefDoc), - builds/win32/vc2005/freetype.vcproj, builds/win32/vc2005/index.html, - builds/win32/vc2008/freetype.vcproj, builds/win32/vc2008/index.html, - builds/win32/vc2010/freetype.vcxproj, builds/win32/vc2010/index.html, - builds/win32/visualc/freetype.dsp, - builds/win32/visualc/freetype.vcproj, - builds/win32/visualc/index.html, builds/win32/visualce/freetype.dsp, - builds/win32/visualce/freetype.vcproj, - builds/win32/visualce/index.html, - builds/wince/vc2005-ce/freetype.vcproj, - builds/wince/vc2005-ce/index.html, - builds/wince/vc2008-ce/freetype.vcproj, - builds/wince/vc2008-ce/index.html: s/2.4.7/2.4.8/, s/247/248/. +2014-11-24 Jarkko Pöyry - * include/freetype/freetype.h (FREETYPE_PATCH): Set to 8. + [cff, pfr, psaux, winfonts] Fix Savannah bug #43676. - * builds/unix/configure.raw (version_info): Set to 14:0:8. + Don't cast cmap init function pointers to an incompatible type. -2011-11-13 Chris Liddell + Without this patch, the number of parameters between declaration and + the real signature differs. Calling such a function results in + undefined behavior. - Add FT_Get_PS_Font_Value() API. + ISO/IEC 9899:TC3 (Committee Draft September 7, 2007) + 6.5.2.2 Function calls + 9 If the function is defined with a type that is not + compatible with the type (of the expression) pointed to by + the expression that denotes the called function, the + behavior is undefined. - This allows a Type 1 font face to be interrogated to retrieve most - of the dictionary keys (keys not relevant to FreeType's Type 1 - interpreter are not available). + On certain platforms (c -> js with emscripten) this causes + termination of execution or invalid calls because in the emscripten + implementation, function pointers of different types are stored in + different pointer arrays. Incorrect pointer type here results in + indexing of an incorrect array. - * include/freetype/internal/services/svpsinfo.h - (PS_GetFontValueFunc): New typedef. - (PSInfo): Add `ps_get_font_value'. - (FT_DEFINE_SERVICE_PSINFOREC): Updated. + * src/cff/cffcmap.c (cff_cmap_encoding_init, cff_cmap_unicode_init), + src/pfr/pfrcmap.c (pfr_cmap_init), src/psaux/t1cmap.c + t1_cmap_standard_init, t1_cmap_expert_init, t1_cmap_custom_init, + t1_cmap_unicode_init), src/winfonts/winfnt.c (fnt_cmap_init): Fix + signature. - * include/freetype/internal/t1types.h (T1_EncodingType): Moved to... - * include/freetype/t1tables.h: Here. - (PS_Dict_Keys): New enumeration. - (FT_Get_PS_Font_Value): New declaration. +2014-11-24 Werner Lemberg - * src/base/fttype1.c (FT_Get_PS_Font_Value): New function. + [sfnt] Fix Savannah bug #43672. - * src/type1/t1driver.c (t1_ps_get_font_value): This new function - does the real job. - (t1_service_ps_info): Add it. + * src/sfnt/ttkern.c (tt_face_load_kern): Use correct value for + minimum table length test. - * src/cff/cffdrivr.c (cff_service_ps_info), src/cid/cidriver.c - (cid_service_ps_info), src/type42/t42drivr.c (t42_service_ps_info): - Updated. +2014-11-24 Werner Lemberg -2011-11-08 Braden Thomas + [type1, type42] Another fix for Savannah bug #43655. - [cid] Various loading fixes. + * src/type1/t1load.c (parse_charstrings), src/type42/t42parse.c + (t42_parse_charstrings): Add another boundary testing. - * src/cid/cidload.c (cid_load_keyword) , - (parse_font_matrix, parse_expansion_factor): Correctly check number - of dictionaries. - (cid_read_subrs): Protect against invalid values of `num_subrs'. - Assure that the elements of the `offsets' array are ascending. +2014-11-24 Werner Lemberg -2011-11-05 Werner Lemberg + [docmaker] Formatting, copyright, improved documentation. - * README: We use copyright ranges also. + * src/tools/docmaker/*: No code changes besides trivial + modifications. - According to +2014-11-22 Werner Lemberg - http://www.gnu.org/prep/maintain/html_node/Copyright-Notices.html + [bdf] Fix Savannah bug #43660. - this should be mentioned explicitly. + * src/bdf/bdflib.c (_bdf_parse_glyphs) <"ENDFONT">: Check + `_BDF_GLYPH_BITS'. -2011-10-30 suzuki toshiya +2014-11-22 Werner Lemberg - [raccess] Supplement for previous fix. + [type42] Allow only embedded TrueType fonts. - * src/base/ftbase.h (raccess_rule_by_darwin_vfs): Do not declare - it on native Mac OS X. - * src/base/ftrfork.c (raccess_get_rule_type_from_rule_index): - Hide raccess_get_rule_type_from_rule_index() on native Mac OS X - too. + This is a follow-up to Savannah bug #43659. -2011-10-30 suzuki toshiya + * src/type42/t42objs.c (T42_Face_Init): Exclusively use the + `truetype' font driver for loading the font contained in the `sfnts' + array. - [raccess] Hide raccess_rule_by_darwin_vfs() on native Mac OS X. +2014-11-22 Werner Lemberg - * src/base/ftrfork.c (raccess_rule_by_darwin_vfs): Do not - compile on native Mac OS X because it is not used. + [type42] Fix Savannah bug #43659. -2011-10-25 Werner Lemberg + * src/type42/t42objs.c (T42_Open_Face): Initialize `face->ttf_size'. - [truetype] Fix MD instruction for twilight zone. + * src/type42/t42parse.c (t42_parse_sfnts): Always set + `face->ttf_size' directly. This ensures a correct stream size in + the call to `FT_Open_Face', which follows after parsing, even for + buggy input data. + Fix error messages. - * src/truetype/ttinterp.c (Ins_MD): Without this fix, the MD - instruction applied to original coordinates of twilight points - always returns zero. +2014-11-22 Werner Lemberg -2011-10-18 Werner Lemberg + [cff] Fix Savannah bug #43658. - * Version 2.4.7 released. - ========================= + * src/cff/cf2ft.c (cf2_builder_lineTo, cf2_builder_cubeTo): Handle + return values of point allocation routines. +2014-11-22 Werner Lemberg - Tag sources with `VER-2-4-7'. + [sfnt] Fix Savannah bug #43656. - * docs/CHANGES: Updated. + * src/sfnt/ttcmap.c (tt_cmap4_validate): Fix order of validity + tests. - * docs/VERSION.DLL: Update documentation and bump version number to - 2.4.7. +2014-11-21 Werner Lemberg - * README, Jamfile (RefDoc), - builds/win32/vc2005/freetype.vcproj, builds/win32/vc2005/index.html, - builds/win32/vc2008/freetype.vcproj, builds/win32/vc2008/index.html, - builds/win32/vc2010/freetype.vcxproj, builds/win32/vc2010/index.html, - builds/win32/visualc/freetype.dsp, - builds/win32/visualc/freetype.vcproj, - builds/win32/visualc/index.html, builds/win32/visualce/freetype.dsp, - builds/win32/visualce/freetype.vcproj, - builds/win32/visualce/index.html, - builds/wince/vc2005-ce/freetype.vcproj, - builds/wince/vc2005-ce/index.html, - builds/wince/vc2008-ce/freetype.vcproj, - builds/wince/vc2008-ce/index.html: s/2.4.6/2.4.7/, s/246/247/. + [type1, type42] Fix Savannah bug #43655. - * include/freetype/freetype.h (FREETYPE_PATCH): Set to 7. + * src/type1/t1load.c (parse_charstrings), src/type42/t42parse.c + (t42_parse_charstrings): Fix boundary testing. - * builds/unix/configure.raw (version_info): Set to 13:2:7. +2014-11-21 Werner Lemberg -2011-10-15 Kal Conley + * src/pcf/pcfread.c (pcf_get_metrics): Sanitize invalid metrics. - Fix handling of transformations if no renderer is present. +2014-11-21 Werner Lemberg - * src/base/ftobjs.c (FT_Load_Glyph): Thinko. + [ftlcdfil] Obey flow direction. -2011-10-15 Kal Conley + * src/base/ftlcdfil.c (_ft_lcd_filter_fir, _ft_lcd_filter_legacy): + Handle `up' flow. - Fix conditions for autohinting. +2014-11-21 Werner Lemberg - * src/base/ftobjs.c (FT_Load_Glyph): Handle - FT_LOAD_IGNORE_TRANSFORM. + * src/base/ftbitmap.c (FT_Bitmap_Convert): Improve. -2011-10-07 suzuki toshiya + This commit completes argument checks and adds support for different + flow directions. - [gxvalid] Fix a bug to detect too large offset in morx table. +2014-11-21 Werner Lemberg - * src/gxvalid/gxvmorx2.c - (gxv_morx_subtable_type2_ligActionIndex_validate): Fix a bug - that too large positive offset cannot be detected. + * src/base/ftbitmap.c (FT_Bitmap_Copy): Improve. -2011-10-01 Braden Thomas + This commit adds argument checks and support for different flow + directions. - Handle some border cases. +2014-11-20 Werner Lemberg - * include/freetype/config/ftstdlib.h (FT_USHORT_MAX): New macro. + * src/base/ftbitmap.c (FT_Bitmap_New): Check argument. - * src/base/ftbitmap.c (FT_Bitmap_Convert): Protect against invalid - value of `target->rows'. +2014-11-19 Werner Lemberg - * src/psaux/t1decode.c (t1_decoder_parse_charstrings): Add check for - flex start. + Change some fields in `FT_Bitmap' to unsigned type. - * src/raster/ftrend1.c (ft_raster1_render): Check `width' and - `height'. + This doesn't break ABI. - * src/truetype/ttgxvar.c (TT_Vary_Get_Glyph_Deltas): Protect against - invalid values in `localpoints' array. + * include/ftimage.h (FT_Bitmap): Make `rows', `width', `num_grays', + `pixel_mode', and `palette_mode' unsigned types. -2011-10-01 Werner Lemberg + * src/base/ftbitmap.c: Updated. + (FT_Bitmap_Copy): Fix casts. - [psnames] Handle zapfdingbats. - Problem reported by Nicolas Rougier . + * src/cache/ftcsbits.c, src/raster/ftraster.c, src/sfnt/pngshim.c: + Updated. - * src/tools/glnames.py (adobe_glyph_list): Add data from AGL's - `zapfdingbats.txt' file. +2014-11-19 Werner Lemberg - * src/psnames/pstables.h: Regenerated. + Make `FT_Bitmap_Convert' correctly handle negative `pitch' values. -2011-09-27 Simon Bünzli + * src/base/ftbitmap.c (FT_Bitmap_Convert): Always use positive value + for the pitch while copying data. + Correctly set pitch sign in target bitmap. - Fix Savannah bug #34189. +2014-11-19 Werner Lemberg - * src/type1/t1load.c (T1_Open_Face): Initialize - `face->len_buildchar'. + Minor code improvement in `FT_Bitmap_Embolden'. -2011-09-26 Werner Lemberg + * src/base/ftbitmap.c (FT_Bitmap_Embolden) : + Fix thinko. - [cff] Dump SIDs while tracing. +2014-11-19 Alexei Podtelezhnikov - * src/cff/cffobjs.c (cff_face_init): Do it. + * src/base/fttrigon.c: Use dedicated `FT_Angle' for arctan table. - * src/cff/cffparse.c (cff_parser_run) [FT_DEBUG_LEVEL_TRACE] - : Identify as SID. +2014-11-19 Behdad Esfahbod -2011-09-17 Werner Lemberg + Avoid compiler warnings on x86-64 for `FT_MulFix'. - Remove unused FT_ALIGNMENT macro. + `FT_MulFix' takes `FT_Long' parameters as defined in `freetype.h', + but several inline implementations of it in `ftcalc.h' take + `FT_Int32' arguments. This is causing compiler warnings on x86-64: + If parameters of type `FT_Fixed' (= `FT_Long') are passed to the + inline implementation of this function, integer values are truncated + from 64bit to 32bit. - * builds/unix/ftconfig.in, builds/vms/ftconfig.h, - include/freetype/config/ftconfig.h: Do it. + * include/internal/ftcalc.h (FT_MulFix) [FT_MULFIX_ASSEMBLER]: Add + casts. -2011-09-17 Alexei Podtelezhnikov +2014-11-15 Werner Lemberg - [smooth] Slightly optimize conic and cubic flatterners. + [sfnt] Fix Savannah bug #43597. - * src/smooth/ftgrays.c (gray_render_conic, gray_render_cubic): Move - out some code from the main loop to speed it up. + * src/sfnt/pngshim.c (Load_SBit_Png): Protect against too large + bitmaps. -2011-09-11 Tomas Hoger +2014-11-12 Werner Lemberg - Slightly improve LZW_CLEAR handling. + [sfnt] Fix Savannah bug #43591. - * src/lzw/ftzopen.c (ft_lzwstate_io) : - Ensure that subsequent (modulo garbage byte(s)) LZW_CLEAR codes are - handled as clear codes. This also re-sets old_code and old_char to - predictable values, which is a little better than using `random' - ones if the code following LZW_CLEAR is invalid. + * src/sfnt/ttsbit.c (tt_sbit_decoder_init): Protect against addition + and multiplication overflow. -2011-09-11 Tomas Hoger +2014-11-12 Werner Lemberg - Add explicit LZW decompression stack size limit. + [sfnt] Fix Savannah bug #43590. - Stack larger than 1< - This patch adds explicit stack size limit, enforced when stack is - realloced. + [sfnt] Fix Savannah bug #43589. - An alternative is to ensure that code < state->prefix[code - 256] - when traversing prefix table. Such check is less efficient and - should not be required if prefix table is constructed correctly in - the first place. + * src/sfnt/sfobjs.c (woff_open_font): Protect against addition + overflow. - * src/lzw/ftzopen.c (ft_lzwstate_stack_grow): Implement it. +2014-11-12 Werner Lemberg -2011-09-11 Tomas Hoger + [sfnt] Fix Savannah bug #43588. - Protect against loops in the prefix table. + * src/sfnt/ttcmap.c (tt_cmap8_validate, tt_cmap10_validate, + tt_cmap12_validate, tt_cmap13_validate, tt_cmap14_validate): Protect + against overflow in additions and multiplications. - LZW decompressor did not sufficiently check codes read from the - input LZW stream. A specially-crafted or corrupted input could - create a loop in the prefix table, which leads to memory usage - spikes, as there's no decompression stack size limit. +2014-11-10 Alexei Podtelezhnikov - * src/lzw/ftzopen.c (ft_lzwstate_io) : First - code in valid LZW stream must be 0..255. - : In the special KwKwK case, code == free_ent, - code > free_ent is invalid. + [base] CORDIC improvements. -2011-09-09 Werner Lemberg + The scaling between the hypotenuse and its CORDIC approximation is + based on regression analysis. The smaller padding for `theta' is + justifed by its maximum error of less than 6. - Better tracing of metrics. + * src/base/fttrigon.c (ft_trig_downscale): Borrow code from + ./ftcalc.c (ft_multo64), change linear intercept. + (ft_trig_pseudo_polarize): Decrease `theta' padding. - * src/base/ftobjs.c (FT_Request_Size, FT_Select_Size): Decorate with - FT_TRACE. +2014-11-09 Werner Lemberg -2011-09-07 Werner Lemberg + * src/base/ftstroke.c (ft_stroker_inside): Fix border intersections. - Fix Savannah bug #33816. + One more place to check whether `radius' is zero. - * src/cff/cfftypes.h (CFF_FontRecDictRec): New member - `has_font_matrix'. - * src/cff/cffparse.c (cff_parse_font_matrix): Set it. - Update tracing output. - * src/cff/cffobjs.c (cff_face_init): Use it so that the heuristics - can be removed. + Problem reported by Marco Wertz . -2011-08-30 Werner Lemberg +2014-11-07 Werner Lemberg - Better tracing of metrics. + [bdf] Fix Savannah bug #43535. - * src/base/ftobjs.c (FT_Select_Metrics, FT_Request_Metrics): - Decorate with FT_TRACE. + * src/bdf/bdflib.c (_bdf_strncmp): New macro that checks one + character more than `strncmp'. + s/ft_strncmp/_bdf_strncmp/ everywhere. -2011-08-25 Werner Lemberg +2014-11-06 Werner Lemberg - [cff] Better tracing of the parsing process. + [pcf] Fix Savannah bug #43548. - * src/cff/cffload.c (cff_subfont_load, cff_font_load): Decorate with - FT_TRACE. + * src/pcf/pcfread.c (pcf_get_encodings): Add sanity checks for row + and column values. - * src/cff/cffparse.c (cff_parse_font_matrix, cff_parse_font_bbox, - cff_parse_private_dict, cff_parse_cid_ros): Updated. - (CFF_FIELD_NUM, CFF_FIELD_FIXED, CFF_FIELD_FIXED_1000, - CFF_FIELD_STRING, CFF_FIELD_BOOL, CFF_FIELD_CALLBACK, CFF_FIELD, - CFF_FIELD_DELTA): Add argument for ID. - (cff_parser_run): Decorate with FT_TRACE. +2014-11-06 Werner Lemberg - * src/cff/cffparse.h (CFF_Field_Handler) [FT_DEBUG_LEVEL_TRACE]: Add - `id' member. + [pcf] Fix Savannah bug #43547. - * src/cff/cfftoken.h: Add IDs to all fields. + * src/pcf/pcfread.c (pcf_read_TOC): Check `size' and `offset' + values. -2011-08-16 Werner Lemberg +2014-11-06 Werner Lemberg - Fix Savannah bug #34022. + * src/pcf/pcfread.c (pcf_read_TOC): Avoid memory leak. - * README, docs/INSTALL: Remove references to UPGRADE.UNIX. +2014-11-03 Infinality -2011-08-15 Werner Lemberg + * src/truetype/ttsubpix.c (COMPATIBILITY_MODE_Rules): Updated. - Fix Savannah bug #34018. + The previous commit deteriorates rendering of DejaVu and similar + fonts; this gets compensated with this rule. - * docs/UPGRADE.UNIX: Removed. Obsolete. +2014-11-03 Werner Lemberg -2011-08-15 David Bevan + * src/truetype/ttinterp.c (Ins_DELTAP): Fix subpixel hinting. - Fix Savannah bug #33992. + Before this patch, it was impossible to ever call DELTAP[123] in + subpixel hinting mode as described in the ClearType whitepaper; it + only worked if in `compatibility mode'. However, compatibility mode + essentially disables SHPIX, completely ruining hinting of + ttfautohint output, for example. - * src/base/ftstroke.c (FT_Stroker_ParseOutline): Fix border case. + We now follow the whitepaper more closely so that DELTAP[123] + instructions for touched points in the non-subpixel direction are + executed. -2011-08-12 Werner Lemberg - [truetype] Fix degenerate case in S{P,F,DP}VTL opcodes. + [smooth] Improve code readability. - * src/truetype/ttinterp.c (Ins_SxVTL): Handle p1 == p2 specially. - (Ins_SDPVTL): Handle v1 == v2 specially. + * src/smooth/ftsmooth.c (ft_smooth_render_generic): Rearrange code. -2011-08-09 Werner Lemberg +2014-10-31 Alexei Podtelezhnikov - Fix Savannah bug #33975. + [smooth] Reduce outline translations during rendering. - * src/cff/cffparse.c (cff_parse_font_matrix): Fix typo. + * src/smooth/ftsmooth.c (ft_smooth_render_generic): Translate origin + virtually by modifying cbox, actually translate outline if cumulative + shift is not zero. -2011-07-29 Werner Lemberg +2014-10-30 Alexei Podtelezhnikov - * Version 2.4.6 released. - ========================= + [smooth] Fix Savannah bug #35604 (cont'd). + * src/smooth/ftsmooth.c (ft_smooth_render_generic): Remove checks and + casts that became unnecessary after the variable type upgrades. - Tag sources with `VER-2-4-6'. +2014-10-29 Alexei Podtelezhnikov - * docs/CHANGES: Updated. + [smooth] Improve code readability. - * docs/VERSION.DLL: Update documentation and bump version number to - 2.4.6. + * src/smooth/ftsmooth.c (ft_smooth_render_generic): Rearrange code. - * README, Jamfile (RefDoc), - builds/win32/vc2005/freetype.vcproj, builds/win32/vc2005/index.html, - builds/win32/vc2008/freetype.vcproj, builds/win32/vc2008/index.html, - builds/win32/vc2010/freetype.vcxproj, builds/win32/vc2010/index.html, - builds/win32/visualc/freetype.dsp, - builds/win32/visualc/freetype.vcproj, - builds/win32/visualc/index.html, builds/win32/visualce/freetype.dsp, - builds/win32/visualce/freetype.vcproj, - builds/win32/visualce/index.html, - builds/wince/vc2005-ce/freetype.vcproj, - builds/wince/vc2005-ce/index.html, - builds/wince/vc2008-ce/freetype.vcproj, - builds/wince/vc2008-ce/index.html: s/2.4.5/2.4.6/, s/245/246/. +2014-10-29 Alexei Podtelezhnikov - * include/freetype/freetype.h (FREETYPE_PATCH): Set to 6. + Unify hypotenuse approximations. - * builds/unix/configure.raw (version_info): Set to 13:1:7. + * include/internal/ftcalc.h (FT_HYPOT): Move macro from here... + * include/internal/ftobjs.h: ... to here, next to required `FT_ABS'. + * src/smooth/ftgrays.c (gray_render_cubic): Use it here. -2011-07-29 Werner Lemberg +2014-10-25 Werner Lemberg - [cff] Add some more tracing infos. + [cff] Test valid darkening parameter macros in `ftoption.h'. - * src/cff/cffparse.c (cff_parse_font_matrix, cff_parse_font_bbox, - cff_parse_cid_ros): Add tracing. + We no longer need an otherwise unused typedef that can cause a gcc + warning. + Problem reported by Alexei. -2011-07-22 Dirk Müller + * src/cff/cffobjs.c (cff_driver_init): Use + `CFF_CONFIG_OPTION_DARKENING_PARAMETER_XXX' macros directly. + (SET_DARKENING_PARAMETERS): Removed. + Compile time tests are now ... - [psaux, type1] Fix null pointer dereferences. + * devel/ftoption.h, include/config/ftoption.h: ... here. - Found with font fuzzying. +2014-10-25 Alexei Podtelezhnikov - * src/psaux/t1decode.c (t1_decoder_parse_charstrings): Check - `decoder->buildchar'. + Improve flat corner definition. - * src/type1/t1load.c (t1_load_keyword): Check `blend->num_designs'. + * include/internal/ftcalc.h (FT_HYPOT): Macro to approximate Euclidean + distance with the alpha max plus beta min algorithm. + * src/base/ftcalc.c (ft_corner_is_flat): Use it instead of Taxicab + metric. -2011-07-20 Chris Morgan +2014-10-23 David Weiß - Add FT_CONFIG_OPTION_DISABLE_STREAM_SUPPORT. + [build] Improve property file for vc2010. - Useful for embedded systems which don't need file stream support. + User-defined properties should be empty by default to prevent linker + failures. - * src/base/ftsystem.c, src/base/ftobjs.c (FT_Stream_New): Implement - it. + * builds/windows/vc2010/freetype.user.props, + builds/windows/vc2010/freetype.vcxproj: + s/OptionsDirectory/UserOptionDirectory/. + Comment out all user options. -2011-07-20 Elton Chung +2014-10-23 Werner Lemberg - * src/base/ftpatent.c (FT_Face_SetUnpatentedHinting): Fix typo. + [cff] Work around bug in preprocessor of MSVC 2010. -2011-07-16 Steven Chu + We have been hit by - [truetype] Fix metrics on size request for scalable fonts. + https://connect.microsoft.com/VisualStudio/feedback/details/718976/msvc-pr - * src/truetype/ttdriver.c (tt_size_request): Fix copying metrics - from TT_Size to FT_Size if scalable font. + * devel/ftoption.h, include/config/ftoption.h: Replace + `CFF_CONFIG_OPTION_DARKENING_PARAMETERS' with eight macros + `CFF_CONFIG_OPTION_DARKENING_PARAMETER_{X,Y}{1,2,3,4}'. - See + * src/cff/cffobjs.c (SET_DARKENING_PARAMETERS): Removed. We no + longer need double expansion. + (SET_DARKENING_PARAMETERS_0): Renamed to ... + (SET_DARKENING_PARAMETERS): ... this. + Update call. - http://lists.gnu.org/archive/html/freetype-devel/2011-07/msg00049.html +2014-10-20 Werner Lemberg - for some comparison images. + [sbit] Minor fixes. -2011-07-14 Matthias Drochner . + * src/sfnt/ttsbit.c (tt_face_load_sbit) [TT_SBIT_TABLE_TYPE_SBIX]: + Accept overlay format also, but emit warning message in that case. + (tt_sbit_decoder_load_metrics): Add missing newline to error + message. + (tt_sbit_load_sbix_image): Add `rgbl' graphic type (as used on iOS + 7.1) to the list of unsupported formats. - [psaux] Fix potential sign extension problems. +2014-10-19 Alexei Podtelezhnikov - When shifting right a signed value, it is not defined by the - C standard whether one gets a sign extension or not. Use a macro to - do an explicit cast from a signed short (assuming that this is - 16bit) to an int. + [truetype] Clean up bytecode rounding. - * src/psaux/t1decode.c (Fix2Int): New macro. - Use it where appropriate. + Zero distance does not have to be treated specially if you follow + specifications and check the sign as the very last step of rounding. -2011-07-14 Werner Lemberg + * src/truetype/ttinterp.c (Round_None, Round_To_Grid, + Round_Down_To_Grid, Round_Up_To_Grid, Round_To_Double_Grid): Use + macros when available, do not check for non-zero distance. + (Round_To_Half_Grid, Round_Super, Round_Super_45): Ditto, return phase + if sign changed. - * src/psaux/t1decode.c (t1_decoder_parse_charstrings) - : Better handling of subroutine index 0. - From Matthias Drochner . +2014-10-18 Alexei Podtelezhnikov -2011-07-10 Алексей Подтележников + [truetype] Unwrap engine compensation settings. - [psaux] Optimize previous commit. + * src/truetype/ttobjs.c (tt_size_init_bytecode): Updated. - * src/psaux/t1decode.c (t1_decoder_parse_charstrings) - : Move error check down to avoid testing twice for - good cases. +2014-10-18 David Weiß -2011-07-08 Werner Lemberg + [build] Add property file to vc2010 project. - [psaux] Add better argument check for `callothersubr'. + This simplifies custom build configurations, especially for + automated build environments. - * src/psaux/t1decode.c (t1_decoder_parse_charstrings) - : Reject negative arguments. + * builds/windows/vc2010/freetype.user.props: New configuration file. -2011-07-07 Werner Lemberg + * builds/windows/vc2010/freetype.vcxproj: Include + `freetype.user.props' and use its data fields. - [sfnt] Try harder to find non-zero values for ascender and descender. + * builds/windows/vc2010/index.html: Updated. - * src/sfnt/sfobjs.c (sfnt_load_face): Consult `OS/2' table in case - the `hhea' table's values are zero. +2014-10-18 Werner Lemberg -2011-07-03 Werner Lemberg + [autofit] Add blue-zone support for Telugu. - Fix previous commit. + This essentially moves the Telugu script from the `Indic' hinter to + the `Latin' hinter. - We want to unset FT_FACE_FLAG_SCALABLE only if there are bitmap - strikes in the font. + Note that this is a first shot and quite certainly needs + refinements. - * src/truetype/ttobjs.c (tt_face_init): Implement it. + * src/autofit/afblue.dat: Add blue zone data for Telugu. - * docs/CHANGES: Updated. + * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. -2011-07-02 Just Fill Bugs + * src/autofit/afscript.h: Add Telugu standard characters and move + data out of AF_CONFIG_OPTION_INDIC block. - Fix Savannah bug #33246. + * src/autofit/afranges.c: Move Telugu data out of + AF_CONFIG_OPTION_INDIC block. - * src/truetype/ttobjs.c (tt_check_single_notdef): New function. - (tt_face_init): Use it to test FT_FACE_FLAG_SCALABLE. + * src/autofit/afstyles.h: Update Telugu data; in particular, use + AF_WRITING_SYSTEM_LATIN. -2011-07-02 Werner Lemberg +2014-10-18 David Wimsey - * docs/CHANGES: Updated. + [cmake] Add iOS build support. + From Savannah patch #8497. -2011-07-02 David Bevan + * builds/cmake/iOS.cmake: New file. Universal binaries are built + with both 32 and 64 bit arm architectures. - [ftstroke] Major revision. + * CMakeLists.txt (IOS_PLATFORM): New variable for running the iOS + toolchain. Possible values are `OS' to build on iOS, or + `SIMULATOR' to build on APPLE. - The main problems - ----------------- +2014-10-16 Behdad Esfahbod + Werner Lemberg - o If FT_STROKER_LINEJOIN_BEVEL was specified, unlimited miter - joins (not bevel joins) were generated. Indeed, the meanings of - `miter' and `bevel' were incorrectly reversed (consistently) in - both the code and comments. + [cff] Add `CFF_CONFIG_OPTION_DARKENING_PARAMETERS' config macro. - o The way bevel joins were constructed (whether specified - explicitly, or created as a result of exceeding the miter limit) - did not match what is required for stroked text in PostScript or - PDF. + * devel/ftoption.h, include/config/ftoption.h + (CFF_CONFIG_OPTION_DARKENING_PARAMETERS): New macro. - The main fixes - -------------- + * src/cff/cffobjs.c (SET_DARKENING_PARAMETERS, + SET_DARKENING_PARAMETERS_0): New macros. + (cff_driver_init): Use new macros. - o The behaviour of FT_STROKER_LINEJOIN_BEVEL has been corrected. +2014-10-14 Alexei Podtelezhnikov - o A new line join style, FT_STROKER_LINEJOIN_MITER_FIXED, has been - introduced to support PostScript and PDF miter joins. + [truetype] Limit delta shift range. - o FT_STROKER_LINEJOIN_MITER_VARIABLE has been introduced as an - alias for FT_STROKER_LINEJOIN_MITER. + The valid range for delta shift is zero through six. Negative values + are invalid according to - Additionally, a variety of stroking errors have been fixed. These - would cause various artifacts (including points `at infinity'), - especially when stroking poor quality fonts. + https://developer.apple.com/fonts/TrueType-Reference-Manual/RM04/Chap4.html#delta%20shift - See + * src/truetype/ttobjs.h (delta_shift, delta_base): Make unsigned. + * src/truetype/ttinterp.h (DO_SDS): Throw an error if `delta_shift' + is out of range. + (Ins_DELTAP, Ins_DELTAC): Optimize for valid `delta_shift'. - http://lists.gnu.org/archive/html/freetype-devel/2011-07/msg00001.html +2014-10-16 Werner Lemberg - for example documents. The FreeType stroker now produces results - very similar to that produced by GhostScript and Distiller for these - fonts. + A better fix for Savannah bug #43392. + Suggested by Doug Felt . - Other problems - -------------- + * src/sfnt/ttsbit.c (tt_sbit_decoder_load_metrics): Set + `vertAdvance' to zero... - The following problems have been resolved: + * src/truetype/ttgload.c (TT_Load_Glyph): ... and set here a default + value for `vertAdvance' based on `linearVertAdvance' in case + `vertAdvance' is zero. Note that the previous computed ad-hoc value + for `linearVertAdvance' was apparently not tested in a real-life + situation. - o Inside corners could be generated incorrectly. Intersecting the - inside corner could cause a missing triangular area and other - effects. +2014-10-14 David Weiß - The intersection point can only be used if the join is between - two lines and both lines are long enough. The `optimization' - condition in `ft_stroker_inside' has been corrected; this - requires the line length to be passed into various functions and - stored in `FT_StrokerRec'. + [build] Better optimization settings for vc2010 solution file. - o Incorrect cubic curves could be generated. The angle - calculations in `FT_Stroker_CubicTo' have been corrected to - handle the case of the curve crossing the +/-PI direction. + * builds/windows/vc2010/freetype.sln, + builds/windows/vc2010/freetype.vcxproj: Updated. - o If the border radius was greater than the radius of curvature of - a curve, then the negative sector would end up outside (not - inside) the border. This situation is now recognized and the - negative sector is circumnavigated in the opposite direction. - (If round line joins are being used, this code is disabled - because the line join will always cover the negative sector.) +2014-10-14 Werner Lemberg - o When a curve is split, the arcs may not join smoothly (especially - if the curve turns sharply back on itself). Changes in - direction between adjacent arcs were not handled. A round - corner is now added if the deviation from one arc to the next is - greater than a suitable threshold. + [autofit] Adjust Devenagari character range. - o The current direction wasn't retained if a the outline contained - a zero length lineto or a curve that was determined to be - `basically a point'. This could cause a spurious join to be - added. + * src/autofit/afranges.c (af_deva_uniranges): Omit characters that + are common to all other Indic scripts. - o Cubics with close control points could be mishandled. All eight - cases are now distinguished correctly. +2014-10-12 Werner Lemberg - Other improvements - ------------------ + [sfnt] Fix Savannah bug #43392. - o Borders for cubic curves could be too `flat'. - FT_SMALL_CUBIC_THRESHOLD has been reduced a little to prevent - this. + * src/sfnt/ttsbit.c (tt_sbit_decoder_load_metrics): Don't let + vertical metrics uninitialized. - o The handling and use of movable points has been simplified a - little. +2014-10-11 Alexei Podtelezhnikov - o Various values are now computed only if the results are actually - needed. + [base] Small bbox correction. - o The directions of the outer and inner borders have been swapped, - as recommended by Graham Asher. + * src/base/ftbbox.c (FT_Outline_Get_BBox): Start from nonsense bbox + instead of initial point that could be `off' in conic outlines. - * src/base/ftstroke.c: Revised. - * include/freetype/ftstroke.h: Updated. +2014-10-08 Alexei Podtelezhnikov -2011-06-30 Ä°smail Dönmez + [base] Fix Savannah bug #43356. - * builds/toplevel.mk: We use git, not CVS, thus skip `.gitignore'. + * src/base/ftbbox.c (BBox_Move_To, BBox_Conic_To): Update bbox in case + of implicit `to'. + (BBox_Line_To): New emitter that does not update bbox. -2011-06-29 Werner Lemberg +2014-10-08 Alexei Podtelezhnikov - Fix Savannah bug #33663. + [base] Introduce and use new macro `FT_UPDATE_BBOX' - * src/bdf/bdflib.c (_bdf_parse_glyphs): Handle negative values for - ENCODING correctly. + * src/base/ftbbox.c (FT_UPDATE_BBOX): New macro. + (FT_Outline_Get_BBox): Use it here. - * docs/CHANGES: Document it. +2014-10-02 Alexei Podtelezhnikov -2011-06-24 Werner Lemberg + [base] Significant optimization of `ft_div64by32' - * Version 2.4.5 released. - ========================= + We shift as many bits as we can into the high register, perform + 32-bit division with modulo there, then work through the remaining + bits with long division. This optimization is especially noticeable + for smaller dividends that barely use the high register. + * src/base/ftcalc.c (ft_div64by32): Updated. - Tag sources with `VER-2-4-5'. +2014-10-02 Dave Arnold - * docs/CHANGES: Updated. + [cff] Fix Savannah bug #43271. - * docs/VERSION.DLL: Update documentation and bump version number to - 2.4.5 + * src/cff/cf2font.c (cf2_computeDarkening): Change overflow + detection to use logarithms and clamp `scaledStem'. - * README, Jamfile (RefDoc), - builds/win32/vc2005/freetype.vcproj, builds/win32/vc2005/index.html, - builds/win32/vc2008/freetype.vcproj, builds/win32/vc2008/index.html, - builds/win32/vc2010/freetype.vcxproj, builds/win32/vc2010/index.html, - builds/win32/visualc/freetype.dsp, - builds/win32/visualc/freetype.vcproj, - builds/win32/visualc/index.html, builds/win32/visualce/freetype.dsp, - builds/win32/visualce/freetype.vcproj, - builds/win32/visualce/index.html, - builds/wince/vc2005-ce/freetype.vcproj, - builds/wince/vc2005-ce/index.html, - builds/wince/vc2008-ce/freetype.vcproj, - builds/wince/vc2008-ce/index.html: s/2.4.4/2.4.5/, s/244/245/. +2014-10-01 Alexei Podtelezhnikov - * include/freetype/freetype.h (FREETYPE_PATCH): Set to 5. + * src/base/ftcalc.c: Remove miscellaneous type casts. - * builds/unix/configure.raw (version_info): Set to 13:0:7. +2014-10-01 Alexei Podtelezhnikov -2011-06-20 Werner Lemberg + [base] Use more common `FT_MSB' implementation with masks. - * src/autofit/aflatin.c (af_latin_metrics_scale_dim): Fix change - from 2011-05-04. + * src/base/ftcalc.c (FT_MSB): Updated. -2011-06-19 suzuki toshiya +2014-09-30 Alexei Podtelezhnikov - [gxvalid] make the `prop' validation tracing verbose. + [base] Clean up. - * src/gxvalid/gxvprop.c: Add tracing messages for errors. + * src/base/ftcalc.c (FT_MOVE_SIGN): New macro for frequently used + code. -2011-06-19 suzuki toshiya +2014-09-25 Alexei Podtelezhnikov - [autogen.sh] Reflect environment variable LIBTOOLIZE. + [base] Avoid unnecessary long division. -2011-06-18 Werner Lemberg + This applies to `FT_MulDiv' but not to `FT_DivFix', where overflows or + lack thereof are predicted accurately. - Update license documentation. + * src/base/ftcalc.c (ft_div64by32): Improve readability. + (FT_MulDiv, FT_MulDiv_No_Round) [!FT_LONG64]: Use straight division + when multiplication stayed within 32 bits. - * docs/GPL.TXT: Renamed to... - * docs/GPLv2.TXT: This. +2014-09-24 Werner Lemberg - * docs/LICENSE.TXT: Updated. + [autofit] Minor clean-ups. -2011-06-14 suzuki toshiya + * src/autofit/afhints.c (AF_FLAGS): Remove obsolete values. - Fix g++4.6 compiler warnings in module drivers. + * src/autofit/afhints.c (af_glyph_hints_dump_points, + af_glyph_hints_align_strong_points): Updated. - The background is same with previous commit. + * src/autofit/aflatin.c (af_latin_hints_link_segments, + af_latin_hints_compute_segments), src/autofit/afcjk.c + (af_cjk_hints_link_segments), src/autofit/aflatin2.c + (af_latin2_hints_link_segments, af_latin2_hints_compute_segments): + There are no longer fake segments since more than 10 years... - * src/truetype/ttgxvar.c (ft_var_readpackedpoints): - Init `points'. (TT_Vary_Get_Glyph_Deltas): Init - `delta_xy'. (TT_Get_MM_Var): Init `mmvar'. - * src/type1/t1load.c (T1_Get_MM_Var): Ditto. - * src/cff/cffdrivr.c (cff_ps_get_font_info): Init - `font_info'. - * src/cff/cffload.c (cff_index_get_pointers): Init `t'. - (cff_font_load): Init `sub'. - * src/cff/cffobjs.c (cff_size_init): Init `internal'. - (cff_face_init): Init `cff'. - * src/pfr/pfrload.c (pfr_extra_item_load_stem_snaps): - Init `snaps'. - * src/pcf/pcfread.c (pcf_get_properties): Init `properties'. - (pcf_get_bitmaps): Init `offsets'. (pcf_get_encodings): - Init `tmpEncoding'. - * src/sfnt/ttload.c (tt_face_load_gasp): Init `gaspranges'. - * src/sfnt/ttsbit.c (Load_SBit_Image): Init `components'. - * src/cache/ftcmru.c (FTC_MruList_New): Init `node'. - * src/gzip/ftgzip.c (FT_Stream_OpenGzip): Init `zip' and - `zip_buff'. - * src/lzw/ftlzw.c (FT_Stream_OpenLZW): Init `zip'. - * src/bzip2/ftbzip2.c (FT_Stream_OpenBzip2): Init `zip'. - -2011-06-14 suzuki toshiya - - [base] Fix g++4.6 compiler warnings in src/base/*.c. - - Passing uninitialized pointer to FT_NEW() families is - not problematic theoretically (as far as the returned - pointer is checked before writing), but g++4.6 dislikes - it and warns by -Wuninitialized. Initialize them by NULL. - - * src/base/ftobjs.c (FT_Stream_New): Init `stream'. - (new_memory_stream): Ditto. - (FT_New_GlyphSlot): Init `slot'. - (FT_CMap_New): Init `cmap'. - (open_face_PS_from_sfnt_stream): Init `sfnt_ps'. - (Mac_Read_POST_Resource): Init `pfb_data'. - (Mac_Read_sfnt_Resource): Init `sfnt_data'. - * src/base/ftrfork.c (FT_Raccess_Get_DataOffsets): - Init `offsets_internal' and `ref'. - (raccess_guess_darwin_hfsplus): Init `newpath'. - (raccess_guess_darwin_newvfs): Ditto. - * src/base/ftbitmap.c (ft_bitmap_assure_buffer): - Init `buffer'. - * src/base/ftstroke.c (FT_Stroker_New): Init `stroker'. - -2011-06-14 suzuki toshiya - - [gxvalid] Cleanup. - - Some invalid, overrunning, unrecommended non-zero values - are cared in paranoid validation mode only. There are - many lines looking like: - - if ( valid->root->level >= FT_VALIDATE_PARANOID ) - FT_INVALID_xxx; - - To simplify them, GXV_SET_ERR_IF_PARANOID( err ) is - introduced for more paranoid validation in future. - - * src/gxvalid/gxvcommn.h (IS_PARANOID_VALIDATION): - New macro to assure valid->root->level is more or - equal to FT_VALIDATE_PARANOID. (GXV_SET_ERR_IF_PARANOID): - New macro to raise an error if in paranoid validation. - * src/gxvalid/gxvcommn.c: Use GXV_SET_ERR_IF_PARANOID(). - * src/gxvalid/gxvfeat.c: Ditto. - * src/gxvalid/gxvjust.c: Ditto. - * src/gxvalid/gxvkern.c: Ditto. - * src/gxvalid/gxvmort.c: Ditto. - * src/gxvalid/gxvmort0.c: Ditto. - * src/gxvalid/gxvmort1.c: Ditto. - * src/gxvalid/gxvmort2.c: Ditto. - * src/gxvalid/gxvmorx1.c: Ditto. - * src/gxvalid/gxvmorx2.c: Ditto. - -2011-06-14 suzuki toshiya - - [gxvalid] Fix gcc4.6 compiler warnings in gxvtrak.c. - - * src/gxvalid/gxvtrak.c (gxv_trak_trackTable_validate): - Check different entries pointing same traking value. - (gxv_trak_validate): Remove unused variable `table_size'. - -2011-06-14 suzuki toshiya - - [gxvalid] Fix gcc4.6 compiler warnings in gxvmorx*.c. - - * src/gxvalid/gxvmorx.c (gxv_morx_subtables_validate): - Conditionalize unvalidated variable `subFeatureFlags'. - (gxv_morx_chain_validate): Conditionalize unvalidated - variable `defaultFlags'. - - * src/gxvalid/gxmorx0.c - (gxv_morx_subtable_type0_entry_validate): - Conditionalize unvalidated variables; `markFirst', - `dontAdvance', `markLast', `verb'. - - * src/gxvalid/gxmorx1.c - (gxv_morx_subtable_type1_entry_validate): Conditionalize - unvalidated variables; `setMark', `dontAdvance'. - - * src/gxvalid/gxvmorx2.c - (gxv_morx_subtable_type2_ligActionOffset_validate): - Conditionalize unvalidated variables; `last', `store'. - Checking for overrunning offset is added. - (gxv_morx_subtable_type2_entry_validate): - Conditionalize unvalidated variables; `setComponent', - `dontAdvance', `performAction'. - (gxv_morx_subtable_type2_ligatureTable_validate): - Check if the GID for ligature does not exceed the - max GID in `maxp' table. - - * src/gxvalid/gxvmort5.c - (gxv_morx_subtable_type5_InsertList_validate): - Conditionalize unvalidated loading of `insert_glyphID' - array. (gxv_morx_subtable_type5_entry_validate): - Conditionalize unvalidated variables; `setMark', - `dontAdvance', `currentIsKashidaLike', - `markedIsKashidaLike', `currentInsertBefore', - `markedInsertBefore'. - -2011-06-14 suzuki toshiya - - [gxvalid] Fix gcc4.6 compiler warnings in gxvmort*.c. - - * src/gxvalid/gxvmort.c (gxv_mort_subtables_validate): - Conditionalize unvalidated variable `subFeatureFlags'. - (gxv_mort_chain_validate): Conditionalize unvalidated - variable `defaultFlags'. - - * src/gxvalid/gxmort0.c - (gxv_mort_subtable_type0_entry_validate): Check the - conflict of the marks for the glyphs. - - * src/gxvalid/gxmort1.c - (gxv_mort_subtable_type1_offset_to_subst_validate): - Local variables `min_gid', `max_gid' are replaced by - variables in the validator. - (gxv_mort_subtable_type1_entry_validate): Conditionalize - unvalidated variables; `setMark', `dontAdvance'. - (gxv_mort_subtable_type1_substTable_validate): - Validate the GID by the min/max GIDs in the validator. - - * src/gxvalid/gxvmort2.c - (gxv_mort_subtable_type2_ligActionOffset_validate): - Conditionalize unvalidated variables; `last', `store'. - Checking for overrunning offset is added. - (gxv_mort_subtable_type2_entry_validate): - Conditionalize unvalidated variables; `setComponent', - `dontAdvance'. - (gxv_mort_subtable_type2_ligatureTable_validate): - Check if the GID for ligature does not exceed the - max GID in `maxp' table. - - * src/gxvalid/gxvmort5.c - (gxv_mort_subtable_type5_InsertList_validate): - Conditionalize unvalidated loading of `insert_glyphID' - array. (gxv_mort_subtable_type5_entry_validate): - Conditionalize unvalidated variables; `setMark', - `dontAdvance', `currentIsKashidaLike', - `markedIsKashidaLike', `currentInsertBefore', - `markedInsertBefore'. - -2011-06-14 suzuki toshiya - - [gxvalid] Fix gcc4.6 compiler warnings in gxvkern.c. - - * src/gxvalid/gxvkern.c - (gxv_kern_subtable_fmt0_pairs_validate): Conditionalize - unvalidated variable `kernValue'. - (gxv_kern_subtable_fmt1_entry_validate): Conditionalize - unvalidated variables; `push', `dontAdvance', `kernAction', - `kernValue'. - (gxv_kern_coverage_new_apple_validate): Conditionalize - trace-only variables; `kernVertical', `kernCrossStream', - `kernVariation'. - (gxv_kern_coverage_classic_apple_validate): Conditionalize - trace-only variables; `horizontal', `cross_stream'. - (gxv_kern_coverage_classic_microsoft_validate): - Conditionalize trace-only variables; `horizontal', - `minimum', `cross_stream', `override'. - (gxv_kern_subtable_validate): Conditionalize trace-only - variables; `version', `tupleIndex'. - -2011-06-14 suzuki toshiya - - [gxvalid] Fix gcc4.6 compiler warnings in gxvjust.c. - - * src/gxvalid/gxvjust.c (gxv_just_check_max_gid): - New function to unify the checks of too large GID. - (gxv_just_wdp_entry_validate): Conditionalize unvalidated - variables; `beforeGrowLimit', `beforeShrinkGrowLimit', - `afterGrowLimit', `afterShrinkGrowLimit', `growFlags', - `shrinkFlags'. Additional check for non-zero values in - unused storage `justClass' is added. - (gxv_just_actSubrecord_type0_validate): Conditionalize - unvalidated variable `order'. GID is checked by - gxv_just_check_max_gid(). Additional check for upside-down - relationship between `lowerLimit' and `upperLimit' is added. - (gxv_just_actSubrecord_type1_validate): GID is checked by - gxv_just_check_max_gid(). - (gxv_just_actSubrecord_type2_validate): Conditionalize - unvalidated variable `substThreshhold'. GID is checked by - gxv_just_check_max_gid(). - (gxv_just_actSubrecord_type5_validate): GID is checked by - gxv_just_check_max_gid(). - (gxv_just_classTable_entry_validate): Conditionalize - unvalidated variables; `setMark', `dontAdvance', - `markClass', `currentClass'. - -2011-06-14 suzuki toshiya - - [gxvalid] Preparation to fix gcc4.6 compiler warnings. - - * src/gxvalid/gxvcommn.h (GXV_LOAD_TRACE_VARS): New macro to - conditionalize the variable which is only used for trace messages. - Automatically set by FT_DEBUG_LEVEL_TRACE. - (GXV_LOAD_UNUSED_VARS): New macro to conditionalize the loading of - unvalidated variables. Undefined by default to calm gcc4.6 warning. - (GXV_ValidatorRec.{min_gid,max_gid}): New variables to hold defined - GID ranges, for the comparison of GID ranges in different subtables. - -2011-06-08 Werner Lemberg - - [autofit] Remove unused structure member. - - * src/autofit/afhints.h (AF_SegmentRec): Remove `contour'. - * src/autofit/aflatin.c (af_latin_hints_compute_segments), - src/autofit/aflatin2.c (af_latin2_hints_compute_segments): Updated. - -2011-05-30 Werner Lemberg - - Fix g++ 4.6 compilation. - - * src/autofit/afhints.c (af_glyph_hints_dump_segments, - af_glyph_hints_dump_edges): Use cast. - -2011-05-30 Werner Lemberg - - Fix gcc 4.6 compiler warnings. - - * src/autofit/afcjk.c (af_cjk_metrics_init_blues): Use casts and - remove unused variables. - * src/autofit/aflatin.c (af_latin_hints_compute_edges): Comment out - `up_dir'. - * src/smooth/ftsmooth.c (ft_smooth_render_generic): Use `height_org' - and `width_org' conditionalized. - -2011-05-28 suzuki toshiya - - [mac] Conditionalize the inclusion of `AvailabilityMacros.h'. - - The native SDK on earliest Mac OS X (10.0-10.1) did not have - `AvailabilityMacros.h'. To prevent the inclusion of missing - header file, ECANCELED (introduced in 10.2) in POSIX header - file is checked to detect the system version. - - * include/freetype/config/ftconfig.h: Conditionalize the - inclusion of `AvailabilityMacros.h'. - * builds/unix/ftconfig.in: Ditto. - * builds/vms/ftconfig.h: Ditto. +2014-09-22 Werner Lemberg -2011-05-27 Werner Lemberg + [autofit] Minor code streamlining. - [autofit] Improve tracing of hinting process. + * src/autofit/afhints.c (af_axis_hints_new_edge): Remove redundant + initialization. - * src/autofit/aflatin.c (af_latin_hint_edges): Add tracing message - `ADJUST'. +2014-09-19 Alexei Podtelezhnikov -2011-05-26 Werner Lemberg + * src/base/ftcalc.c: Harmonize code. - [autofit] Fix trace message. +2014-09-15 Alexei Podtelezhnikov - * src/autofit/aflatin.c (af_latin_hint_edges): Show correct value in - tracing message. + [base] Tighten the overflow check in `FT_MulDiv'. -2011-05-24 Daniel Zimmermann + * src/base/ftcalc.c (FT_MulDiv) [!FT_LONG64]: Updated. - Reduce warnings for MS Visual Studio 2010. +2014-09-08 Alexei Podtelezhnikov - * src/autofit/afhints.c (af_glyph_hints_get_num_segments, - af_glyph_hints_get_segment_offset) [!FT_DEBUG_AUTOFIT]: Provide - return value. - * src/cff/cffgload.c (cff_slot_load): Add cast. - * src/truetype/ttobjs.c (tt_check_trickyness_sfnt_ids): Use proper - loop variable type. + Fix Savannah bug #43153. -2011-05-16 suzuki toshiya + * src/psaux/psconv.c (PS_Conv_ToFixed): Add protection against + overflow in `divider'. - Automake component `builds/unix/install-sh' is removed. +2014-09-03 Alexei Podtelezhnikov - * builds/unix/install-sh: Removed. It is not needed to - include repository, because autogen.sh installs it. - * builds/unix/.gitignore: Register install-sh. + [base] Tighten the overflow check in `FT_DivFix'. -2011-05-12 suzuki toshiya + This fixes a 13-year old bug. The original overflow check should have + been updated when rounding was introduced into this function + (c2cd00443b). - [autofit] Make trace message for CJK bluezone more verbose. + * src/base/ftcalc.c (FT_DivFix) [!FT_LONG64]: Updated. + * include/freetype.h (FT_DivFix): Updated documentation. -2011-05-08 Just Fill Bugs - suzuki toshiya +2014-09-03 Alexei Podtelezhnikov - [autofit] Add bluezones for CJK Ideographs. + [base] Tighten the overflow check in `FT_MulFix'. - To remove extremas of vertical strokes of CJK Ideographs at - low resolution and make the top and bottom horizontal stems - aligned, bluezones for CJK Ideographs are calculated from - sample glyphs. At present, vertical bluezones (bluezones - to align vertical stems) are disabled by default. For detail, see - http://lists.gnu.org/archive/html/freetype-devel/2011-04/msg00070.html - http://lists.gnu.org/archive/html/freetype-devel/2011-04/msg00092.html - http://lists.gnu.org/archive/html/freetype-devel/2011-05/msg00001.html + * src/base/ftcalc.c (FT_MulFix) [!FT_LONG64]: Updated. - * include/freetype/internal/fttrace.h: New trace component `afcjk'. - * src/autofit/afcjk.h (AF_CJK{Blue,Axis,Metric}Rec): Add CJK version - for AF_Latin{Blue,Axis,Metric}Rec. - (af_cjk_metrics_check_digits): Ditto, shared with Indic module. - (af_cjk_metrics_init_widths): Ditto. - (af_cjk_metrics_init): Take AF_CJKMetric instead of AF_LatinMetric. - (af_cjk_metrics_scale): Ditto (declaration). - (af_cjk_hints_init): Ditto (declaration). - (af_cjk_hints_apply): Ditto (declaration). - * src/autofit/afcjk.c (af_cjk_metrics_scale): Ditto (body). - (af_cjk_hints_init): Ditto (body). - (af_cjk_hints_apply): Ditto (body). - (af_cjk_metrics_init_widths): Duplicate af_latin_metrics_init_widths. - (af_cjk_metrics_check_digits): Duplicate af_latin_metrics_check_digits. - (af_cjk_metrics_init): Call CJK bluezone initializer. - (af_cjk_metrics_scale_dim): Add code to scale bluezones. - (af_cjk_hints_compute_blue_edges): New function, CJK version of - af_latin_hints_compute_blue_edges. - (af_cjk_metrics_init_blues): New function, CJK version of - af_latin_metrics_init_blues. - (af_cjk_hints_edges): Add code to align the edge stems to blue zones. +2014-09-02 Alexei Podtelezhnikov - * src/autofit/afindic.c (af_indic_metrics_init): Take AF_CJKMetric - instead of AF_LatinMetric, and initialize as af_cjk_metrics_init. - However bluezones are not initialized. - (af_indic_metrics_scale): Take AF_CJKMetric instead of AF_LatinMetric. - (af_indic_hints_init): Ditto. - (af_indic_hints_apply): Ditto. + [truetype] Shortcut ppem calculations for square pixels. - * docs/CHANGES: Note about CJK bluezone support. + * src/truetype/ttinterp.h (TT_ExecContextRec): New field + `cur_ppem_func' with a function pointer. + * src/truetype/ttinterp.c (TT_RunIns): Initialize `cur_ppem_func' + depending on the pixel geometry to either... + (Current_Ppem_Stretched): ... this for stretched pixels. + (Current_Ppem): ... or this for square pixels. + (DO_MPPEM, DO_MPS, Ins_DELTAP, Ins_DELTAC): Use `cur_ppem_func'. -2011-05-06 Werner Lemberg +2014-08-31 Behdad Esfahbod - [autofit] Remove unused struct member. + Don't use `register' keyword. Fixes compiler warnings. - * src/autofit/aflatin.h (AF_LatinAxis): Remove `control_overshoot'. + * src/base/ftcalc.c (FT_Add64) [!FT_LONG64]: Do it. + * src/gzip/inftrees.c (huft_build): Ditto. + * src/truetype/ttinterp.c (TT_MulFix14_arm): Ditto. -2011-05-04 Werner Lemberg +2014-08-24 Alexei Podtelezhnikov - * src/autofit/aflatin.c (af_latin_metrics_scale_dim): Simplify. + [truetype] Optimize DELTAP and DELTAC. -2011-05-01 Just Fill Bugs - Werner Lemberg + * src/truetype/ttinterp.c (Ins_DELTAP, Ins_DELTAC): Move ppem + calculations outside of the loop. - [autofit] Add more debugging functions. +2014-08-21 Alexei Podtelezhnikov - * src/autofit/afhints.c (af_glyph_hints_get_num_segments, - af_glyph_hints_get_segment_offset): New functions. + Fix Savannah bug #43033. -2011-05-01 suzuki toshiya + * include/config/ftconfig.h, builds/unix/ftconfig.in, + builds/vms/ftconfig.h [FT_LONG64]: Do not disable the macro when + 64-bit type is `long'. - Add new option `--disable-mmap' to configure script. +2014-08-20 Alexei Podtelezhnikov - * builds/unix/configure.raw: New option `--disable-mmap' - is added. It is for the developers to simulate the systems - without mmap() (like 4.3BSD, minix etc) on POSIX systems. + [base] Small optimization of `FT_MulFix'. -2011-04-30 suzuki toshiya + * src/base/ftcalc.c (FT_MulFix): Loosen up the condition for direct + 32-bit calculations. - [truetype] Always recalculate the sfnt table checksum. +2014-08-19 Alexei Podtelezhnikov - * src/truetype/ttobjs.c (tt_get_sfnt_checksum): Recalculate - the sfnt table checksum even if non-zero value is written in - the TrueType font header. Some bad PDF generators write - wrong values. For details see examples and benchmark tests - of the latency by recalculation: - http://lists.gnu.org/archive/html/freetype-devel/2011-04/msg00091.html - http://lists.gnu.org/archive/html/freetype-devel/2011-04/msg00096.html + [base] Use unsigned calculation in `FT_MulDiv'. -2011-04-30 suzuki toshiya + * src/base/ftcalc.c (FT_MulDiv): Updated to expand 32-bit range. - [truetype] Register a set of tricky fonts, NEC FA family. +2014-08-18 Alexei Podtelezhnikov - * src/truetype/ttobjs.c (tt_check_trickyness_sfnt_ids): - Add 8 checksum sets for NEC FA family. For the tricky fonts - without some tables (e.g. NEC FA fonts lack cvt table), - extra check is added to assure that a zero-length table in the - registry is not included in the font. + [base] Remove truncation in `FT_DivFix'. -2011-04-29 suzuki toshiya + * src/base/ftcalc.c (FT_DivFix): Updated. - [truetype] Fix a bug in the sfnt table checksum getter. +2014-08-14 Alexei Podtelezhnikov - * src/truetype/ttobjs.c (tt_get_sfnt_checksum): Check the - return value of face->goto_table() correctly. + Minor refactoring. -2011-04-28 Werner Lemberg + * src/base/ftcalc.c (FT_MulDiv, FT_MulDiv_No_Round): Updated. - [autofit] Improve tracing messages. +2014-08-14 Alexei Podtelezhnikov - * src/autofit/aflatin.c (af_latin_metrics_init_blues, - af_latin_align_linked_edge, af_latin_hint_edges): Do it. + Turn FT_MSB into a macro when using gcc builtins. -2011-04-25 Kan-Ru Chen + * src/base/ftcalc.c, include/internal/ftcalc.h: Updated. - [truetype] Always check the checksum to identify tricky fonts. +2014-08-12 Alexei Podtelezhnikov - Because some PDF generators mangle the family name badly, - the trickyness check by the checksum should be invoked always. - For sample PDF, see - http://lists.gnu.org/archive/html/freetype-devel/2011-04/msg00073.html + [base] Avoid undefined FT_MSB in `BBox_Cubic_Check'. - * src/truetype/ttobjs.c (tt_check_trickyness): Even when - tt_check_trickyness_family() finds no trickyness, - tt_check_trickyness_sfnt_ids() is invoked. + * src/base/ftbbox.c (BBox_Cubic_Check): Update. + (update_cubic_max): Repalce with... + (cubic_peak): ... this, which now handles upscaling. -2011-04-22 suzuki toshiya +2014-08-11 Alexei Podtelezhnikov - [autofit] Add more Indic scripts with hanging baseline. + [base] Handle collapsed outlines to avoid undefined FT_MSB. - * src/autofit/afindic.c (af_indic_uniranges): Tibetan, Limbu, - Sundanese, Meetei Mayak, Syloti Nagri and Sharada scripts are - added. + * src/base/ftoutln.c (FT_Outline_Get_Orientation): Update. -2011-04-21 Behdad Esfahbod +2014-08-11 Alexei Podtelezhnikov - Always ignore global advance. + [base] Restore FT_MulFix inlining. - This makes FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH redundant, - deprecated, and ignored. The new behavior is what every major user - of FreeType has been requesting. Global advance is broken in many - CJK fonts. Just ignoring it by default makes most sense. + * include/freetype.h (FT_MulFix): Unconditionally defined. - * src/truetype/ttdriver.c (tt_get_advances), - src/truetype/ttgload.c (TT_Get_HMetrics, TT_Get_VMetrics, - tt_get_metrics, compute_glyph_metrics, TT_Load_Glyph), - src/truetype/ttgload.h: Implement it. + * src/base/ftcalc.c [FT_MULFIX_ASSEMBLER]: Move code from here... - * docs/CHANGES: Updated. + * include/internal/ftcalc.h [FT_MULFIX_ASSEMBLER]: ... to here, + which conditionally replaces the function with an inline version + through the macro. -2011-04-21 rainy6144 +2014-08-08 Alexei Podtelezhnikov - [autofit] Blur CJK stems if too many to preserve their gaps. + * src/base/ftbitmap.c (ft_gray_for_premultiplied_srgb_bgra): Refactor. - When there are too many stems to preserve their gaps in the - rasterization of CJK Ideographs at a low resolution, blur the - stems instead of showing clumped stems. See - http://lists.gnu.org/archive/html/freetype-devel/2011-02/msg00011.html - http://lists.gnu.org/archive/html/freetype-devel/2011-04/msg00046.html - for details. +2014-07-26 Werner Lemberg - * src/autofit/afcjk.c (af_cjk_hint_edges): Store the position of - the previous stem by `has_last_stem' and `last_stem_pos', and skip - a stem if the current and previous stem are too near to preserve - the gap. + [cff] Fix typo. -2011-04-18 Werner Lemberg + * src/cff/cf2hints.c (cf2_glyphpath_computeOffset): Use correct + offsets in third quadrant. - Integrate autofitter debugging stuff. + Reported by maks . - * devel/ftoption.h, include/freetype/config/ftoption.h - (FT_DEBUG_AUTOFIT): New macro. +2014-07-17 Werner Lemberg - * include/freetype/internal/fttrace.h: Add trace components for - autofitter. + Fix Savannah bug #42788. - * src/autofit/aftypes.h (AF_LOG): Removed. - (_af_debug): Removed. + * src/pfr/pfrobjs.c: Include `ftcalc.h'. - * src/autofit/*: s/AF_DEBUG/FT_DEBUG_AUTOFIT/. - s/AF_LOG/FT_TRACE5/. - Define FT_COMPONENT where necessary. +2014-07-16 Alexei Podtelezhnikov -2011-04-18 Werner Lemberg + Replace `ft_highpow2' function. - Synchronize config files. + * src/pfr/pfrobjs.c (pfr_face_get_kerning): Use `FT_MSB' instead of + `ft_highpow2'. - * builds/unix/ftconfig.in: Copy missing assembler routines from - include/freetype/config/ftconfig.h. + * src/base/ftutil.c, include/internal/ftobjs.h (ft_highpow2): Remove + it. -2011-04-13 Werner Lemberg +2014-07-15 Alexei Podtelezhnikov - Fix Savannah bug #33047. + * src/base/ftcalc.c (FT_MSB): Utilize gcc builtins. - Patch submitted by anonymous reporter. +2014-07-15 Alexei Podtelezhnikov - * src/psaux/psobjs.c (ps_table_add): Use FT_PtrDist for pointer - difference. + [base] Move assembler code back in the source file. -2011-04-11 Kan-Ru Chen + FT_MulFix assembler used to reside in ftcalc.c before f47d263f1b. - Fix reading of signed integers from files on 64bit platforms. + * include/config/ftconfig.h, builds/unix/ftconfig.in, + builds/vms/ftconfig.h [FT_MULFIX_ASSEMBLER]: Move code from here... - Previously, signed integers were converted to unsigned integers, but - this can fail because of sign extension. For example, 0xa344a1eb - becomes 0xffffffffa344a1eb. + * src/base/ftcalc.c [FT_MULFIX_ASSEMBLER]: ... to here. - We now do the reverse which is always correct because the integer - size is the same during the cast from unsigned to signed. +2014-07-14 Alexei Podtelezhnikov - * include/freetype/internal/ftstream.h, src/base/ftstream.c - (FT_Stream_Get*): Replace with... - (FT_Stream_GetU*): Functions which read unsigned integers. - Update all macros accordingly. + [base] Further clean up color bitmap conversion. - * src/gzip/ftgzip.c (ft_gzip_get_uncompressed_size): Updated. + * src/base/ftbitmap.c (ft_gray_for_premultiplied_srgb_bgra): Stop + using FT_MulFix and FT_DivFix since all calculations fit into 32 bits. -2011-04-07 Werner Lemberg +2014-07-13 Werner Lemberg - Update Unicode ranges for CJK autofitter; in particular, add Hangul. + [truetype] Improve handling of buggy `prep' tables. - * src/autofit/afcjk.c (af_cjk_uniranges): Update to Unicode 6.0. + In case of an error in the `prep' table, no longer try to execute it + again and again. This makes FreeType handle endless loops in buggy + fonts much faster. -2011-04-04 Werner Lemberg + * src/truetype/ttobjs.h (TT_SizeRec): The fields `bytecode_ready' + and `cvt_ready' are now negative if not initialized yet, otherwise + they indicate the error code of the last run. - Fix formatting of autofit debug dumps. + * src/truetype/ttobjs.c (tt_size_run_fpgm, tt_size_run_prep, + tt_size_done_bytecode, tt_size_init_bytecode, + tt_size_ready_bytecode, tt_size_init, tt_size_done, tt_size_reset): + Updated. - * src/autofit/afhints.c (af_glyph_hints_dump_points, - af_glyph_hints_dump_segments, af_glyph_hints_dump_edges): Adjust - column widths. + * src/truetype/ttgload.c (tt_loader_init): Updated. + * src/truetype/ttinterp.c (TT_RunIns): Force reexecution of `fpgm' + and `prep' only if we are in the `glyf' table. -2011-03-30 Werner Lemberg +2014-07-12 Werner Lemberg - * src/autofit/aftypes.h (AF_OutlineRec): Removed, unused. + * builds/vms/ftconfig.h: Synchronize. + Problem reported by Alexei. -2011-03-24 Werner Lemberg +2014-07-11 Alexei Podtelezhnikov - * src/cff/cfftypes.h (CFF_MAX_CID_FONTS): Increase to 256. - This limit is given on p. 37 of Adobe Technical Note #5014. + [base] Clean up bitmap conversion. -2011-03-23 Werner Lemberg + * src/base/ftbitmap.c (ft_gray_for_premultiplied_srgb_bgra): Use + appropriate FT_DivFix and remove superfluous upscaling. - * src/truetype/ttpload.c (tt_face_load_loca): Fix mismatch warning. +2014-07-04 Alexei Podtelezhnikov -2011-03-20 Werner Lemberg + [base] Small optimization of the ancient code. - * src/sfnt/sfobjs.c (sfnt_open_font): Check number of TTC subfonts. + * src/base/ftcalc.c (FT_MulDiv, FT_MulDiv_No_Round): Loosen up the + condition for direct 32-bit calculations. -2011-03-19 Werner Lemberg +2014-06-27 Werner Lemberg - More C++ compilation fixes. + Fix Apple standard glyph names. - * src/autofit/afhints.c (af_glyph_hints_dump_points, - af_glyph_hints_dump_segments, af_glyph_hints_dump_edges) - [__cplusplus]: Protect with `extern "C"'. + * src/sfnt/ttpost.c (tt_post_default_names): Synchronize with + `tools/glnames.py' -2011-03-18 Werner Lemberg + Problem reported by Adam Twardoch . - C++ compilation fixes. +2014-06-17 Werner Lemberg - * src/autofit/aflatin.c (af_latin_hints_apply), src/autofit/afcjk.c - (af_cjk_hints_apply): Use cast for `dim'. + Partially revert commit from 2014-06-13. -2011-03-17 Alexei Podtelezhnikov + * src/autofit/aflatin.c (af_latin_metrics_init_blues): Move + declaration of `p_first' and `p_last' out of the loop. - A better fix for Savannah bug #32671. +2014-06-17 Werner Lemberg - * src/smooth/ftgrays.c (gray_render_conic): Clean up code and - replace WHILE loop with a more natural DO-WHILE construct. + * builds/unix/freetype2.m4: s/AC_PATH_PROG/AC_PATH_TOOL/. -2011-03-16 Werner Lemberg . + This simplifies cross-compiling. - * src/base/ftstroke.c (FT_StrokerRec): Remove unused `valid' field. - Suggested by Graham Asher. +2014-06-13 Werner Lemberg -2011-03-09 Werner Lemberg + Fix more compiler warnings. + Reported by Wojciech Mamrak . - Make FT_Sfnt_Table_Info return the number of SFNT tables. + * src/autofit/afglobal.c (af_face_globals_compute_style_coverage): + Make integer constant unsigned. - * src/sfnt/sfdriver.c (sfnt_table_info): Implement it. - * include/freetype/tttables.h: Update documentation. - * docs/CHANGES: Updated. + * src/sfnt/ttsbit.c (tt_face_load_strike_metrics) + : Fix types. + (tt_sbit_decoder_load_compound, tt_face_load_sbix_image): Add proper + casts. -2011-03-07 Bram Tassyns +2014-06-13 Werner Lemberg - Fix Savannah bug #27988. + Fix compiler warnings. + Reported by Wojciech Mamrak . - * src/cff/cffobjs.c (remove_style): New function. - (cff_face_init): Use it to strip off the style part of the family - name. + * src/autofit/afglobal.c (af_face_globals_compute_style_coverage), + src/autofit/afmodule.c (af_property_set): Fix `signed' vs. + `unsigned' issues. -2011-03-07 Werner Lemberg + * src/autofit/aflatin.c (af_latin_metrics_init_blues): Make compiler + happy. - * docs/CHANGES: Updated. + * src/base/ftlcdfil.c (_ft_lcd_filter_fir): Use only four elements + for `fir'. + Fix `signed' vs. `unsigned' issues. -2011-03-07 Alexei Podtelezhnikov + * src/sfnt/sfobjs.c (WRITE_BYTE): Removed, unused. + (WRITE_USHORT, WRITE_ULONG): Add proper casts. - Quick fix for Savannah bug #32671. + * src/truetype/ttgload.c (TT_Get_VMetrics): Add proper casts. - This isn't the optimal solution yet, but it restores the previous - rendering quality (more or less). + * src/truetype/ttinterp.c (Ins_DELTAP): Add proper casts for `B1' + and `B2'. - * src/smooth/ftgrays.c (gray_render_conic): Do more splitting. +2014-05-16 Alexey Petruchik -2011-03-06 Werner Lemberg + [cmake] Add option to build OS X framework. - Fix autohinting fallback. + * CMakeLists.txt: Update accordingly. - * src/base/ftobjs.c (FT_Load_Glyph): Assure that we only check TTFs, - ignoring CFF-based OTFs. + * builds/mac/freetype-Info.plist: New file. -2011-02-27 Werner Lemberg +2014-05-13 Pavel Koshevoy - Add AF_CONFIG_OPTION_USE_WARPER to control the autofit warper. + * CMakeLists.txt (BASE_SRCS): Add missing `ftbdf.c'. - * devel/ftoption.h, include/freetype/config/ftoption.h - (AF_CONFIG_OPTION_USE_WARPER): New macro. - * src/autofit/aftypes.h (AF_USE_WARPER): Remove. +2014-05-11 Werner Lemberg - * src/autofit/*: s/AF_USE_WARPER/AF_CONFIG_OPTION_USE_WARPER/. + [autofit] Fix variable initializations. - * src/autofit/afwarp.c [!AF_CONFIG_OPTION_USE_WARPER]: Replace dummy - variable assignment with a typedef. + * src/autofit/afhints.c (af_glyph_hints_reload): Assign default + values to `in_dir' and `out_dir' for all points. -2011-02-26 Werner Lemberg +2014-05-11 Werner Lemberg - [autofit] Slight simplifications. + [autofit] Fix crash with font `CabinSketch-Bold.ttf'. - * src/autofit/aflatin.c (af_latin_hints_link_segments): Remove - test which always returns false. - (af_latin_hints_compute_blue_edges): Remove redundant assignment. + Problem reported by Ralf S. Engelschall . -2011-02-24 Werner Lemberg + * src/autofit/afhints.c (af_glyph_hints_reload): Fix threshold for + finding first non-near point. + Properly initialize non-near point deltas. - * docs/PROBLEMS: Mention rendering differences on different - platforms. - Suggested and worded by Jason Owen . +2014-05-01 Werner Lemberg -2011-02-24 Werner Lemberg + [autofit] Add blue-zone support for Devanagari. - [autofit] Comment out unused code. + This essentially moves the Devanagari script from the `Indic' hinter + to the `Latin' hinter. Thanks to Girish Dalvi + for guidance with blue zone characters! - * src/autofit/aflatin.c, src/autofit/aflatin2.c - (af_latin_hints_compute_edges): Do it. + * src/autofit/afblue.dat: Add blue zone data for Devanagari. -2011-02-24 Werner Lemberg + * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. - * src/autofit/afhints.h (AF_GlyphHints): Remove unused field. + * src/autofit/afscript.h: Add Devanagari standard characters and + move data out of AF_CONFIG_OPTION_INDIC block. -2011-02-20 suzuki toshiya + * src/autofit/afranges.c: Move Devanagari data out of + AF_CONFIG_OPTION_INDIC block. + Move U+20B9, (new) Rupee sign, from Latin to Devanagari. - [cache] Fix an off-by-one bug in `FTC_Manager_RemoveFaceID'. - Found by , see detail in + * src/autofit/afstyles.h: Update Devanagari data; in particular, use + AF_WRITING_SYSTEM_LATIN. - http://lists.gnu.org/archive/html/freetype/2011-01/msg00023.html +2014-05-01 Werner Lemberg - * src/cache/ftccache.c (FTC_Cache_RemoveFaceID): Check the node - buckets[cache->p + cache->mask] too. + [autofit] Fix handling of neutral blue zones in stems. -2011-02-19 Kevin Kofler + * src/autofit/afhints.h (AF_Edge_Flags): New value + `AF_EDGE_NEUTRAL'. - Fall back to autohinting if a TTF/OTF doesn't contain any bytecode. - This is Savannah patch #7471. + * src/autofit/aflatin.c (af_latin_hints_compute_blue_edges): Trace + neutral blue zones with AF_EDGE_NEUTRAL. + (af_latin_hint_edges): Skip neutral blue zones if necessary. - * src/base/ftobjs.c (FT_Load_Glyph): Implement it. +2014-04-28 Werner Lemberg -2011-02-19 John Tytgat + [autofit] Introduce neutral blue zones to the latin module. - [cff] Fix subset prefix removal. - This is Savannah patch #7465. + Such blue zones match either the top or the bottom of a contour. We + need them for scripts where accent-like elements directly touch the + base character (for example, some vowel signs in Devanagari, cf. + U+0913 or U+0914). - * src/cff/cffobjs.c (remove_subset_prefix): Update length after - subset prefix removal. + * src/autofit/afblue.hin (AF_BLUE_PROPERTY_LATIN_NEUTRAL): New + property. -2011-02-13 Bradley Grainger + * src/autofit/afblue.h: Regenerated. - Add inline assembly version of FT_MulFix for MSVC. + * src/autofit/aflatin.h (AF_LATIN_IS_NEUTRAL_BLUE): New macro. + (AF_LATIN_BLUE_NEUTRAL): New enumeration value. - * include/freetype/config/ftconfig.h: Ported the FT_MulFix_i386 - function from GNU inline assembly syntax (see #ifdef __GNUC__ block - above) to MASM syntax for Microsoft Visual C++. + * src/autofit/aflatin.c (af_latin_metrics_init_blues, + af_latin_hints_compute_blue_edges): Handle neutral blue zones. -2011-02-13 Bradley Grainger +2014-04-25 Werner Lemberg - Add project and solution files in Visual Studio 2010 format. + * src/autofit/hbshim.c: Partially revert commit from 2014-04-17. - * builds/win32/.gitignore: Ignore user-specific cache files. - * builds/win32/vc2010/: Add VS2010 project & solution files, created - by upgrading builds/win32/vc2008/freetype.vcproj. - * objs/.gitignore: Ignore Visual Studio output files. + Using input glyph coverage data is simply wrong. -2011-02-01 Werner Lemberg + Problem reported by Nikolaus Waxweiler and + Mantas Mikulėnas . - * src/autofit/afdummy.c: Include `aferrors.h'. - Problem reported by Chris Liddell . +2014-04-23 Werner Lemberg -2011-02-01 Werner Lemberg + * src/raster/ftraster.c (Vertical_Sweep_Span): Use drop-out mode. - [cff] Ignore unknown operators in charstrings. - Patch suggested by Miles.Lau . + This spot has been missed while introducing support for various + drop-out modes years ago (including no drop-out mode, which this + commit fixes). - * src/cff/cffgload.c (cff_decoder_parse_charstrings): Emit tracing - message for unknown operators and continue instead of exiting with a - syntax error. + Problem reported by Patrick Thomas . -2011-02-01 Werner Lemberg +2014-04-22 Werner Lemberg - [truetype] FT_LOAD_PEDANTIC now affects `prep' and `fpgm' also. + * src/sfnt/pngshim.c (error_callback): s/longjmp/ft_longjmp/. - * src/truetype/ttgload.c (tt_loader_init): Handle - `FT_LOAD_PEDANTIC'. - * src/truetype/ttobjs.c (tt_size_run_fpgm, tt_size_run_prep, - tt_size_init_bytecode, tt_size_ready_bytecode): New argument to - handle pedantic mode. - * src/truetype/ttobjs.h: Updated. +2014-04-20 Werner Lemberg -2011-01-31 Werner Lemberg + [autofit] Fix Savannah bug #42148. - [truetype] Protect jump instructions against endless loops. + The adaptation of the cjk auto-hinter module to blue stringsets in + 2013-08-25 had three severe bugs. Mea culpa. - * src/truetype/interp.c (DO_JROT, DO_JMPR, DO_JROF): Exit with error - if offset is zero. + 1. Contrary to the latin auto-hinter, characters for reference and + overshoot values of a blue zone are specified separately. Due to + the screwed-up change it didn't work at all. -2011-01-31 Werner Lemberg + 2. A boolean comparison was erroneously replaced with a cast, + causing invalid results with the `^' operator later on. The + visual artifact caused by this problem is the topic of the bug + report. - [truetype] Improve handling of invalid references. + 3. Two flag values were inverted, causing incorrect assignment of + reference and overshoot values. - * src/truetype/interp.c: Set even more TT_Err_Invalid_Reference - error codes only if pedantic hinting is active. At the same time, - try to provide sane values which hopefully allow useful - continuation. Exception to this is CALL and LOOPCALL – due to - possible stack corruption it is necessary to bail out. + * src/autofit/afblue.dat: Fix CJK bluestrings, introducing a new + syntax to have both reference and overshoot characters in a single + string. This is error #1. + Add extensive comments. -2011-01-31 Werner Lemberg + * src/autofit/afblue.hin (AF_BLUE_PROPERTY_CJK_FILL): Removed, no + longer used. + (AF_BLUE_PROPERTY_CJK_TOP, AF_BLUE_PROPERTY_CJK_HORIZ): Fix values. + This is error #3. - [truetype] Improve handling of stack underflow. + * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. - * src/truetype/ttinterp.c (TT_RunIns, Ins_FLIPPT, Ins_DELTAP, - Ins_DELTAC): Exit with error only if `pedantic_hinting' is set. - Otherwise, try to do something sane. + * src/autofit/afcjk.c (af_cjk_metrics_init_blues): Correct error #1. + Use character `|' to separate characters for reference and overshoot + values. + Improve tracing messages, synchronizing them with the latin + auto-hinter. + (af_cjk_hints_compute_blue_edges): Fix value of `is_top_right_blue'. + This is error #2. + (af_cjk_align_linked_edge): Add tracing message. -2011-01-30 Werner Lemberg + * src/autofit/afcjk.h (AF_CJK_IS_FILLED_BLUE): Removed, no longer + used. - * src/sfnt/ttmtx.c (tt_face_load_hmtx): Fix tracing message. +2014-04-17 Werner Lemberg -2011-01-30 LIU Sun-Liang + [autofit] More coverage fixes for complex scripts. - [truetype]: Fix behaviour of MIAP for invalid arguments. + * src/autofit/hbshim.c (af_get_coverage): Merge input glyph coverage + of GSUB lookups into output coverage. Otherwise, ligatures are not + handled properly. + Don't check blue zone characters for default coverage. - * src/truetype/ttinterp.c (Ins_MIAP): Set reference points even in - case of error. +2014-04-17 Werner Lemberg -2011-01-18 Werner Lemberg + Make `FT_Get_SubGlyph_Info' actually work. - [truetype] Fix handling of MIRP instruction. + * src/base/ftobjs.c (FT_Get_SubGlyph_Info): Return FT_Err_Ok + if there is no error. - Thanks to Greg Hitchcock who explained the issue. +2014-04-15 Werner Lemberg - * src/truetype/ttinterp.c (Ins_MIRP): Replace a `>=' operator with - `>' since the description in the specification is incorrect. - This fixes, for example, glyph `two' in font `Helvetica Neue LT Com - 65 medium' at 15ppem. + [afblue.pl]: Minor improvements. -2011-01-15 suzuki toshiya + * src/tools/afblue.pl: Allow whitespace before comments. + Ignore whitespace in strings. - Fix ARM assembly code in include/freetype/config/ftconfig.h. +2014-04-14 Werner Lemberg - * include/freetype/config/ftconfig.h (FT_MulFix_arm): - Copy the maintained code from builds/unix/ftconfig.in. - Old GNU binutils could not accept the reduced syntax - `orr %0, %2, lsl #16'. Un-omitted syntax like RVCT, - `orr %0, %0, %2, lsl #16' is better. Reported by - Johnson Y. Yan. The bug report by Qt developers is - considered too. + [autofit] Improve coverage handling. - http://bugreports.qt.nokia.com/browse/QTBUG-6521 + * src/autofit/hbshim.c (af_get_coverage): Don't exclude glyphs + appearing in the GPOS table if we are processing the default + coverage. -2011-01-15 Werner Lemberg +2014-04-13 David Weber - [raster] Make bbox handling the same as with Microsoft's rasterizer. + [smooth] Fix stand-alone compilation. - Right before B/W rasterizing, the bbox gets simply rounded to - integers. This fixes, for example, glyph `three' in font `Helvetica - Neue LT Com 65 Medium' at 11ppem. + * src/smooth/ftgrays.c (FT_BEGIN_STMNT, FT_END_STMNT): Define. - Thanks to Greg Hitchcock who explained this behaviour. +2014-04-12 Werner Lemberg - * src/raster/ftrend1.c (ft_raster1_render): Implement it. + [autofit] Redesign the recognition algorithm of strong points. -2011-01-15 suzuki toshiya + In particular, local extrema without horizontal or vertical segments + are better recognized: - Copy -mcpu=* & -march=* options from CFLAGS to LDFLAGS. + + A + D + \ / + \ / + \ / + \ / + \ + C + \ / + B +/ - * builds/unix/configure.raw: Consider recent gcc-standard - flags to specify architecture in CFLAGS & LDFLAGS - harmonization. Requested by Savannah bug #32114, to - support multilib feature of BuildRoot SDK correctly. + If the distances AB and CD are large, point B wasn't previously + detected as an extremum since the `ft_corner_is_flat' function + `swallowed' BC regardless of its direction, tagging point B as weak. + The next iteration started at B and made `ft_corner_is_flat' swallow + point C, tagging it as weak also, et voilà. -2011-01-15 suzuki toshiya + To improve that, another pass gets now performed before calling + `ft_corner_is_flat' to improve the `topology' of an outline: A + sequence of non-horizontal or non-vertical vectors that point into + the same quadrant are handled as a single, large vector. - Fix off-by-one bug in CFLAGS & LDFLAGS harmonizer. + Additionally, distances of near points are now accumulated, which + makes the auto-hinter handle them as if they were prepended to the + next non-near vector. - * builds/unix/configure.raw: Some important options that - included in CFLAGS but not in LDFLAGS are copied to - LDFLAGS, but the last option in CFLAGS was not checked. + This generally improves the auto-hinter's rendering results. -2011-01-13 Werner Lemberg + * src/autofit/afhints.c (af_glyph_hints_reload): Implement it. - [raster] Add undocumented drop-out rule to the other bbox side also. + * src/autofit/afhints.h (AF_FLAGS): Remove no longer used flag + `AF_FLAG_NEAR'. - * src/raster/ftraster.c (Vertical_Sweep_Drop, - Horizontal_Sweep_Drop): Implement it. +2014-04-05 Werner Lemberg -2011-01-13 Werner Lemberg + [autofit] Improve scoring algorithm for identifying stems. - [raster] Reduce jitter value. + Problem reported by Karsten Lücke . - This catches a rendering problem with glyph `x' from Tahoma at - 10ppem. It seems that the increase of the precision in the change - from 2009-06-11 makes a larger jitter value unnecessary. + The new algorithm takes care of the width of stems: If the distance + between two segments is larger than the largest stem width, the + demerits quickly increase for larger distances. This improves + hinting of slanted fonts (especially if the inner parts of serifs + have non-horizontal `shoulders'), avoiding false stem links. - * src/raster/ftraster.c (Set_High_Precision): Implement it. + * src/autofit/aflatin.c (af_latin_hints_link_segments): Use largest + stem width (if available) to compute better demerits for distances + between stems. + (af_latin_hints_detect_features): Pass stem width array and array + size. + (af_latin_metrics_init_widths): Updated to use original algorithm. + (af_latin_hints_apply): Updated to use new algorithm. -2011-01-13 Werner Lemberg + * src/autofit/aflatin.h: Updated. + * src/autofit/afcjk.c: Updated. - [raster] Handle drop-outs at glyph borders according to Microsoft. +2014-04-03 Werner Lemberg - If a drop-out rule would switch on a pixel outside of the glyph's - bounding box, use the right (or top) pixel instead. This is an - undocumented feature, but some fonts like `Helvetica Neue LT Com 65 - Medium' heavily rely on it. + Don't require `gzip' module for `sfnt'. - Thanks to Greg Hitchcock who explained this behaviour. + Reported by Preet . - * src/raster/ftraster.c (Vertical_Sweep_Drop, - Horizontal_Sweep_Drop): Implement it. + * src/sfnt/sfobjs.c (woff_open_font): Guard use of + FT_Gzip_Uncompress with FT_CONFIG_OPTION_USE_ZLIB. -2011-01-09 suzuki toshiya +2014-03-27 Werner Lemberg - [cache] Fix Savannah bug #31923, patch drafted by Harsha. + Fix Savannah bug #38235. - When a node comparator changes the cached nodes during the - search of a node matching with queried properties, the - pointers obtained before the function should be updated to - prevent the dereference to freed or reallocated nodes. - To minimize the rescan of the linked list, the update is - executed when the comparator notifies the change of cached - nodes. This change depends previous change: - 38b272ffbbdaae276d636aec4ef84af407d16181 + Work around a bug in pkg-config version 0.28 and earlier: If a + variable value gets surrounded by doublequotes (in particular values + for the `prefix' variable), the prefix override mechanism fails. - * src/cache/ftccache.h (FTC_CACHE_LOOKUP_CMP): Rescan the - top node if the cached nodes are changed. - * src/cache/ftccache.c (FTC_Cache_Lookup): Ditto. + * builds/unix/freetype2.in: Don't use doublequotes. + * builds/unix/unix-def.in (freetype.pc): Escape spaces in directory + names with backslashes. -2011-01-09 suzuki toshiya +2014-03-24 Werner Lemberg - [cache] Notice if a cache query induced the node list change. + Fix Savannah bug #41946. - Some node comparators (comparing the cache node contents and the - properties specified by the query) can flush the cache node to - prevent the cache inflation. The change may invalidate the pointers - to the node obtained before the node comparison, so it should be - noticed to the caller. The problem caused by the cache node - changing is reported by Harsha, see Savannah bug #31923. + Based on a patch from Marek Kašík . - * src/cache/ftccache.h (FTC_Node_CompareFunc): Add new argument - `FT_Bool* list_changed' to indicate the change of the cached nodes - to the caller. - (FTC_CACHE_LOOKUP_CMP): Watch the change of the cached nodes by - `_list_changed'. - (FTC_CACHE_TRYLOOP_END): Take new macro argument `_list_changed' - and update it when `FTC_Manager_FlushN' flushes any nodes. + * builds/unix/configure.raw (LIBS_CONFIG): Remove. + * builds/unix/freetype-config.in (libs): Hard-code value. + * builds/unix/unix-def.in: Updated. - * src/cache/ftccback.h (ftc_snode_compare): Updated to fit with new - FTC_Node_CompareFunc type. - (ftc_gnode_compare): Ditto. +2014-03-22 Werner Lemberg - * src/cache/ftcbasic.c: Include FT_INTERNAL_OBJECTS_H to use - TRUE/FALSE macros. - (ftc_basic_gnode_compare_faceid): New argument `FT_Bool* - list_changed' to indicate the change of the cache nodes (anyway, it - is always FALSE). + Another revert for the change from 2014-03-18. - * src/cache/ftccmap.c: Include FT_INTERNAL_OBJECTS_H to use - TRUE/FALSE macros. - (ftc_cmap_node_compare): New argument `FT_Bool* list_changed' to - indicate the change of the cache nodes (anyway, it is always FALSE). - (ftc_cmap_node_remove_faceid): Ditto. + Problem reported by Nikolaus Waxweiler . - * src/cache/ftccache.c (FTC_Cache_NewNode): Pass a NULL pointer to - `FTC_CACHE_TRYLOOP_END', because the result is not needed. - (FTC_Cache_Lookup): Watch the change of the cache nodes by - `list_changed'. - (FTC_Cache_RemoveFaceID): Ditto. + * src/base/ftcalc.c (FT_MulFix): Ensure that an `FT_MulFix' symbol + gets always exported. - * src/cache/ftcglyph.c: Include FT_INTERNAL_OBJECTS_H to use - TRUE/FALSE macros. - (ftc_gnode_compare): New argument `FT_Bool* list_changed' to - indicate the change of the cache nodes (anyway, it is always FALSE). - (FTC_GNode_Compare): New argument `FT_Bool* list_changed' to be - passed to `ftc_gnode_compare'. - * src/cache/ftcglyph.h (FTC_GNode_Compare): Ditto. +2014-03-20 Werner Lemberg - * src/cache/ftcsbits.c (ftc_snode_compare): New argument `FT_Bool* - list_changed' to indicate the change of the cache nodes, anyway. It - is updated by `FTC_CACHE_TRYLOOP'. - (FTC_SNode_Compare): New argument `FT_Bool* list_changed' to be - passed to `ftc_snode_compare'. - * src/cache/ftcsbits.h (FTC_SNode_Compare): Ditto. + CMakeLists.txt: Another fix for include directories. -2011-01-09 suzuki toshiya + Problem reported by Taylor Holberton . - [cache] Fit `FTC_GNode_Compare' to `FTC_Node_CompareFunc'. +2014-03-19 Werner Lemberg - * src/cache/ftcglyph.h (FTC_GNode_Compare): Add the 3rd - argument `FTC_Cache cache' to fit FTC_Node_CompareFunc - prototype. - * src/cache/ftcglyph.c (FTC_GNode_Compare): Ditto. Anyway, - `cache' is not used by its child `ftc_gnode_compare'. + CMakeLists.txt: Fix include directories. -2011-01-09 suzuki toshiya + Problem reported by Taylor Holberton . - [cache] Deduplicate the code to get the top node by a hash. +2014-03-19 Werner Lemberg - There are several duplicated code fragments getting the top node - from a cache by a given hash, like: + Partially revert last commit. - idx = hash & cache->mask; - if ( idx < cache->p ) - idx = hash & ( cache->mask * 2 + 1 ); - pnode = cache->buckets + idx; + Found by Alexei. - To remove duplication, a cpp-macro to do same work - `FTC_NODE__TOP_FOR_HASH' is introduced. For non-inlined - configuration, non-`ftc_get_top_node_for_hash' is also introduced. + * src/autofit/aflatin.c (af_latin_metrics_init_blues): Initializing + those variables is plain wrong, since we are in a loop. - * src/cache/ftccache.h (FTC_NODE__TOP_FOR_HASH): Declare - and implement inlined version. - (FTC_CACHE_LOOKUP_CMP): Use `FTC_NODE__TOP_FOR_HASH'. - * src/cache/ftccache.c (ftc_get_top_node_for_hash): Non-inlined - version. - (ftc_node_hash_unlink): Use `FTC_NODE__TOP_FOR_HASH'. - (ftc_node_hash_link): Ditto. - (FTC_Cache_Lookup): Ditto. +2014-03-18 Sean McBride + Werner Lemberg -2011-01-09 suzuki toshiya + Fix clang warnings. - [cache] inline-specific functions are conditionalized. + * src/autofit/aflatin.c (af_latin_metrics_init_blues): Initialize + some variables. - * src/cache/ftcglyph.c (FTC_GNode_Compare): Conditionalized for - inlined configuration. This function is a thin wrapper of - `ftc_gnode_compare' for inlined `FTC_CACHE_LOOKUP_CMP' (see - `nodecmp' argument). Under non-inlined configuration, - `ftc_gnode_compare' is invoked by `FTC_Cache_Lookup', via - `FTC_Cache->clazz.node_compare'. + * src/base/ftcalc.c (FT_MulFix): Only use code if + `FT_MULFIX_INLINED' is not defined. - * src/cache/ftcglyph.h (FTC_GNode_Compare): Ditto. - * src/cache/ftcsbits.c (FTC_SNode_Compare): Ditto, for - `ftc_snode_compare'. - * src/cache/ftcsbits.h (FTC_SNode_Compare): Ditto. + * src/bdf/bdfdrivr.c (bdf_cmap_class), src/cache/ftcbasic.c + (ftc_basic_image_family_class, ftc_basic_image_cache_class, + ftc_basic_sbit_family_class, ftc_basic_sbit_cache_class), + src/cache/ftccmap.c (ftc_cmap_cache_class), src/cache/ftcmanag.c + (ftc_size_list_class, ftc_face_list_class), src/pcf/pcfdrivr.c + (pcf_cmap_class), src/pfr/pfrdrivr.c (pfr_metrics_service_rec): Make + function static. -2011-01-09 suzuki toshiya + * src/type1/t1driver.c (t1_ps_get_font_value): Remove redundant + code. - [cache] Correct a type mismatch under non-inlined config. +2014-03-17 Werner Lemberg - * src/cache/ftcglyph.h (FTC_GCACHE_LOOKUP_CMP): `FTC_GCache_Lookup' - takes the node via a pointer `FTC_Node*', differently from cpp-macro - `FTC_CACHE_LOOKUP_CMP'. + Fix Savannah bug #41869. -2011-01-06 suzuki toshiya + This works around a problem with HarfBuzz (<= 0.9.26), which doesn't + validate glyph indices returned by + `hb_ot_layout_lookup_collect_glyphs'. - Update Jamfile to include Bzip2 support. + * src/autofit/hbshim.c (af_get_coverage): Guard `idx'. - * Jamfile: Include src/bzip2 to project. - Comments for lzw, gzip, bzip2 are changed to clarify that - they are for compressed PCF fonts, not others. - (e.g. compressed BDF fonts are not supported yet) + * docs/CHANGES: Updated. -2011-01-05 suzuki toshiya +2014-03-14 Werner Lemberg - Update Symbian project files to include Bzip2 support. + * builds/unix/configure.raw: Don't show error messages of `which'. - Currently, it provides `FT_Stream_OpenBzip2' that returns - unimplemented error always, to prevent unresolved symbol - error for the applications designed for Unix systems. +2014-03-09 Alan Coopersmith - * builds/symbian/bld.inf: Include ftbzip2.h. - * builds/symbian/freetype.mmp: Include ftbzip2.c. + Fix cppcheck 1.64 warning. -2011-01-05 suzuki toshiya + * src/autofit/afglobal.c (af_face_globals_new): Catch NULL pointer + dereference in case of error. - Update classic MacOS makefiles to include Bzip2 support. +2014-03-09 Sean McBride - Currently, it provides `FT_Stream_OpenBzip2' that returns - unimplemented error always, to prevent unresolved symbol - error for the applications designed for Unix systems. + * src/sfnt/ttcmap.c (tt_face_build_cmaps): Remove clang warning. - * builds/mac/FreeType.m68k_cfm.make.txt: Include ftbzip2.c.o. - * builds/mac/FreeType.m68k_far.make.txt: Ditto. - * builds/mac/FreeType.ppc_carbon.make.txt: Include ftbzip2.c.x. - * builds/mac/FreeType.ppc_classic.make.txt: Ditto. +2014-03-06 Werner Lemberg -2011-01-05 suzuki toshiya + * Version 2.5.3 released. + ========================= - Update Amiga makefiles to include Bzip2 support. - Currently, it provides `FT_Stream_OpenBzip2' that returns - unimplemented error always, to prevent unresolved symbol - error for the applications designed for Unix systems. + Tag sources with `VER-2-5-3'. - * builds/amiga/makefile: Include bzip2.ppc.o built from ftbzip2.c. - * builds/amiga/makefile.os4: Include bzip2.o built from ftbzip2.c. - * builds/amiga/smakefile: Ditto. + * docs/VERSION.DLL: Update documentation and bump version number to + 2.5.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.5.2/2.5.3/, s/252/253/. -2011-01-05 suzuki toshiya + * include/freetype/freetype.h (FREETYPE_PATCH): Set to 3. - Update pkg-config tools to reflect Bzip2 support. + * builds/unix/configure.raw (version_info): Set to 17:2:11. + * CMakeLists.txt (VERSION_PATCH): Set to 3. + * docs/CHANGES: Updated. - * builds/unix/freetype-config.in: Include `-lbz2' to - --libs output, if built with Bzip2 support. - * builds/unix/freetype2.in: Ditto. +2014-03-06 Werner Lemberg -2011-01-05 suzuki toshiya + Fixes for compilation with C++. - * builds/unix/configure.raw: Remove `SYSTEM_BZ2LIB' macro. + * src/autofit/hbshim.c (scripts): Change type to `hb_script_t'. + (af_get_coverage): Updated. + (COVERAGE): Add cast. - SYSTEM_ZLIB is used to switch the builtin zlib source - or system zlib source out of FreeType2. But ftbzip2 - module has no builtin bzip2 library and always requires - system bzip2 library. Thus SYSTEM_BZ2LIB is always yes, - it is not used. +2014-03-06 Sean McBride -2011-01-03 Werner Lemberg + Remove more clang analyzer warnings. - */rules.mk: Handle `*pic.c' files. + * src/bdf/bdflib.c (_bdf_readstream), src/truetype/ttgload.c + (TT_Load_Glyph): Remove dead stores. -2010-12-31 Werner Lemberg +2014-03-05 Werner Lemberg - * src/cff/cfftypes.h (CFF_MAX_CID_FONTS): Increase to 64. - Problem reported by Tom Bishop . + * builds/unix/configure.raw: Simplify. -2010-12-31 Werner Lemberg +2014-03-05 suzuki toshiya - Improve bzip2 support. + Fix a bug in configure in library dependency setting + Reported in https://bugs.freedesktop.org/show_bug.cgi?id=75652. - * include/freetype/ftmoderr.h: Add bzip2. + * builds/unix/configure.raw: Use `x"${xxx}" != xno' style. - * docs/INSTALL.ANY, docs/CHANGES: Updated. +2014-03-04 Werner Lemberg - * src/pcf/README: Updated. - * include/freetype/internal/pcftypes.h: Obsolete, removed. + Minor fix for `make devel'. -2010-12-31 Joel Klinghed + * builds/freetype.mk (INCLUDE_FLAGS) [DEVEL_DIR]: Don't use + pkg-config for bzip2 since not all GNU/Linux distributions have + `bzip2.pc' (and the header file `bzlib.h' is located in /usr/include + normally). - Add bzip2 compression support to handle *.pcf.bz2 files. +2014-03-04 Sean McBride - * builds/unix/configure.raw: Test for libbz2 library. + Fix several clang static analyzer dead store warnings. - * devel/ftoption.h, include/freetype/config/ftoption.h - (FT_CONFIG_OPTION_USE_BZIP2): Define. - * include/freetype/config/ftheader.h (FT_BZIP2_H): Define. + * src/autofit/afhints.c (af_glyph_hints_reload, + af_glyph_hints_align_weak_points): Remove unnecessary assignments. - * include/freetype/ftbzip2.h: New file. + * src/bdf/bdflib.c (bdf_font_load): Ditto. - * src/bzip2/*: New files. + * src/pshinter/pshalgo.c (psh_glyph_compute_extrema, + psh_glyph_interpolate_other_points): Ditto. - * src/pcf/pcf.h: s/gzip_/comp_/. - * src/pcf/pcfdrvr.c: Include FT_BZIP2_H. - s/gzip_/comp_/. - (PCF_Face_Init): Handle bzip2 compressed files. + * src/type1/t1load.c (T1_Set_MM_Blend): Ditto. - * docs/formats.txt, modules.cfg: Updated. +2014-03-03 Werner Lemberg -2010-12-25 Harsha + Rewrite library option handling in `configure'. - Apply Savannah patch #7422. + o Introduce `auto' value for `--with-XXX' library options; this is + now the default. - If we encounter a space in a string then the sbit buffer is NULL, - height and width are 0s. So the check in ftc_snode_compare will - always pass for spaces (comparision with 255). Here the comments - above the condition are proper but the implementation is not. When - we create an snode I think it is the proper way to initialize the - width to 255 and then put a check for being equal to 255 in snode - compare function. + o First use `pkg-config' for library detection, then fall back to + other tests. - * src/cache/ftcsbits.c (FTC_SNode_New): Initialize sbit widths with - value 255. - (ftc_snode_compare): Fix condition. + * builds/unix/configure.raw (--with-zlib, --with-bzip2, --with-png, + --with-harfbuzz): Rewrite. + Use new `xxx_reqpriv', `xxx_libpriv', and `xxx_libstaticconf' + variables to collect data for `freetype2.pc' and `freetype-config'. + (FT2_EXTRA_LIBS): Renamed to ... + (ft2_extra_libs): This since it gets no longer substituted. + (REQUIRES_PRIVATE, LIBS_PRIVATE, LIBS_CONFIG, LIBSSTATIC_CONFIG): + New output variables, replacing `XXX_PKG' and `LIBXXX'. + Add notice at the end of `configure' showing the library + configuration. -2010-12-13 Werner Lemberg + * builds/unix/freetype-config.in (--static): New command line + option. + (libs): Updated. + (staticlibs): New variable, to be used if `--static' is given. + * docs/freetype-config.1: Document `--static'. - Fix parameter handling of `FT_Set_Renderer'. - Reported by Kirill Tishin . + * builds/unix/freetype2.in, builds/unix/unix-def.in: Updated. - * src/base/ftobjs.c (FT_Set_Renderer): Increment `parameters'. +2014-03-01 Werner Lemberg -2010-12-09 Werner Lemberg + Avoid `long long' warnings with older gcc compilers. + Problem reported by Hin-Tak Leung . - [cff] Allow `hlineto' and `vlineto' without arguments. + * builds/unix/configure.raw: Don't use gcc's `-pedantic' flag for + versions < 4.6. This is especially needed for Max OS X since this + OS runs a gcc variant (or emulation) based on version 4.2.1. - We simply ignore such instructions. This is invalid, but it doesn't - harm; and indeed, there exist such subsetted fonts in PDFs. +2014-03-01 Werner Lemberg - Reported by Albert Astals Cid . + * docs/INSTALL.CROSS: Revised and updated. - * src/cff/cffgload.c (cff_decoder_parse_charstrings) - [cff_op_hlineto]: Ignore instruction if there aren't any arguments - on the stack. +2014-03-01 Werner Lemberg -2010-11-28 Werner Lemberg + Make `make clean' remove `freetype2.pc'. - * Version 2.4.4 released. - ========================= + This is a generated file at build time, not configure time. + * builds/unix/unix-def.in (DISTCLEAN): Move `freetype2.pc' to ... + (CLEAN): This variable. - Tag sources with `VER-2-4-4'. +2014-03-01 Werner Lemberg - * docs/CHANGES: Updated. + Use pkg-config for detecting libpng and libbz2 also. - * docs/VERSION.DLL: Update documentation and bump version number to - 2.4.4 + * builds/unix/configure.raw (HAVE_PKG): New variable. + Search for libbz2 using `pkg-config'; s/BZ2/BZIP2/. + Search for libpng using `pkg-config'. + Fix definition of `LIBHARFBUZZ' variable. + * builds/unix/freetype-config.in ($libs): Updated. + * builds/unix/freetype2.in: Add `URL' field. + Update `Requires.private' and `Libs.private'. + * builds/unix/unix-def.in: Updated. - * README, Jamfile (RefDoc), - builds/win32/vc2005/freetype.vcproj, builds/win32/vc2005/index.html, - builds/win32/vc2008/freetype.vcproj, builds/win32/vc2008/index.html, - builds/win32/visualc/freetype.dsp, - builds/win32/visualc/freetype.vcproj, - builds/win32/visualc/index.html, builds/win32/visualce/freetype.dsp, - builds/win32/visualce/freetype.vcproj, - builds/win32/visualce/index.html, - builds/wince/vc2005-ce/freetype.vcproj, - builds/wince/vc2005-ce/index.html, - builds/wince/vc2008-ce/freetype.vcproj, - builds/wince/vc2008-ce/index.html: s/2.4.3/2.4.4/, s/243/244/. +2014-03-01 Werner Lemberg - * include/freetype/freetype.h (FREETYPE_PATCH): Set to 4. + Add configure support for HarfBuzz. - * builds/unix/configure.raw (version_info): Set to 12:2:6. + * builds/unix/pkg.m4: New file. + * builds/unix/configure.raw: Search for libharfbuzz using + `pkg-config'. + Add `--without-harfbuzz' option. + * builds/unix/freetype-config.in, builds/unix/freetype2.in, + builds/unix/unix-def.in (freetype-config, freetype2.pc): Handle + HarfBuzz. -2010-11-28 Alexei Podtelezhnikov + * docs/INSTALL.UNIX: Document interdependency of Freetype with + HarfBuzz. - [ftsmooth]: Minor code simplification. +2014-02-28 Alexei Podtelezhnikov - * src/smooth/ftgrays (gray_render_cubic): Do only one comparison - instead of two. + [cff] Math simplifications. -2010-11-26 Johnson Y. Yan + * src/cf2blues.c (cf2_blues_init): Use `FT_MulDiv'. + * src/cf2ft.c (cf2_getScaleAndHintFlag): Use simple division. - [truetype] Better multi-threading support. +2014-02-28 Dave Arnold - * src/truetype/ttinterp.c (TT_Load_Context): Reset glyph zone - references. + [cff] Fix Savannah bug #41697, part 2. -2010-11-23 John Tytgat + * src/cff/cf2ft.c (cf2_initLocalRegionBuffer, + cf2_initGlobalRegionBuffer): It is possible for a charstring to call + a subroutine if no subroutines exist. This is an error but should + not trigger an assert. Split the assert to account for this. - * src/psaux/t1decode.c (t1_decoder_parse_charstring): Expand - start_point, check_points, add_point, add_point1, close_contour - macros. - Remove add_contour macro. - Return error code from t1_builder_start_point and - t1_builder_check_points when there was one (instead of returning 0). +2014-02-28 Dave Arnold -2010-11-22 suzuki toshiya + [cff] Fix Savannah bug #41697, part 1. - [truetype] Identify the tricky fonts by cvt/fpgm/prep checksums. - Some Latin TrueType fonts are still expected to be unhinted. - Fix Savannah bug #31645. + * src/cff/cf2hints.c (cf2_hintmap_build): Return when `hintMask' is + invalid. In this case, it is not safe to use the length of + `hStemHintArray'; the exception has already been recorded in + `hintMask'. - * src/truetype/ttobjs.c (tt_check_trickyness): Divided to... - (tt_check_trickyness_family): this checking family name, and - (tt_check_trickyness_sfnt_ids): this checking cvt/fpgm/prep. - (tt_get_sfnt_checksum): Function to retrieve the sfnt checksum - for specified subtable even if cleared by lazy PDF generators. - (tt_synth_sfnt_checksum): Function to calculate the checksum. +2014-02-26 Werner Lemberg -2010-11-18 Werner Lemberg + [sfnt] Fix Savannah bug #41696. - [truetype] Fix `loca' handling for inconsistent number of glyphs. - Reported by Johnson Y. Yan . + * src/sfnt/ttcmap.c (tt_cmap0_validate, tt_cmap2_validate, + tt_cmap4_validate, tt_cmap14_validate): Fix limit tests. - * src/truetype/ttpload.c (tt_face_load_loca): While sanitizing, - handle case where `loca' is the last table in the font. +2014-02-26 Werner Lemberg -2010-11-18 Werner Lemberg + [winfnt] Fix Savannah bug #41694. - [sfnt] Ignore all errors while loading `OS/2' table. - Suggested by Johnson Y. Yan . + * src/winfonts/winfnt.c (FNT_Load_Glyph): Check glyph offset. - * src/sfnt/sfobjs.c (sfnt_load_face): Do it. +2014-02-26 Werner Lemberg -2010-11-18 Johnson Y. Yan + [cff] Fix Savannah bug #41693. - [type1] Fix matrix normalization. + * src/cff/cffload.c (CFF_Load_FD_Select): Reject empty array. - * src/type1/t1load.c (parse_font_matrix): Handle sign of scaling - factor. +2014-02-26 Werner Lemberg -2010-11-18 Werner Lemberg + [bdf] Fix Savannah bug #41692. - [type1] Improve guard against malformed data. - Based on a patch submitted by Johnson Y. Yan - + bdflib puts data from the input stream into a buffer in chunks of + 1024 bytes. The data itself gets then parsed line by line, simply + increasing the current pointer into the buffer; if the search for + the final newline character exceeds the buffer size, more data gets + read. - * src/type1/t1load.c (read_binary_data): Check `size'. + However, in case the current line's end is very near to the buffer + end, and the keyword to compare with is longer than the current + line's length, an out-of-bounds read might happen since `memcmp' + doesn't stop properly at the string end. -2010-11-17 Werner Lemberg + * src/bdf/bdflib.c: s/ft_memcmp/ft_strncmp/ to make comparisons + stop at string ends. - [sfnt] While tracing, output table checksums also. +2014-02-17 suzuki toshiya - * src/sfnt/ttload.c (tt_face_load_font_dir): Do it. + [autofit] Fix `make multi' compilation. -2010-11-04 suzuki toshiya + * src/autofit/hbshim.c: Include `afglobal.h' and `aftypes.h'. - [UVS] Fix `find_variant_selector_charmap', Savannah bug #31545. +2014-02-19 Werner Lemberg + Simon Bünzli - Since 2010-07-04, `find_variant_selector_charmap' returns - the first cmap subtable always under rogue-compatible - configuration, it causes NULL pointer dereference and - make UVS-related functions crashed. + Fix Savannah bug #32902. - * src/base/ftobjs.c (Fix find_variant_selector_charmap): - Returns UVS cmap correctly. + Patch taken from -2010-11-01 Alexei Podtelezhnikov + https://code.google.com/p/sumatrapdf/source/browse/trunk/ext/_patches/freetype2.patch?spec=svn8620&r=8620#87 - [ftsmooth] Improve rendering. + with slight modifications. - * src/smooth/ftsmooth.c (gray_render_conic): Since version 2.4.3, - cubic deviations have been estimated _after_ UPSCALE, whereas - conic ones have been evaluated _before_ UPSCALE, which produces - inferior rendering results. Fix this. - Partially undo change from 2010-10-15 by using ONE_PIXEL/4; this has - been tested with demo images sent to the mailing list. See + * src/type1/t1parse.c (T1_Get_Private_Dict): Add heuristic test to + handle fonts that incorrectly use \r at the beginning of an eexec + block. - http://lists.gnu.org/archive/html/freetype-devel/2010-10/msg00055.html +2014-02-19 Simon Bünzli - and later mails in this thread. + Fix Savannah bug #41590. -2010-10-28 Werner Lemberg + * src/type1/t1load.c (parse_encoding): Protect against invalid + number. - [ftraster] Minor fixes. +2014-02-12 Dave Arnold - Reported by Tom Bishop . + [cff] Optimize by using `FT_MulDiv'. + Suggested by Alexei. - * src/raster/ftraster.c (ULong): Remove unused typedef. - (TWorker): Remove unused variable `precision_mask'. + * src/cff/cf2font.c (cf2_computeDarkening): Do it. -2010-10-28 Werner Lemberg +2014-02-12 Werner Lemberg - [ftraster] Fix rendering. + Fix Savannah bug #41465. - Problem reported by Tom Bishop ; see - thread starting with + * builds/unix/unix-def.in (CLEAN): Add `freetype-config'. + (DISTCLEAN): Remove `freetype-config'. - http://lists.gnu.org/archive/html/freetype/2010-10/msg00049.html +2014-02-08 Sean McBride - * src/raster/ftraster.c (Line_Up): Replace FMulDiv with SMulDiv - since the involved multiplication exceeds 32 bits. + Fix clang static analyzer and compiler warnings. -2010-10-25 suzuki toshiya + * src/autofit/afhints.c (af_glyph_hints_align_weak_points), + src/autofit/afloader (af_loader_load_g) , + src/base/ftcalc.c (FT_MSB), src/base/ftoutln.c + (FT_Outline_Decompose), src/bdf/bdfdrivr.c (bdf_interpret_style), + src/cff/cffparse.c (cff_parse_integer), src/cid/cidparse.c + (cid_parser_new), src/pfr/pfrload.c (pfr_phy_font_load), + src/raster/ftraster.c (Decompose_Curve), src/sfnt/sfdriver.c + (sfnt_get_ps_name), src/sfnt/ttcmap.c (tt_cmap12_next, + tt_cmap13_next), src/smooth/ftgrays.c (gray_hline): Remove dead + code. - Revert a change of `_idx' type in `FTC_CACHE_LOOKUP_CMP'. + * src/autofit/afmodule.c (af_property_get_face_globals, + af_property_set, af_property_get), src/base/ftbitmap.c + (ft_gray_for_premultiplied_srgb_bgra): Make functions static. - * src/cache/ftccache.h (FTC_CACHE_LOOKUP_CMP): Revert - the type of `_idx' from FT_PtrDist (by previous change) - to original FT_UFast, to match with FT_CacheRec. + * src/base/ftobjs.c (ft_remove_renderer): Protect against + library == NULL. + (ft_property_do): Make function static. -2010-10-24 suzuki toshiya + * src/base/ftrfork.c: Include `ftbase.h'. - [cache] Change the hash types to FT_PtrDist. + * src/sfnt/ttsbit.c (tt_face_load_sbix_image) + [!FT_CONFIG_OPTION_USE_PNG], src/type1/t1gload.c + (T1_Compute_Max_Advance): Avoid compiler warning. - On LLP64 platforms (e.g. Win64), FT_ULong (32-bit) - variables are inappropriate to calculate hash values - from the memory address (64-bit). The hash variables - are extended from FT_ULong to FT_PtrDist and new - hashing macro functions are introduced. The hash - values on 16-bit memory platforms are changed, but - ILP32 and LP64 are not changed. The hash value in - the cache subsystem is not reverted to the memory - address, so using signed type FT_PtrDist is safe. + * src/truetype/ttinterp.c (TT_New_Context): Reduce scope of + variable. - * src/cache/ftccache.h (_FTC_FACE_ID_HASH): New hash - function to replace `FTC_FACE_ID_HASH' for portability. - * src/cache/ftcmanag.h (FTC_SCALER_HASH): Replace - `FTC_FACE_ID_HASH' by `_FTC_FACE_ID_HASH'. - * src/cache/ftccmap.c (FTC_CMAP_HASH): Ditto. +2014-02-08 Werner Lemberg - * src/cache/ftccache.h (FTC_NodeRec): The type of the - member `hash' is changed from FT_UInt32 to FT_PtrDist. + Fix Windows build directories. - * src/cache/ftccache.h (FTC_Cache_Lookup): The type of the - argument `hash' is changed from FT_UInt32 to FT_PtrDist. - (FTC_Cache_NewNode): Ditto. - * src/cache/ftccache.c (ftc_cache_add): Ditto. - (FTC_Cache_Lookup): Ditto. (FTC_Cache_NewNode): Ditto. - * src/cache/ftcglyph.h (FTC_GCache_Lookup): Ditto. - * src/cache/ftcglyph.c (FTC_GCache_Lookup): Ditto. + The build target is now `windows' instead of `win32'. - * src/cache/ftcbasic.c (FTC_ImageCache_Lookup): The type - of the internal variable `hash' is changed to FT_PtrDist - from FT_UInt32. (FTC_ImageCache_LookupScaler): Ditto. - (FTC_SBitCache_Lookup): Ditto. - (FTC_SBitCache_LookupScaler): Ditto. - * src/cache/ftccmap.c (FTC_CMapCache_Lookup): Ditto. - * src/cache/ftccache.h (FTC_CACHE_LOOKUP_CMP): Ditto. - Also the type of the internal variable `_idx' is changed to - FT_PtrDist from FT_UFast for better pointer calculation. + Problem reported by Nickolas George . -2010-10-24 suzuki toshiya + * builds/modules.mk: Don't use `win32' and `win16' (!) but + `windows'. - [cache] Hide internal macros incompatible with LLP64. + * builds/windows/detect.mk, builds/windows/win32-def.mk: + s/win32/windows/. - `FT_POINTER_TO_ULONG', `FTC_FACE_ID_HASH', and - `FTC_IMAGE_TYPE_HASH' are enclosed by - FT_CONFIG_OPTION_OLD_INTERNALS and hidden from - normal clients. +2014-02-08 Eugen Sawin - For the history of these macros, see the investigation: - http://lists.gnu.org/archive/html/freetype/2010-10/msg00022.html + Fix Savannah bug #41507. -2010-10-24 suzuki toshiya + * src/sfnt/ttsbit.c (tt_sbit_decoder_load_bitmap) + [!FT_CONFIG_OPTION_USE_PNG] <17, 17, 19>: Fix error handling. - Change the type of `FT_MEM_VAL' from FT_ULong to FT_PtrDist. +2014-02-08 Dave Arnold - On LLP64 platforms (e.g. Win64), unsigned long (32-bit) - cannot cover the memory address (64-bit). `FT_MEM_VAL' is - used for hashing only and not dereferred, so using signed - type FT_PtrDist is safe. + [cff] Fix minor performance bug. - * src/base/ftdbgmem.c (FT_MEM_VAL): Change the type of the - return value from FT_ULong to FT_PtrDist. - (ft_mem_table_resize): The type of hash is changed to - FT_PtrDist. (ft_mem_table_get_nodep): Ditto. + * src/cff/cf2font.c (cf2_font_setup): Darkening amount and blue zone + calculations are now cached and not recomputed on each glyph. -2010-10-24 suzuki toshiya +2014-02-05 Werner Lemberg - Replace "%lx" for memory address by "%p", LLP64 platforms. + Fix problems with perl 5.8.8 as distributed with current MinGW. - On LLP64 platforms (e.g. Win64), long (32-bit) cannot cover - the memory address (64-bit). Also the casts from the pointer - type to long int should be removed to preserve the address - correctly. + * src/tools/afblue.pl: Work-around for Perl bug #63402. + (string_re): Avoid `possessive quantifiers', which have been + introduced in Perl version 5.10. - * src/raster/ftraster.c (New_Profile): Replace "%lx" by "%p". - (End_Profile) Ditto. - * src/truetype/ttinterp.c (Init_Context): Ditto. +2014-02-04 Werner Lemberg -2010-10-15 Alexei Podtelezhnikov + Fix compilation with MinGW. - Fix thinko in spline flattening. + Right now, compilation out of the box with latest MinGW is broken + due to bugs in header files of mingwrt 4.0.3 in strict ANSI mode, + cf. - FT_MAX_CURVE_DEVIATION is dependent on the value of ONE_PIXEL. + https://sourceforge.net/p/mingw/bugs/2024/ + https://sourceforge.net/p/mingw/bugs/2046/ - * src/smooth/ftgrays.c (FT_MAX_CURVE_DEVIATION): Remove it and - replace it everywhere with ONE_PIXEL/8. + * builds/unix/configure.raw: Don't set `-ansi' flag for MinGW. -2010-10-13 suzuki toshiya +2014-02-04 Werner Lemberg - [raccess] Skip unrequired resource access rules by Darwin VFS. + [autofit] Minor fix. - When a resource fork access rule by Darwin VFS could open the - resource fork but no font is found in it, the rest of rules - by Darwin VFS are skipped. It reduces the warnings of the - deprecated resource fork access method by recent Darwin kernel. - Fix MacPorts ticket #18859: - http://trac.macports.org/ticket/18859 + * src/autofit/afcjk.c (af_cjk_metrics_init_widths), + src/autofit/aflatin.c (af_latin_metrics_init_widths): Fix handling + of alternative standard characters. + This also fixes a compilation warning in non-debug mode. - * src/base/ftobjs.c (load_face_in_embedded_rfork): - When `FT_Stream_New' returns FT_Err_Cannot_Open_Stream, it - means that the file is possible to be `fopen'-ed but zero-sized. - Also there is a case that the resource fork is not zero-sized, - but no supported font exists in it. If a rule by Darwin VFS - falls into such cases, there is no need to try other Darwin VFS - rules anymore. Such cases are marked by vfs_rfork_has_no_font. - If it is TRUE, the Darwin VFS rules are skipped. +2014-02-03 Werner Lemberg -2010-10-13 suzuki toshiya + [cff] Fix Savannah bug #41363. - [raccess] Grouping resource access rules based on Darwin VFS. + * src/cff/cf2ft.c (cf2_checkTransform): Convert assertion into + parameter check. + (cf2_decoder_parse_charstrings): Call `cf2_checkTransform' only if + we are scaling the outline. + (cf2_getPpemY): Remove problematic assertion. - MacOS X/Darwin kernel supports a few tricky methods to access - a resource fork via ANSI C or POSIX interface. Current resource - fork accessor tries all possible methods to support all kernels. - But if a method could open a resource fork but no font is found, - there is no need to try other methods older than tested method. - To determine whether the rule index is for Darwin VFS, a local - function `ftrfork.c::raccess_rule_by_darwin_vfs' is introduced. - To use this function in ftobjs.c etc but it should be inlined, - it is exposed by ftbase.h. +2014-01-26 Werner Lemberg - * src/base/ftrfork.c (FT_RFork_Rule): New enum type to identify - the rules to access the resource fork. - (raccess_guess_rec): New structure to bind the rule function and - rule enum type. - (FT_Raccess_Guess): The list of the rule functions is replaced by - (raccess_guess_table): This. This is exposed to be used by other - intra module functions. - (raccess_rule_by_darwin_vfs): A function to return a boolean - if the rule specified by the rule index is based on Darwin VFS. + [autofit] Introduce two more slots for standard characters. -2010-10-13 suzuki toshiya + This is useful for OpenType features like `c2sc' (caps to small + caps) that don't have lowercase letters by definition, or other + features that mainly operate on numerals. - Prevent to open a FT_Stream for zero-sized file on non-Unix. + * src/autofit/afscript.h: Add more standard characters. - builds/unix/ftsystem.c prevents to open an useless stream from - zero-sized file and returns FT_Err_Cannot_Open_Stream, but the - stream drivers for ANSI C, Amiga and VMS return useless streams. - For cross-platform consistency, all stream drivers should act - same. + * src/autofit/aftypes.h: Update use of `SCRIPT' macro. + (AF_ScriptClassRec): Add members to hold two more standard + characters. + (AF_DEFINE_SCRIPT_CLASS): Updated. - * src/base/ftsystem.c (FT_Stream_Open): If the size of the opened - file is zero, FT_Err_Cannot_Open_Stream is returned. - * builds/amiga/src/base/ftsystem.c (FT_Stream_Open): Ditto. - * src/vms/ftsystem.c (FT_Stream_Open): Ditto. + * src/autofit/afglobal.c, src/autofit/afglobal.h, + * src/autofit/afpic.c, src/autofit/afranges.h, src/autofit/hbshim.c: + Update use of `SCRIPT' macro. -2010-10-12 Werner Lemberg + * src/autofit/afcjk.c (af_cjk_metrics_init_widths), + src/autofit/aflatin.c (af_latin_metrics_init_widths): Scan two more + standard characters. - Fix Savannah bug #31310. +2014-01-24 Werner Lemberg - * src/truetype/ttgxvar.c (ft_var_readpackedpoints): Protect against - invalid `runcnt' values. + Fix Savannah bug #41320. -2010-10-08 Chris Liddell + * src/autofit/aflatin.c (af_latin_metrics_init_blues) + : Avoid negative index of `last'. - Fix Savannah bug #31275. +2014-01-23 Werner Lemberg - * src/sfnt/ttpost.c: Include FT_INTERNAL_DEBUG_H. + Fix Savannah bug #41310. -2010-10-06 Werner Lemberg + * src/sfnt/ttsbit.c (tt_sbit_decoder_load_bitmap) : + Don't check metrics, which this format doesn't have. + This is another correction to the commit from 2013-11-21. - [truetype] Improve error handling of `SHZ' bytecode instruction. - Problem reported by Chris Evans . +2014-01-23 Werner Lemberg - * src/truetype/ttinterp.c (Ins_SHZ): Check `last_point'. + Fix Savannah bug #41309. -2010-10-05 Werner Lemberg + * src/type1/t1load.c (t1_parse_font_matrix): Properly handle result + of `T1_ToFixedArray'. - Fix Savannah bug #31253. - Patch submitted by an anonymous reporter. + * src/cid/cidload.c (cid_parse_font_matrix): Synchronize with + `t1_parse_font_matrix'. - * configure: Use `awk' instead of `sed' to manipulate output of `ls - -id'. + * src/type42/t42parse.c (t42_parse_font_matrix): Synchronize with + `t1_parse_font_matrix'. + (t42_parse_encoding): Synchronize with `t1_parse_encoding'. -2010-10-03 Werner Lemberg + * src/psaux/psobjs.c (ps_parser_load_field) , + : Properly handle result of `ps_tofixedarray'. - * Version 2.4.3 released. - ========================= +2014-01-22 Werner Lemberg + * src/autofit/hbshim.c (af_get_coverage): Fix memory leaks. - Tag sources with `VER-2-4-3'. +2014-01-16 Werner Lemberg - * docs/CHANGES: Updated. + [autofit] Improve tracing of style coverages. - * docs/VERSION.DLL: Update documentation and bump version number to - 2.4.3 + * include/internal/fttrace.h: Add `afglobal' for tracing style + coverages. - * README, Jamfile (RefDoc), - builds/win32/vc2005/freetype.vcproj, builds/win32/vc2005/index.html, - builds/win32/vc2008/freetype.vcproj, builds/win32/vc2008/index.html, - builds/win32/visualc/freetype.dsp, - builds/win32/visualc/freetype.vcproj, - builds/win32/visualc/index.html, builds/win32/visualce/freetype.dsp, - builds/win32/visualce/freetype.vcproj, - builds/win32/visualce/index.html, - builds/wince/vc2005-ce/freetype.vcproj, - builds/wince/vc2005-ce/index.html, - builds/wince/vc2008-ce/freetype.vcproj, - builds/wince/vc2008-ce/index.html: s/2.4.2/2.4.3/, s/242/243/. + * src/autofit/afglobal.c: Include FT_INTERNAL_DEBUG_H. + (FT_COMPONENT): Define. + (af_face_globals_compute_style_coverage): Trace `gstyles' array + data. - * include/freetype/freetype.h (FREETYPE_PATCH): Set to 3. +2014-01-09 Werner Lemberg - * builds/unix/configure.raw (version_info): Set to 12:1:6. + Fix Savannah bug #41158. -2010-10-03 Werner Lemberg + * builds/unix/install.mk (install): Create man page directory. - Avoid `configure' issues with symbolic links. - Based on a patch from Alexander Stohr . +2014-01-08 Chongyu Zhu - * configure: Compare directories using `ls -id'. - Check existence of `reference' subdirectory before creating it. + [arm] Fix Savannah bug #41138, part 2. -2010-10-02 Werner Lemberg + * builds/unix/ftconfig.in (FT_MulFix_arm), include/config/ftconfig.h + (FT_MulFix_arm), src/truetype/ttinterp.c (TT_MulFix14_arm): Fix + preprocessor conditionals for `add.w'. - Fix Savannah bug #31088 (sort of). +2014-01-08 Werner Lemberg - * src/sfnt/ttload.c (tt_face_load_maxp): Always allocate at least 64 - function entries. + [autofit] Fix Savannah bug #41138, part 1. -2010-10-02 Werner Lemberg + * src/tools/afblue.pl : Produce correct auxiliary + enumeration names for generated `#else'. - [smooth] Fix splitting of cubics for negative values. + * src/autofit/afblue.h: Regenerated. - Reported by Róbert Márki ; see - http://lists.gnu.org/archive/html/freetype/2010-09/msg00019.html. +2014-01-06 Werner Lemberg - * src/smooth/ftgrays.c (gray_render_cubic): Fix thinko. + Add manual page for `freetype-config'. + Contributed by Nis Martensen . -2010-10-01 suzuki toshiya + * docs/freetype-config.1: New file. - Fix Savannah bug #31040. + * builds/unix/unix-def.in (mandir): Define. + * builds/unix/install.mk (install, uninstall): Handle manpage. - * src/truetype/ttinterp.c (free_buffer_in_size): Remove. - (TT_RunIns): Updated. +2014-01-05 Werner Lemberg -2010-09-20 suzuki toshiya + [autofit] Minor fixes for `afblue.pl'. - [sfnt] Make error message filling NULL names less verbose. + * src/tools/afblue.pl (aux_name): Don't use `reverse'. + : Use proper indentation for generated `#else'. - * src/sfnt/ttpost.c (load_format_20): Showing 1 summary message - when we fill `post' names by NULL, instead of per-entry message. + * src/autofit/afblue.h: Regenerated. -2010-09-20 Graham Asher - David Bevan +2014-01-04 Werner Lemberg - [smooth] Fix and improve spline flattening. + [autofit] Fix Indic scripts. - This fixes the flattening of cubic, S-shaped curves and speeds up - the handling of both the conic and cubic arcs. + Split the single, incorrect Indic entry into separate scripts so + that the covered ranges are the same: Bengali, Devanagari, Gujarati, + Gurmukhi, Kannada, Limbu, Malayalam, Oriya, Sinhala, Sundanese, + Syloti Nagri, Tamil, Telugu, and Tibetan. At the same time, remove + entries for Meetai Mayak and Sharada – the Unicode ranges were + incorrect (and nobody has complained about that), fonts are scarce + for those scripts, and the Indic auto-hinter support is rudimentary + anyways. - See the discussions on the freetype-devel mailing list in late - August and September 2010 for details. + * src/autofit/afscript.h: Updated, using AF_CONFIG_OPTION_INDIC and + AF_CONFIG_OPTION_CJK. - * src/smooth/ftgrays.c (FT_MAX_CURVE_DEVIATION): New macro. - (TWorker): Remove `conic_level' and `cubic_level' elements. - (gray_render_conic): Simplify algorithm. - (gray_render_cubic): New algorithm; details are given in the code - comments. - (gray_convert_glyph): Remove heuristics. + * src/autofit/afstyles.h (STYLE_DEFAULT_INDIC): New auxiliary macro. + Use it, together with AF_CONFIG_OPTION_INDIC and + AF_CONFIG_OPTION_CJK, to update. -2010-09-19 Werner Lemberg + * src/autofit/afranges.c [AF_CONFIG_OPTION_INDIC]: Updated. + [!AF_CONFIG_OPTION_INDIC, !AF_CONFIG_OPTION_CJK]: Removed. + Sort entries by tags. - Minor fixes. +2014-01-03 Werner Lemberg - * src/cff/cffload.c (cff_charset_compute_cids): `charset->sids[i]' - is `FT_UShort'. - (cff_index_access_element): Don't use additions in comparison. - * src/sfnt/ttpost.c (load_format_20): Make `post_limit' of type - `FT_Long'. - Don't use additions in comparison. - Improve tracing messages. - (load_format_25, load_post_names): Make `post_limit' of type - `FT_Long'. + [autofit] Thinko. -2010-09-19 suzuki toshiya + * src/autofit/hbshim.c (af_get_char_index): Similar to + `af_get_coverage', reject glyphs which are not substituted. - [cff] Truncate the element length at the end of the stream. - See Savannah bug #30975. +2014-01-03 Werner Lemberg - * src/cff/cffload.c (cff_index_access_element): `off2', the offset - to the next element is truncated at the end of the stream to prevent - invalid I/O. As `off1', the offset to the requested element has - been checked by `FT_STREAM_SEEK', `off2' should be checked - similarly. + [autofit] Fix handling of default coverages. -2010-09-19 suzuki toshiya + With this commit, the implementation of coverage handling is + completed. - [cff] Ignore CID > 0xFFFFU. - See Savannah bug #30975. + * src/autofit/hbshim.c (af_get_coverage): Exit early if nothing to + do. + Reject coverages which don't contain appropriate glyphs for blue + zones. - * src/cff/cffload.c (cff_charset_compute_cids): Ignore CID if - greater than 0xFFFFU. CFF font spec does not mention maximum CID in - the font, but PostScript and PDF spec define that maximum CID is - 0xFFFFU. +2014-01-03 Werner Lemberg -2010-09-19 suzuki toshiya + [autofit] Fix handling of default coverages. - [cff] Make trace message in` cff_charset_load' verbose. - See Savannah bug #30975. + * src/autofit/afglobal.c (af_face_globals_compute_style_coverage): + First handle non-default coverages, then the default coverage of the + default script, and finally the other default coverages. - * src/cff/cffload.c (cff_charset_load): Report the original `nleft' - and truncated `nleft'. +2014-01-03 Werner Lemberg -2010-09-19 suzuki toshiya + [autofit] Fix scaling of HarfBuzz shaping. - [cff] Correct `max_cid' from CID array length to max CID. - See Savannah bug #30975. + * src/autofit/hbshim.c (af_get_char_index): Scale to units per EM. - * src/cff/cffload.c (cff_charset_compute_cids): Don't increment - max_cid after detecting max CID. The array CFF_Charset->cids is - allocated by max_cid + 1. - (cff_charset_cid_to_gindex): Permit CID is less than or equal to - CFF_Charset->max_cid. - * src/cff/cffobjs.c (cff_face_init): FT_Face->num_glyphs is - calculated as CFF_Charset->max_cid + 1. +2014-01-03 Werner Lemberg -2010-09-19 suzuki toshiya + [autofit] Better ftgrid support. - [truetype] Sanitize the broken offsets in `loca'. - See Savannah bug #31040. + * src/autofit/afhints.c (af_glyph_hints_get_segment_offset): Add + parameters `is_blue' and `blue_offset'. - * src/truetype/ttpload.c (tt_face_get_location): If `pos1', the - offset to the requested entry in `glyf' exceeds the end of the - table, return offset=0, length=0. If `pos2', the offset to the next - entry in `glyf' exceeds the end of the table, truncate the entry - length at the end of `glyf' table. +2014-01-01 Werner Lemberg -2010-09-19 suzuki toshiya + [autofit] Remove some styles. - [sfnt] Prevent overrunning in `post' table parser. - See Savannah bug #31040. + * src/autofit/afcover.h: Remove coverages for alternative fractions, + denominators, numerators, and fractions. - * src/sfnt/ttpost.c (load_post_names): Get the length of `post' - table and pass the limit of `post' table to `load_format_20' and - `load_format_25'. - (load_format_20): Stop the parsing when we reached at the limit of - `post' table. If more glyph names are required, they are filled by - NULL names. + * src/autofit/afstyles.h (META_STYLE_LATIN): Updated. -2010-09-17 suzuki toshiya +2014-01-01 Werner Lemberg - [truetype] Don't duplicate size->twilight structure to be freed. - See Savannah bug #31040 for detail. + [autofit] Add more styles. - * src/truetype/ttinterp.c (free_buffer_in_size): Don't duplicate - FT_GlyphZoneRec size->twilight to be freed. If duplicated, - `FT_FREE' erases the duplicated pointers only and leave original - pointers. They can cause the double-free crash when the burst - errors occur in TrueType interpreter and `free_buffer_in_size' is - invoked repeatedly. + * src/autofit/afstyles.h (STYLE_LATIN, META_STYLE_LATIN): New + auxiliary macros; use them to define styles for Cyrillic, Greek, and + Latin. -2010-09-15 Werner Lemberg + * src/autofit/afcover.h: Remove coverage for oldstyle figures. + Since those digits are used in combination with ordinary letters, it + makes no sense to handle them separately. - Make bytecode debugging with FontForge work again. + * src/autofit/afglobal.c (af_face_globals_get_metrics): Don't limit + `options' parameter to 4 bits. - * src/truetype/ttinterp.c (TT_RunIns): Don't call - `free_buffer_in_size' in case of error if a debugger is active. +2014-01-01 Werner Lemberg -2010-09-14 Werner Lemberg + [autofit] Fix style assignments to glyphs. - Improve tracing messages. + * src/autofit/hbshim.c (af_get_coverage) + [FT_CONFIG_OPTION_USE_HARFBUZZ]: Scan GPOS coverage of features also + so that we can skip glyphs that have both GSUB and GPOS data. - * src/truetype/ttinterp.c (TT_RunIns): Improve wording of tracing - message. - * src/truetype/ttobjs.c (tt_size_run_fpgm, tt_size_run_prep): Add - tracing message. - * src/truetype/ttgload.c (tt_loader_init): Add tracing message. - * src/cache/ftcsbits.c (ftc_snode_load): Emit tracing message if - glyph doesn't fit into a small bitmap container. +2014-01-01 Werner Lemberg -2010-09-13 Werner Lemberg + * src/autofit/hbshim.c: s/{lookups,glyphs}/gsub_{lookups,glyphs}/. - Fix minor issues reported by . +2014-01-01 Werner Lemberg - * src/autofit/aflatin.c (af_latin_compute_stem_width): Remove - redundant conditional check. - * src/base/ftsynth.c (FT_GlyphSlot_Embolden): Ditto. - * src/cff/cffload.c (cff_encoding_load): Remove conditional check - which always evaluates to `true'. - * src/pshinter/pshalgo.c (ps_glyph_interpolate_strong_points): - Ditto. - * src/truetype/ttinterp.c (Ins_IUP): Ditto. - * src/cid/cidgload.c (cid_slot_load_glyph): Don't check for NULL if - value is already dereferenced. - * src/winfonts/winfnt.c (FNT_Load_Glyph): Fix check of `face'. + [autofit] Implement and use `af_get_char_index' with HarfBuzz. -2010-08-31 suzuki toshiya + * src/autofit/hbshim.c (COVERAGE) [FT_CONFIG_OPTION_USE_HARFBUZZ]: + Redefine to construct HarfBuzz features. + (af_get_char_index) [FT_CONFIG_OPTION_USE_HARFBUZZ]: Rewritten. - Ignore the environmental setting of LIBTOOL. - Patch is suggested by Adrian Bunk, to prevent unexpected - reflection of environmental LIBTOOL. See: - http://savannah.nongnu.org/patch/?7290 + * src/autofit/aflatin.c (af_latin_metrics_init_blues): Use + `y_offset' to adjust `best_y'. - * builds/unix/unix-cc.in: LIBTOOL is unconditionally set to - $(FT_LIBTOOL_DIR)/libtool. FT_LIBTOOL_DIR is set to $(BUILD_DIR) - by default. - * configure: When configured for the building out of source tee, - FT_LIBTOOL_DIR is set to $(OBJ_DIR). +2013-12-31 Werner Lemberg -2010-08-31 suzuki toshiya + [autofit] s/AF_STYLE_...._DEFAULT/AF_STYLE_...._DFLT/i. - [truetype] Decrease the trace level catching the interpreter error. +2013-12-31 Werner Lemberg - * src/truetype/ttinterp.c (TT_RunIns): Decrease the trace level - showing the error when the interpreter returns with an error, - from` FT_TRACE7' to `FT_TRACE1'. + [autofit] Fix interface of `af_get_char_index'. -2010-08-30 suzuki toshiya + * src/autofit/hbshim.c (af_get_char_index): Return error value. + Add argument for y offset (to be used in a yet-to-come patch). - [truetype] Prevent bytecode reuse after the interpretation error. + * src/autofit/hbshim.h, src/autofit/afcjk.c, + src/autofit/aflatin.c: Updated. - * src/truetype/ttinterp.c (free_buffer_in_size): New function to - free the buffer allocated during the interpretation of this glyph. - (TT_RunIns): Unset FT_Face->size->{cvt_ready,bytecode_ready} if - an error occurs in the bytecode interpretation. The interpretation - of invalid bytecode may break the function definitions and referring - them in later interpretation is danger. By unsetting these flags, - `fpgm' and `prep' tables are executed again in next interpretation. +2013-12-30 Werner Lemberg - This fixes Savannah bug #30798, reported by Robert Święcki. + [autofit] Don't combine multiple features into one set. -2010-08-29 Werner Lemberg + Combining them, as originally envisioned, would lead to much more + complicated code, as investigations have shown meanwhile. The major + drawback is that we run out of available style slots much earlier. + However, this is only a theoretical issue since we don't support a + large number of scripts currently. - [ftraster] Pacify compiler. + * src/autofit/afcover.h: Replace `COVERAGE_{1,2,3}' macros with + a single-element `COVERAGE' macro, sort the elements by the feature + tags, and add entry for `ruby'. - * src/raster/ftraster.c (ft_black_new) [_STANDALONE_]: `memory' is - not used. + * src/autofit/aftypes.h: Updated. + * src/autofit/hbshim.c: Updated. -2010-08-29 Werner Lemberg +2013-12-28 Werner Lemberg - [cff] Allow SIDs >= 65000. + [autofit] Code shuffling to reduce use of cpp macros. - * src/cff/cffload.c (cff_charset_load): Fix change from 2009-03-20: - The threshold for SIDs is not applicable here. I misinterpreted the - `SID values 65000 and above are available for implementation use' - sentence in the CFF specification. + * src/autofit/afglobal.c (af_face_globals_compute_style_coverage): + Call `af_get_coverage' unconditionally. - Problem reported by Ivan Ninčić . + * src/autofit/autofit.c: Include `hbshim.c' unconditionally. -2010-08-28 suzuki toshiya + * src/autofit/hbshim.c (af_get_coverage) + [!FT_CONFIG_OPTION_USE_HARFBUZZ]: Provide dummy function. - Force hinting when the font lacks its familyname. + * src/autofit/hbshim.h: Provide function declarations + unconditionally. - In Type42 or Type11 font embedded in PostScript & PDF, TrueType sfnt - stream may lack `name' table because they are not required. Hinting - for nameless fonts is safer for PDFs including embedded Chinese - fonts. Written by David Bevan, see: +2013-12-28 Werner Lemberg - http://lists.gnu.org/archive/html/freetype-devel/2010-08/msg00021.html - http://lists.freedesktop.org/archives/poppler/2010-August/006310.html + [autofit] Add wrapper function for `FT_Get_Char_Index'. - * src/truetype/ttobjs.c (tt_check_trickyness): If a NULL pointer by - nameless font is given, TRUE is returned to enable hinting. + Yet-to-come changes will provide HarfBuzz functionality for the new + function. -2010-08-28 suzuki toshiya + * src/autofit/hbshim.c (af_get_char_index): New function. + * src/autofit/hbshim.h: Updated. - Register yet another tricky TrueType font. + * src/autofit/afcjk.c (af_cjk_metrics_init_widths, + af_cjk_metrics_init_blues, af_cjk_metrics_check_digits): Updated. - * src/truetype/ttobjs.c (tt_check_trickyness): Add `HuaTianKaiTi?', - a Kaishu typeface paired with `HuaTianSongTi?' by Huatian - Information Industry. + * src/autofit/aflatin.c (af_latin_metrics_init_widths, + af_latin_metrics_init_blues, af_latin_metrics_check_digits): + Updated. -2010-08-17 Teijo Kinnunen +2013-12-28 Werner Lemberg - Fix Savannah bug #30788. + [autofit] Use `global' HarfBuzz font object. - * src/cache/ftccache.c (FTC_Cache_Clear): Check `cache->buckets' for - NULL too. + We now use `hb_font' instead of `hb_face' since yet-to-come changes + need this. -2010-08-10 Werner Lemberg + * src/autofit/afglobal.h: Include `hbshim.h'. + (AF_FaceGlobalsRec) [FT_CONFIG_OPTION_USE_HARFBUZZ]: New member + `hb_font'. - Try to fix Savannah bug #30717 (and probably #30719 too). + * src/autofit/afglobal.c (af_face_globals_new) + [FT_CONFIG_OPTION_USE_HARFBUZZ]: Create `hb_font'. + (af_face_globals_free) [FT_CONFIG_OPTION_USE_HARFBUZZ]: Destroy + `hb_font'. - * src/smooth/ftsmooth.c (ft_smooth_render_generic): Add another - overflow test for `width' and `height'. + * src/autofit/hbshim.h: Include HarfBuzz headers. -2010-08-06 Werner Lemberg + * src/autofit/hbshim.c: Include `hbshim.h' instead of HarfBuzz + headers. + (af_get_coverage): Updated. - * Version 2.4.2 released. - ========================= +2013-12-27 Werner Lemberg + [autofit] Handle `DFLT' OpenType script for coverages. - Tag sources with `VER-2-4-2'. + * include/ftautoh.h: Document new `default-script' property. - * docs/CHANGES: Updated. + * src/autofit/hbshim.c (af_get_coverage): Use `AF_FaceGlobals' for + type of first parameter. + (script_tags): Add one more element. + (af_get_coverage): Adjust `script_tags' to handle `DFLT' script tag. - * docs/VERSION.DLL: Update documentation and bump version number to - 2.4.2 + * src/autofit/hbshim.h: Updated. - * README, Jamfile (RefDoc), - builds/win32/vc2005/freetype.vcproj, builds/win32/vc2005/index.html, - builds/win32/vc2008/freetype.vcproj, builds/win32/vc2008/index.html, - builds/win32/visualc/freetype.dsp, - builds/win32/visualc/freetype.vcproj, - builds/win32/visualc/index.html, builds/win32/visualce/freetype.dsp, - builds/win32/visualce/freetype.vcproj, - builds/win32/visualce/index.html, - builds/wince/vc2005-ce/freetype.vcproj, - builds/wince/vc2005-ce/index.html, - builds/wince/vc2008-ce/freetype.vcproj, - builds/wince/vc2008-ce/index.html: s/2.4.1/2.4.2/, s/241/242/. + * src/autofit/afglobal.c (af_face_globals_compute_style_coverage): + Updated. - * include/freetype/freetype.h (FREETYPE_PATCH): Set to 2. + * src/autofit/afglobal.h (AF_SCRIPT_DEFAULT): New macro. - * builds/unix/configure.raw (version_info): Set to 12:0:6. + * src/autofit/afmodule.h (AF_ModuleRec): New `default_script' + member. -2010-08-06 suzuki toshiya + * src/autofit/afmodule.c (af_property_set, af_property_get): Handle + `default-script' property. + (af_autofitter_init): Updated. - Fix Savannah bug #30648. +2013-12-27 suzuki toshiya - * src/base/ftobjs.c (FT_Done_Library): Specify the order of font - drivers during the face closing process. Type42 faces should be - closed before TrueType faces, because a Type42 face refers to - another internal TrueType face which is created from sfnt[] array on - the memory. + [ftrfork] Fix the face order difference between POSIX and Carbon. -2010-08-06 Yuriy Kaminskiy + The fragmented resources in Suitcase and .dfont should be reordered + when `POST' resource for Type1 is being restored, but reordering of + sfnt resources induces the different face order. Now the ordering + is restricted to `POST' resource only, to prevent the different + order issue (e.g. the face index in the fontconfig cache generated + with Carbon framework is incompatible with that by FreeType 2 + without Carbon framework.) Found by Khaled Hosny and Hin-Tak Leung. - [raster] Fix valgrind warning. + http://lists.gnu.org/archive/html/freetype-devel/2013-02/msg00035.html + http://lists.gnu.org/archive/html/freetype-devel/2013-12/msg00027.html - * src/raster/ftraster.c (Decompose_Curve) : Access point[0] - only if we don't hit `limit'. + * src/base/ftrfork.c (FT_Raccess_Get_DataOffsets): Add a switch + `sort_by_res_id' to control the fragmented resource ordering. + * include/internal/ftrfork.h: Declare new switch. + * src/base/ftobjs.c (IsMacResource): Enable the sorting for `POST' + resource, and disable the sorting for `sfnt' resource. -2010-08-06 suzuki toshiya +2013-12-25 Werner Lemberg - Fix Savannah bug #30658. + Fix Savannah bug #40997. - * src/base/ftobjs.c (Mac_Read_POST_Resource): Check that the total - length of collected POST segments does not overrun the allocated - buffer. + * src/bdf/bdfdrivr.c (BDF_Face_Init): Only use OR operator to + adjust face flags since FT_FACE_FLAG_EXTERNAL_STREAM might already + be set. + * src/cff/cffobjs.c (cff_face_init): Ditto. + * src/cid/cidobjs.c (cid_face_init): Ditto. + * src/pcf/pcfread.c (pcf_load_font): Ditto. + * src/pfr/pfrobjs.c (pfr_face_init): Ditto. + * src/type1/t1objs.c (T1_Face_Init): Ditto. + * src/type42/t42objs.c (T42_Face_Init): Ditto. + * src/winfonts/winfnt.c (FNT_Face_Init): Ditto. -2010-08-06 Yuriy Kaminskiy +2013-12-21 Werner Lemberg - Fix conditional usage of FT_MulFix_i386. - With -ansi flag, gcc does not define `i386', only `__i386__'. + [autofit] Introduce `coverages'. - * include/freetype/config/ftconfig.h, builds/unix/ftconfig.in: - s/i386/__i386__/. + Coverages are the interface to the HarfBuzz library to acces + OpenType features for handling glyphs not addressable by the cmap. -2010-08-05 Werner Lemberg + Right now, compilation of HarfBuzz is only added to the development + build. A solution for standard build mode will be delayed until + HarfBuzz gets split into two libraries to avoid mutual dependencies + between FreeType and HarfBuzz. - Fix Savannah bug #30657. + Note that this is only a first step in handling coverages, basically + providing the framework only. Code for handling selected OpenType + features (this is, actually using the data in `afcover.h') will + follow. - * src/truetype/ttinterp.c (BOUNDSL): New macro. - Change `BOUNDS' to `BOUNDSL' where appropriate. + * devel/ftoption.h, include/config/ftoption.h + (FT_CONFIG_OPTION_USE_HARFBUZZ): New macro. - * src/truetype/ttinterp.h (TT_ExecContextRec): Fix type of - `cvtSize'. + * src/autofit/hbshim.c, src/autofit/hbshim.h, src/autofit/afcover.h: + New files. -2010-08-05 Werner Lemberg + * src/autofit/afscript.h: Add HarfBuzz script name tags. - Fix Savannah bug #30656. + * src/autofit/afstyles.h: Add default coverage enumeration values. - * src/type42/t42parse.c (t42_parse_sfnts): Protect against negative - string_size. - Fix comparison. + * src/autofit/aftypes.h: Update use of `SCRIPT' and `STYLE' macros. + (AF_Coverage): New enumeration (generated by `afcover.h'). + (AF_StyleClassRec): New member `coverage'. + (AF_DEFINE_STYLE_CLASS): Updated. -2010-08-05 suzuki toshiya + * include/internal/fttrace.h: Add `afharfbuzz' for tracing coverage + data. - [cff] Don't use any values in decoder after parsing error. + * src/autofit/afglobal.h: Update use of `SCRIPT' and `STYLE' macros. + (AF_SCRIPT_FALLBACK): Renamed to ... + (AF_STYLE_FALLBACK): ... this. - * src/cff/cffgload.c (cff_slot_load): Skip the evaluations - of the values in decoder, if `cff_decoder_parse_charstrings' - returns any error. + * src/autofit/afglobal.c: Include `hbshim.c'. + Update use of `SCRIPT' and `STYLE' macros. + (af_face_globals_compute_style_coverage) + [FT_CONFIG_OPTION_USE_HARFBUZZ]: Call `af_get_coverage'. + Update. -2010-08-04 Werner Lemberg + * src/autofit/afmodule.h (AF_ModuleRec): + s/fallback_script/fallback_style/. - Fix Savannah bug #30644. + * src/autofit/afmodule.c (af_property_set): Adapt handling of + `fallback-script' property to set a fallback style. + (af_property_get, af_autofitter_init): Updated. - * src/base/ftstream.c (FT_Stream_EnterFrame): Fix comparison. + * src/autofit/afpic.c: Update use of `SCRIPT' and `STYLE' macros. -2010-08-04 Werner Lemberg + * src/autofit/afranges.h: Update use of `SCRIPT' macro. - `make devel' fails if FT_CONFIG_OPTION_OLD_INTERNALS is set. + * src/autofit/autofit.c [FT_CONFIG_OPTION_USE_HARFBUZZ]: Include + `hbshim.c'. - * devel/ftoption.h: Synchronize with - include/freetype/config/ftoption.h. + * src/autofit/rules.mk (AUTOF_DRV_SRC): Add `hbshim.c'. + (AUTOF_DRV_H): Add `afcover.h'. -2010-08-04 suzuki toshiya + * builds/freetype.mk (INCLUDE_FLAGS) [DEVEL_DIR]: Use pkg-config for + all libraries needed by FreeType. - [cff] Improve stack overflow test. +2013-12-21 Werner Lemberg - * src/cff/cffgload.c (cff_decoder_parse_charstrings): Check stack - after execution of operations too. + Fix Savannah bug #40975 (sort of). -2010-07-18 Werner Lemberg + * src/truetype/ttinterp.c (Ins_IP): Fix sign typo to make FreeType + behave the same as the Windows TrueType engine for the invalid case. - Add reference counters and to FT_Library and FT_Face objects. +2013-12-21 Werner Lemberg - * include/freetype/freetype.h (FT_Reference_Face): New function. - * include/freetype/ftmodapi.h (FT_Rererence_Library): New function. + [autofit] Make PIC mode work actually. - * include/freetype/internal/ftobjs.h (FT_Face_InternalRec, - FT_LibraryRec): New field `refcount'. + * src/autofit/afpic.h (AFModulePIC): Fix array sizes to fit the + enumeration values automatically generated by including `afscript.h' + and friends. - * src/base/ftobjs.c (FT_Open_Face, FT_New_Library): Handle - `refcount'. - (FT_Reference_Face, FT_Reference_Library): Implement new functions. - (FT_Done_Face, FT_Done_Library): Handle `refcount'. + * src/autofit/afpic.c (autofit_module_class_pic_init): Updated. - * docs/CHANGES: Updated. +2013-12-21 Werner Lemberg -2010-07-18 Werner Lemberg + Fix PIC linking. - * Version 2.4.1 released. - ========================= + * include/internal/ftrfork.h (CONST_FT_RFORK_RULE_ARRAY_BEGIN): Fix + generated function name. + * src/base/basepic.c (FT_Init_Table_raccess_guess_table): Rename + to ... + (FT_Init_Table_ft_raccess_guess_table): ... this so that the + function name correctly corresponds to what the macro framework + expects. - Tag sources with `VER-2-4-1'. + * src/psnames/rules.mk (PSNAMES_DRV_SRC_S): Use correct file name so + that PIC functions are compiled also. - * docs/CHANGES: Updated. +2013-12-21 Werner Lemberg - * docs/VERSION.DLL: Update documentation and bump version number to - 2.4.1. + [base] Add missing dependencies to Makefile. - * README, Jamfile (RefDoc), - builds/win32/vc2005/freetype.vcproj, builds/win32/vc2005/index.html, - builds/win32/vc2008/freetype.vcproj, builds/win32/vc2008/index.html, - builds/win32/visualc/freetype.dsp, - builds/win32/visualc/freetype.vcproj, - builds/win32/visualc/index.html, builds/win32/visualce/freetype.dsp, - builds/win32/visualce/freetype.vcproj, - builds/win32/visualce/index.html, - builds/wince/vc2005-ce/freetype.vcproj, - builds/wince/vc2005-ce/index.html, - builds/wince/vc2008-ce/freetype.vcproj, - builds/wince/vc2008-ce/index.html: s/2.4.0/2.4.1/, s/240/241/. + * src/base/rules.mk (BASE_SRC): Add `basepic.c' and `ftpic.c'. + (BASE_H): Add `basepic.h'. - * include/freetype/freetype.h (FREETYPE_PATCH): Set to 1. +2013-12-20 Werner Lemberg - * builds/unix/configure.raw (version_info): Set to 11:1:5. + [autofit] Fix PIC compilation. -2010-07-17 Werner Lemberg + * src/autofit/afcjk.c (af_cjk_metrics_init_widths), + src/autofit/aflatin.c (af_latin_metrics_init_widths) + [FT_CONFIG_OPTION_PIC]: Declare `globals'. - [cff] Final try to fix `hintmask' and `cntrmask' limit check. + * src/autofit/afglobal.c: Always call AF_DEFINE_SCRIPT_CLASS, and + AF_DEFINE_STYLE_CLASS. - Problem reported by Tobias Wolf . + * src/autofit/afpic.c: Include `afglobal.h'. + (autofit_module_class_pic_init): Typo. - * src/cff/cffgload.c (cff_decoder_parse_charstrings) - : Sigh. I'm apparently too silly to fix this - correctly in less than three tries. + * src/autofit/aftypes.h (AF_DEFINE_SCRIPT_CLASS, + AF_DEFINE_STYLE_CLASS): Don't use the same identifier for macro + parameter and structure member. -2010-07-12 Werner Lemberg +2013-12-20 Werner Lemberg - * Version 2.4.0 released. - ========================= + [autofit] Introduce `styles'. + This is the new top-level structure for handling glyph input data; + scripts are now defined separately. - Tag sources with `VER-2-4-0'. + * src/autofit/aftypes.h (SCRIPT): Updated. + (AF_ScriptClassRec): Move `blue_stringset' and `writing_system' + members to ... + (AF_Style_ClassRec): ... this new structure. + (AF_Style): New enumeration. + (AF_StyleMetricsRec): Replace `script' enumeration with + `style_class' pointer. + (AF_DEFINE_SCRIPT_CLASS, AF_DECLARE_SCRIPT_CLASS): Updated. + (AF_DEFINE_STYLE_CLASS, AF_DECLARE_STYLE_CLASS): New macros. - * docs/CHANGES: Updated. + * src/autofit/afstyles.h: New file, using data from `afscript.h'. + * src/autofit/afscript.h: Updated. - * docs/VERSION.DLL: Update documentation and bump version number to - 2.4.0. + * src/autofit/afcjk.c (af_cjk_metrics_init_widths, + af_cjk_metrics_init_blues, af_cjk_hint_edges): Updated. - * README, Jamfile (RefDoc), - builds/win32/vc2005/freetype.vcproj, builds/win32/vc2005/index.html, - builds/win32/vc2008/freetype.vcproj, builds/win32/vc2008/index.html, - builds/win32/visualc/freetype.dsp, - builds/win32/visualc/freetype.vcproj, - builds/win32/visualc/index.html, builds/win32/visualce/freetype.dsp, - builds/win32/visualce/freetype.vcproj, - builds/win32/visualce/index.html, - builds/wince/vc2005-ce/freetype.vcproj, - builds/wince/vc2005-ce/index.html, - builds/wince/vc2008-ce/freetype.vcproj, - builds/wince/vc2008-ce/index.html: s/2.3.12/2.4.0/, s/2312/240/. + * src/autofit/afglobal.c (SCRIPT): Updated. + (STYLE): Redefine macro to load `afstyles.h'. + (af_script_names) [FT_DEBUG_LEVEL_TRACE]: Replace with... + (af_style_names): ... this array. + (af_face_globals_compute_script_coverage): Renamed to... + (af_face_globals_compute_style_coverage): ... this. + Updated. + (af_face_globals_new, af_face_globals_free, + af_face_globals_get_metrics): Updated. - * include/freetype/freetype.h (FREETYPE_MINOR): Set to 4. - (FREETYPE_PATCH): Set to 0. + * src/autofit/afglobal.h (SCRIPT): Updated. + (STYLE): Redefine macro to load `afstyles.h'. + (AF_SCRIPT_FALLBACK): Update definition. This will get more + refinements with later on. + (AF_SCRIPT_UNASSIGNED): Replace with... + (AF_STYLE_UNASSIGNED): ... this macro. + (AF_FaceGlobalsRec): Updated. - * builds/unix/configure.raw (version_info): Set to 11:0:5. + * src/autofit/aflatin.c (af_latin_metrics_init_widths, + af_latin_metrics_init_blues, af_latin_metrics_scale_dim, + af_latin_hint_edges): Updated. -2010-07-12 Werner Lemberg + * src/autofit/aflatin2.c (af_latin2_metrics_init_widths): Updated. + (af_ltn2_uniranges): Removed. - Remove C++ warnings. + * src/autofit/afloader.c (af_loader_load_g, af_loader_load_glyph): + Updated. - */*: Initialize pointers where necessary to make g++ happy. + * src/autofit/afpic.c (autofit_module_class_pic_init): Updated. + * src/autofit/afpic.h (AF_STYLE_CLASSES_GET): New macro. + (AFModulePIC): Add `af_style_classes' and `af_style_classes_rec' + members. -2010-07-12 malc - Richard Henderson + * src/autofit/afranges.h: Updated. - Fix type-punning issues with C++. + * src/autofit/rules.mk (AUTOF_DRV_H): Add `afstyles.h'. - * include/freetype/internal/ftmemory.h (FT_ASSIGNP) [__cplusplus]: - Emulate a `typeof' operator with an inline template which uses - `static_cast'. +2013-12-19 Werner Lemberg -2010-07-11 Werner Lemberg + [autofit] Factor scripts and uniranges out of writing system files. - Fix C++ compilation issue. + * src/autofit/afranges.c, src/autofit/afranges.h: New files. - * src/tools/apinames.c (names_dump) : Fix - type of `dot' variable. + * src/autofit/afscript.h: Extend `SCRIPT' macro with more + parameters, taking data from the writing system files. -2010-07-10 suzuki toshiya + * src/autofit/aftypes.h: Updated. - Fix another case reported in Savannah bug #30373. - Permit a face for Type1, Type42 and CFF without charmap, - patch by Tor Andersson. + * src/autofit/afglobal.c: Include `afranges.h'. + Load `afscript.h' to call AF_DEFINE_SCRIPT_CLASS. + * src/autofit/afglobal.c: Include `afranges.h'. + Load `afscript.h' to call AF_DECLARE_SCRIPT_CLASS. - * src/type1/t1objs.c (T1_Face_Init): Reset the error if it - is FT_Err_No_Unicode_Glyph_Name. - * src/type42/t42objs.c (T42_Face_Init): Ditto. - * src/cff/cffobjs.c (cff_face_init): Ditto. + * src/autofit/afcjk.c, src/autofit/afcjk.h: Updated. + * src/autofit/afdummy.c, src/autofit/afdummy.h: Updated. + * src/autofit/afindic.c, src/autofit/afindic.h: Updated. + * src/autofit/aflatin.c, src/autofit/aflatin.h: Updated. + * src/autofit/aflatn2.c, src/autofit/aflatn2.h: Updated. -2010-07-09 suzuki toshiya + * src/autofit/afpic.c: Updated. - Use defined macros to set {platform,encoding}_id. + * src/autofir/autofit.c: Include `afranges.c'. + * src/autofit/rules.mk (AUTOF_DRV_SRC): Add `afranges.c'. - * src/bdf/bdfdrivr.c: Include ttnameid.h and use macros to - set charmap.{platfom,encoding}_id. - * src/pcf/pcfdrivr.c: Ditto. - * src/winfonts/winfnt.c: Ditto. - * src/type1/t1objs.c: Ditto. - * src/type42/t42objs.c: Ditto. - * src/cff/cffobjs.c: Ditto. - * src/pfr/pfrobjs.c: Ditto. +2013-12-18 Werner Lemberg -2010-07-09 suzuki toshiya + [autofit] More code orthogonality. - Fix Savannah bug #30373. - Too serious check of errors by `FT_CMap_New' since 2010-07-04 - is fixed. Reported by Tor Andersson. + * src/autofit/aftypes.h (AF_StyleMetrics): Replace `script_class' + pointer to an `AF_ScriptClass' structure with `script' index of type + `AF_Script'. + Move some code around. - * include/freetype/fterrdef.h - (PSnames_Err_No_Unicode_Glyph_Name): New error code to - indicate the Unicode charmap synthesis failed because - no Unicode glyph name is found. + * src/autofit/afcjk.c: Include `afpic.h'. + (af_cjk_metrics_init_widths, af_cjk_metrics_init_blues, + af_cjk_hint_edges): Updated. - * src/psnames/psmodule.c (ps_unicodes_init): Return - PSnames_Err_No_Unicode_Glyph_Name when no Unicode glyph name - is found in the font. - * src/cff/cffcmap.c (cff_cmap_unicode_init): Return - CFF_Err_No_Unicode_Glyph_Name when no SID is available. + * src/autofit/aflatin.c: Include `afpic.h'. + (af_latin_metrics_init_widths, af_latin_metrics_init_blues, + af_latin_metrics_scale_dim, af_latin_hint_edges): Updated. - * src/type1/t1objs.c (T1_Face_Init): Proceed if `FT_CMap_New' - is failed by the lack of Unicode glyph name. - * src/type42/t42objs.c (T42_Face_Init): Ditto. - * src/cff/cffobjs.c (cff_face_init): Ditto. + * src/autofit/afglobal.c (af_face_globals_get_metrics): Updated. -2010-07-09 Ken Sharp + * src/autofit/afloader.c (af_loader_load_g, af_loader_load_glyph): + Updated. - Make ftraster.c compile in stand-alone mode with MSVC compiler. +2013-12-18 Werner Lemberg - * src/raster/ftmisc.h (FT_Int64) [_WIN32, _WIN64]: Fix typedef - since there is no `inttypes.h' for MSVC. + [autofit] s/ScriptMetrics/StyleMetrics/. -2010-07-08 Werner Lemberg +2013-12-18 Werner Lemberg - Fix Savannah bug #30361. + [autofit] s/script_{metrics,hints}/style_{metrics,hints}/ - * src/truetype/ttinterp.c (Ins_IUP): Fix bounds check. +2013-12-18 Werner Lemberg -2010-07-06 Werner Lemberg + [autofit] s/gscripts/gstyles/. - Pacify compiler. +2013-12-18 Werner Lemberg - * src/cff/cffload.c (cff_index_get_pointers): Initialize - `new_bytes'. + [autofit] s/glyph_scripts/glyph_styles/. -2010-07-05 Eugene A. Shatokhin + This is the first commit of a series to create a new top-level + structure (a `style') for handling scripts, writing_systems, and + soon-to-be-added coverages. - Fix Savannah bug #27648. +2013-12-17 Werner Lemberg - * src/base/ftobjs.c (ft_remove_renderer, FT_Add_Module): Call - `raster_done' only if we have an outline glyph format. + [autofit] s/AF_Script_/AF_WritingSystem_/ where appropriate. -2010-07-05 Werner Lemberg +2013-12-11 Infinality - Fix Savannah bug #30030. + [truetype] Simplify logic of rendering modes. - * builds/win32/*/freetype.vcproj: Add ftxf86.c. + This patch unifies the subpixel and non-subpixel cases. -2010-07-05 Werner Lemberg + * src/truetype/ttinterp.h (TT_ExecContextRec): Remove + `grayscale_hinting'; all code should refer to `grayscale' instead. + Remove unused `native_hinting' member. + Rename `subpixel_hinting' member to `subpixel. - [cff] Next try to fix `hintmask' and `cntrmask' limit check. + * src/truetype/ttgload.c (TT_LOADER_SET_PP): Updated. + (tt_loader_init): Updated. - Problem reported by malc . + * src/truetype/ttinterp.c (Ins_GETINFO): Simplify. + Updated. - * src/cff/cffgload.c (cff_decoder_parse_charstrings) - : It is possible that there is just a single byte - after the `hintmask' or `cntrmask', e.g., a `return' instruction. +2013-12-11 Werner Lemberg -2010-07-04 suzuki toshiya + [documentation] Add section how to include FreeType header files. + Problem reported by David Kastrup . - Restrict the number of the charmaps in a rogue-compatible mode. - Fix for Savannah bug #30059. + Surprisingly, a description how to do that was completely missing in + the API reference. - * src/cache/ftccmap.c (FTC_CMapCache_Lookup): Replace `16' the - minimum character code passed by a legacy rogue client by... - * include/freetype/config/ftoption.h (FT_MAX_CHARMAP_CACHEABLE): - This. It is undefined when FT_CONFIG_OPTION_OLD_INTERNALS is - undefined (thus the rogue client compatibility is not required). + * include/freetype.h, include/ftchapters.h: New documentation + section `header_inclusion'. - * src/cff/cffobjs.c (cff_face_init): Abort the automatic - selection or synthesis of Unicode cmap subtable when the charmap - index exceeds FT_MAX_CHARMAP_CACHEABLE. - * src/sfnt/ttcmap.c (tt_face_build_cmaps): Issue error message - when the charmap index exceeds FT_MAX_CHARMAP_CACHEABLE. +2013-12-10 Werner Lemberg - * src/base/ftobjs.c (find_unicode_charmap): When Unicode charmap - is found after FT_MAX_CHARMAP_CACHEABLE, ignore it and search - earlier one. - (find_variant_selector_charmap): When UVS charmap is found after - FT_MAX_CHARMAP_CACHEABLE, ignore it and search earlier one. - (FT_Select_Charmap): When a charmap matching with requested - encoding but after FT_MAX_CHARMAP_CACHEABLE, ignore and search - earlier one. - (FT_Set_Charmap): When a charmap matching with requested - charmap but after FT_MAX_CHARMAP_CACHEABLE, ignore and search - earlier one. - (FT_Get_Charmap_Index): When a requested charmap is found - after FT_MAX_CHARMAP_CACHEABLE, return the inverted charmap - index. + [autofit] s/DFLT/NONE/, s/dflt/none/. -2010-07-04 Werner Lemberg +2013-12-10 Werner Lemberg - TrueType hinting is no longer patented. + [autofit] s/AF_SCRIPT_NONE/AF_SCRIPT_UNASSIGNED/. - * include/freetype/config/ftoption.h, devel/ftoption.h - (TT_CONFIG_OPTION_BYTECODE_INTERPRETER): Define. - (TT_CONFIG_OPTION_UNPATENTED_HINTING): Undefine. +2013-12-10 Werner Lemberg - * docs/CHANGES, docs/INSTALL, include/freetype/freetype.h: Updated. - * docs/TRUETYPE, docs/PATENTS: Removed. + [truetype] Fix scaling of vertical phantom points. -2010-07-04 suzuki toshiya + * src/truetype/ttgload.c (load_truetype_glyph): Scale pp3.x and + pp4.x also. - Check error value by `FT_CMap_New'. +2013-12-10 Werner Lemberg - * src/cff/cffobjs.c (cff_face_init): Check error value by - `FT_CMap_New'. - * src/pfr/pfrobjs.c (pfr_face_init): Ditto. - * src/type1/t1jobjs.c (T1_Face_Init): Ditto. - * src/type42/t42jobjs.c (T42_Face_Init): Ditto. + [truetype] Fix positioning of composite glyphs. + Problem reported by Nigel Tao . -2010-07-03 Werner Lemberg + * src/truetype/ttgload.c (TT_Hint_Glyph): Remove code that shifts + the glyph (component) by a fractional value computed from the LSB + phantom point. This is wrong, since the horizontal phantom points + get rounded horizontally later on. - Make ftgrays.c compile stand-alone again. +2013-12-08 Werner Lemberg - * src/smooth/ftgrays.c [_STANDALONE_]: Include `stddef.h'. - (FT_INT_MAX, FT_PtrDist)[_STANDALONE_]: Define. + * Version 2.5.2 released. + ========================= -2010-07-02 suzuki toshiya - Additional fix for Savannah bug #30306. + Tag sources with `VER-2-5-2'. - * src/base/ftobjs.c (Mac_Read_POST_Resource): If the type of the - POST fragment is 0, the segment is completely ignored. The declared - length of the segment is not cared at all. According to Adobe - Technical Note 5040, type 0 segment is a comment only and should not - be loaded for the interpreter. Reported by Robert Święcki. + * docs/VERSION.DLL: Update documentation and bump version number to + 2.5.2. + + * 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.5.1/2.5.2/, s/251/252/. -2010-07-01 Werner Lemberg + * include/freetype/freetype.h (FREETYPE_PATCH): Set to 2. - [truetype] Protect against code range underflow. + * builds/unix/configure.raw (version_info): Set to 17:1:11. + * CMakeLists.txt (VERSION_PATCH): Set to 2. + * docs/CHANGES: Updated. - * src/truetype/ttinterp.c (DO_JROT, DO_JMPR, DO_JROF): Don't allow - negative IP values. +2013-12-07 Werner Lemberg -2010-07-01 Werner Lemberg + [truetype] Next round in phantom point handling. - [truetype] Add rudimentary tracing for bytecode instructions. + Greg Hitchcock provided very interesting insights into the + complicated history of the horizontal positions of the TSB and BSB + phantom points. - * src/truetype/ttinterp.c (opcode_name) [FT_DEBUG_LEVEL_TRACE]: New - array. - (TT_RunIns): Trace opcodes. + * src/truetype/ttgload.c (TT_LOADER_SET_PP) + [TT_CONFIG_OPTION_SUBPIXEL_HINTING]: Use `subpixel_hinting' and + `grayscale_hinting' flags as conditionals for the x position of TSB + and BSB. -2010-06-30 Werner Lemberg +2013-12-05 Werner Lemberg - Fix Savannah bug #30263. + * builds/freetype.mk (FT_CC): Removed. Unused. - * src/smooth/ftgrays.c (gray_render_span): Use cast to `unsigned - int' to avoid integer overflow. +2013-12-04 Werner Lemberg - * src/smooth/ftsmooth.c (ft_smooth_render_generic): Use smaller - threshold values for `width' and `height'. This is not directly - related to the bug fix but makes sense anyway. + [sfnt] Fix handling of embedded bitmap strikes. -2010-07-01 suzuki toshiya + This corrects the commit from 2013-11-21. Problem reported by + Andrey Panov . - Initial fix for Savannah bug #30306. + * src/sfnt/ttsbit.c (tt_sbit_decoder_load_bitmap): Fix logic to + detect excessive bytes for bit-aligned bitmaps. - * src/base/ftobjs.c (Mac_Read_POST_Resource): Check `rlen', the - length of fragment declared in the POST fragment header, and prevent - an underflow in length calculation. Some fonts set the length to - zero in spite of the existence of a following 16bit `type'. - Reported by Robert Święcki. +2013-12-03 Werner Lemberg -2010-07-01 suzuki toshiya + [truetype] Remove dead code. - Additional fix for Savannah bug #30248 and #30249. + Reported by Nigel Tao . - * src/base/ftobjs.c (Mac_Read_POST_Resource): Check the buffer size - during gathering PFB fragments embedded in LaserWriter PS font for - Macintosh. Reported by Robert Święcki. + * include/internal/tttypes.h (TT_LoaderRec): Remove unused + `preserve_pps' field. + * src/truetype/ttgload.c (TT_Hint_Glyph): Updated. -2010-06-30 Alexei Podtelezhnikov +2013-12-03 Werner Lemberg - Minor optimizations by avoiding divisions. + [truetype] Fix phantom point handling. - * src/sfnt/ttkern.c (tt_face_load_kern, tt_face_get_kerning): - Replace divisions with multiplication in comparisons. + This is a further improvement to the changes from 2013-11-06. -2010-06-29 Werner Lemberg + * src/truetype/ttgload.c (TT_Hint_Glyph): Horizontal phantom points + are rounded horizontally, vertical ones are rounded vertically. + (TT_LOADER_SET_PP): The horizontal position of vertical phantom + points in pre-ClearType mode is zero, as shown in the OpenType + specification. - Fix minor tracing issues. +2013-12-02 Werner Lemberg - * src/cff/cffgload.c, src/truetype/ttgload.c: Adjust tracing levels. + [truetype] Fix change from 2013-11-20. -2010-06-27 Werner Lemberg + Problem reported by Akira Kakuto . - [cff] Really fix `hintmask' and `cntrmask' limit check. + * src/truetype/ttgload.c (TT_Load_Simple_Glyph): Protect call to + `Update_Max' with both a TT_USE_BYTECODE_INTERPRETER guard and a + `IS_HINTED' clause. + Also remove redundant check using `maxSizeOfInstructions' – in + simple glyphs, the bytecode data comes before the outline data, and + a validity test for this is already present. - * src/cff/cffgload.c (cff_decoder_parse_charstrings) - : Fix thinko and handle tracing also. +2013-11-27 Werner Lemberg -2010-06-27 Werner Lemberg + [autofit] Fix use of dumping functions in `ftgrid' demo program. - Fix valgrind warning. + * src/autofit/afhints.c (AF_DUMP) [FT_DEBUG_AUTOFIT]: New macro. + (af_glyph_hints_dump_points, af_glyph_hints_dump_segments, + af_glyph_hints_dump_edges) [FT_DEBUG_AUTOFIT]: Add parameter to + handle output to stdout. + Use AF_DUMP. + (af_glyph_hints_dump_points, af_glyph_hints_dump_segments, + af_glyph_hints_dump_edges) [!FT_DEBUG_AUTOFIT]: Removed. - * src/base/ftoutln.c (FT_Outline_Get_Orientation): Initialize - `result' array. +2013-11-25 Werner Lemberg -2010-06-27 Werner Lemberg + * Version 2.5.1 released. + ========================= - [cff] Fix memory leak. - * src/cff/cffgload.c (cff_operator_seac): Free charstrings even in - case of errors. + Tag sources with `VER-2-5-1'. -2010-06-27 Werner Lemberg + * docs/VERSION.DLL: Update documentation and bump version number to + 2.5.1. + + * 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.5.0/2.5.1/, s/250/251/. - [cff] Protect against invalid `hintmask' and `cntrmask' operators. + * include/freetype/freetype.h (FREETYPE_PATCH): Set to 1. - * src/cff/cffgload.c (cff_decoder_parse_charstrings) - : Ensure that we don't exceed `limit' while parsing - the bit masks of the `hintmask' and `cntrmask' operators. + * builds/unix/configure.raw (version_info): Set to 17:0:11. + * CMakeLists.txt (VERSION_PATCH): Set to 1. + * docs/CHANGES, docs/release: Updated. -2010-06-26 Werner Lemberg +2013-11-23 Werner Lemberg - Fix PFR change 2010-06-24. + [truetype]: Add tricky font names `hkscsiic.ttf' and `iicore.ttf'. - * src/pfr/pfrgload.c (pfr_glyph_load_simple): Really protect against - invalid indices. + * src/truetype/ttobjs.c (TRICK_NAMES_MAX_CHARACTERS, + TRICK_NAMES_COUNT): Updated. + (trick_names): Add family name for the two fonts. -2010-06-26 Werner Lemberg +2013-11-23 Werner Lemberg - Improve PFR tracing messages. + * src/sfnt/ttsbit.c (tt_sbit_decoder_load_bitmap): Typo. - * src/pfr/pfrgload.c (pfr_glyph_load_rec): Emit tracing messages for - simple and compound glyph offsets. +2013-11-21 Werner Lemberg -2010-06-26 Werner Lemberg + [sfnt] Typo. - Fix last PFR change. + Problem reported by Hin-Tak Leung . - * src/pfr/pfrobjs.c (pfr_face_init): Fix rejection logic. + * src/sfnt/sfobjs.c (sfnt_load_face): Return correct `bsize->width' + value if the font lacks an `OS/2' table. -2010-06-26 Werner Lemberg +2013-11-21 Werner Lemberg - Fix Savannah bug #30262. + [sfnt] Improve handling of buggy embedded bitmap strikes. - * src/sfnt/ttload.c (tt_face_load_maxp): Limit `maxComponentDepth' - arbitrarily to 100 to avoid stack exhaustion. + We are now able to successfully load `AppleMyoungJo.ttf'. + Problem reported by Hin-Tak Leung . -2010-06-26 Werner Lemberg + * src/sfnt/ttsbit.c (tt_sbit_decoder_load_bitmap): Don't trust glyph + format. - Add some memory checks (mainly for debugging). +2013-11-20 Werner Lemberg - * src/base/ftstream.c (FT_Stream_EnterFrame): Exit with error - if the frame size is larger than the stream size. + [truetype] Don't trust `maxp's `maxSizeOfInstructions'. - * src/base/ftsystem.c (ft_ansi_stream_io): Exit with error if - seeking a position larger than the stream size. + Problem reported by Hin-Tak Leung ; see -2010-06-25 Werner Lemberg + http://lists.nongnu.org/archive/html/freetype-devel/2013-08/msg00005.html - Fix Savannah bug #30261. + for details. - * src/pfr/pfrobjs.c (pfr_face_init): Reject fonts which contain - neither outline nor bitmap glyphs. + * src/base/ftobjs.c (FT_Load_Glyph): Check size of `fpgm' and `prep' + tables also for setting `autohint'. -2010-06-25 Werner Lemberg + * src/truetype/ttgload.c (TT_Load_Simple_Glyph): Use code from + `TT_Process_Composite_Glyph' for handling unreliable values of + `maxSizeOfInstructions'. - Fix Savannah bug #30254. +2013-11-16 Werner Lemberg - * src/cff/cffload.c (cff_index_get_pointers): Do sanity check for - first offset also. + [sfnt] Fix `OS/2' table version 5 support. -2010-06-25 suzuki toshiya + We now follow the `official' announcement from Microsoft (on the + OpenType mailing list, which unfortunately hasn't a public archive). - Initial fix for Savannah bug #30248 and #30249. + * include/freetype/tttables.h (TT_OS2): + s/usLowerPointSize/usLowerOpticalPointSize/, + s/usUpperPointSize/usUpperOpticalPointSize/. - * src/base/ftobjs.c (Mac_Read_POST_Resource): Check the error during - reading a PFB fragment embedded in LaserWriter PS font for Macintosh. - Reported by Robert Święcki. + * src/sfnt/ttload.c (tt_face_load_os2): Update, and set correct + default values. -2010-06-24 Werner Lemberg +2013-11-13 Werner Lemberg - Fix Savannah bug #30247. + * builds/unix/ft2unix.h: Remove. No longer necessary. - * src/pcf/pcfread.c (pcf_get_metrics): Disallow (invalid) fonts with - zero metrics. + * builds/unix/install.mk (install): Updated. -2010-06-24 Graham Asher +2013-11-13 Werner Lemberg - * src/smooth/ftgrays.c (gray_render_cubic): Fix algorithm. - The previous version was too aggressive, as demonstrated in - http://lists.gnu.org/archive/html/freetype-devel/2010-06/msg00020.html. + Simplify header file hierarchy. -2010-06-24 Werner Lemberg + This large patch changes the header file directory layout from + `include/freetype/...' to `include/...', effectively removing one + level. Since the file `ft2build.h' is also located in `include' + (and it stays there even after installation), all FreeType header + files are now in a single directory. - */*: Use module specific error names where appropriate. + Applications that use (a) `freetype-config' or FreeType's + `pkg-config' file to get the include directory for the compiler, and + (b) the documented way for header inclusion like -2010-06-24 Werner Lemberg + #include + #include FT_FREETYPE_H + ... - Fix Savannah bug #30236. + don't need any change to the source code. - * src/sfnt/ttcmap.c (tt_face_build_cmaps): Improve check for pointer - to `cmap_table'. + * include/freetype/*: Move up to... + * include/*: ... this directory. -2010-06-24 Werner Lemberg + * builds/amiga/include/freetype/*: Move up to... + * builds/amiga/include/*: ... this directory. - Fix Savannah bug #30235. + */*: Essentially do `s@/freetype/@/@' where appropriate. - * src/pfr/pfrgload.c (pfr_glyph_load_simple): Protect against - invalid indices if there aren't any coordinates for indexing. + * CMakeList.txt: Simplify. + * builds/unix/freetype-config.in, builds/unix/freetype2.in: For + `--cflags', return a single directory. + * builds/unix/install.mk (install): No longer try to remove `cache' + and `internal' subdirectories; instead, remove the `freetype' + subdirectory. -2010-06-24 Werner Lemberg +2013-11-12 Werner Lemberg - [bdf]: Font properties are optional. + [truetype] Fix last `truetype' commit. - * src/bdf/bdflib.c (_bdf_readstream): Use special error code to - indicate a redo operation. - (_bdf_parse_start): Handle `CHARS' keyword here too and pass current - input line to `_bdf_parse_glyph'. + * src/truetype/ttgload.c (tt_get_metrics): Preserve stream position. + Return error value. + (load_truetype_glyph): Updated. -2010-06-23 Werner Lemberg +2013-11-10 Werner Lemberg - Fix Savannah bug #30220. + * docs/CMAKE: New dummy file. - * include/freetype/fterrdef.h - (BDF_Err_Missing_Fontboundingbox_Field): New error code. +2013-11-08 Dave Arnold - * src/bdf/bdflib.c (_bdf_parse_start): Check for missing - `FONTBOUNDINGBOX' field. - Avoid memory leak if there are multiple `FONT' lines (which is - invalid but doesn't hurt). + [cff] Fix for hints that touch. -2010-06-21 Werner Lemberg + * src/cff/cf2hints.c (cf2_hintmap_insertHint): Fix condition for + finding index value of insertion point. - Fix Savannah bug #30168. +2013-11-06 Werner Lemberg - * src/pfr/pfrgload.c (pfr_glyph_load_compound): Limit the number of - subglyphs to avoid endless recursion. + [truetype] Fix handling of phantom points in composite glyphs. + Problem reported by Nigel Tao . -2010-06-20 Werner Lemberg + This is a follow-up commit to the previous one. - Fix Savannah bug #30145. + * src/truetype/ttgload.c (load_truetype_glyph): Call + `tt_get_metrics' after loading the glyph header. - * src/psaux/psobjs.c (t1_builder_add_contour): Protect against - `outline == NULL' which might happen in invalid fonts. +2013-11-06 Werner Lemberg -2010-06-19 Werner Lemberg + [truetype] Improve emulation of vertical metrics. - Fix Savannah bug #30135. + This commit also improves the start values of vertical phantom + points. Kudos to Greg Hitchcock for help. - * src/bdf/bdflib.c (_bdf_list_join): Don't modify value in static - string `empty'. - (_bdf_parse_glyph): Avoid memory leak in case of error. + * src/truetype/ttgload.c (TT_Get_VMetrics): Add parameter to pass + `yMax' value. Replace code with fixed Microsoft definition. + (tt_get_metrics): Updated. + (TT_LOADER_SET_PP): Add explanation how to initialize phantom + points, taken from both the OpenType specification and private + communication with Greg (which will eventually be added to the + standard). + Fix horizontal position of `pp3' and `pp4'. -2010-06-15 Werner Lemberg + * src/truetype/ttgload.h: Updated. - Fix Savannah bug #30108. + * src/truetype/ttdriver.c (tt_get_advances): Updated. - * src/autofit/afglobal.c (af_face_globals_compute_script_coverage): - Properly mask AF_DIGIT bit in comparison. + * docs/CHANGES: Updated. -2010-06-11 Werner Lemberg +2013-11-05 Werner Lemberg - Fix Savannah bug #30106. + * builds/windows/vc2010/freetype.vcxproj: s/v110/v100/. + PlatformToolSet version 110 is for VC2012. - Point numbers for FreeType's implementation of hinting masks are - collected before the final number of points of a glyph has been - determined; in particular, the code for handling the `endchar' - opcode can reduce the number of points. + Problem reported (with solution) by Dave Arnold . - * src/pshinter/pshalgo.c (psh_glyph_find_strong_points): Assure that - `end_point' is not larger than `glyph->num_points'. +2013-11-05 Werner Lemberg -2010-06-11 Werner Lemberg + [truetype] Correctly reset point tags for glyph components. + Problem reported by Nigel Tao . - [cff]: Improve debugging output. + * src/truetype/ttgload.c (TT_Process_Composite_Glyph): Fix loop. - * src/cff/cffgload.c (cff_decoder_parse_charstrings) - : Implement it. +2013-11-02 Werner Lemberg -2010-06-10 Graham Asher + [truetype] Fix GETINFO opcode handling of subpixel hinting bits. - ftgrays: Speed up rendering of small cubic splines. + * src/truetype/ttinterp.c (Ins_GETINFO): Don't request bit 6 set to + get info on subpixel hinting. - * src/smooth/ftgrays.c (gray_render_cubic): Implement new, - simplified algorithm to find out whether the spline can be replaced - with two straight lines. See this thread for more: + * docs/CHANGES: Updated. - http://lists.gnu.org/archive/html/freetype-devel/2010-06/msg00000.html +2013-11-02 Werner Lemberg -2010-06-09 Werner Lemberg + Fix Savannah bug #40451. - Fix Savannah bug #30082. + Simply apply the patch from the bug report. - * src/cff/cffgload.c (cff_decoder_parse_charstrings) - : Protect against stack underflow. + * builds/unix/ftconfig.in, builds/vms/ftconfig.h, + include/freetype/config/ftconfig.h: The used #pragma directives only + work with gcc versions 4.6 and higher. -2010-06-08 Werner Lemberg +2013-11-01 Werner Lemberg - Fix Savannah bug #30053. + * docs/CHANGES: Updated. - * src/cff/cffparse.c (cff_parse_real): Handle border case where - `fraction_length' has value 10. +2013-11-01 Werner Lemberg -2010-06-07 Werner Lemberg + [truetype] Minor code refactoring. - Fix Savannah bug #30052. - This bug has been introduced with commit 2415cbf3. + Two benefits: The allocated FDEF (and IDEF) array gets slightly + smaller, and the `ttdebug' demo program has access to function + numbers without additional costs. - * src/base/ftobjs.c (FT_Get_First_Char, FT_Get_Next_Char): Protect - against endless loop in case of corrupted font header data. + Fortunately, no changes to FontForge are necessary – this is the + only external TrueType debugger I know of, but others may exist and + should check the code accordingly. -2010-05-26 Werner Lemberg + * src/truetype/ttinterp.h (TT_CallRec): Replace `Cur_Restart' and + `Cur_End' with a pointer to the corresponding `TT_DefRecord' + structure. - Remove unused variable. - Found by Graham. + * src/truetype/ttinterp.c (DO_JROT, DO_JMPR, DO_JROF, Ins_ENDF, + Ins_CALL, Ins_LOOPCALL, Ins_UNKNOWN, TT_RunIns ): + Updated. - * src/autofit/afhints.c (af_glyph_hints_reload): Remove unused - variable `first' in first block. +2013-10-27 Werner Lemberg -2010-05-22 Werner Lemberg + [sfnt] Implement support for `OS/2' table version 5. - Fix various memory problems found by linuxtesting.org. + See - * src/base/ftgxval.c (FT_TrueTypeGX_Free, FT_ClassicKern_Free), - src/base/ftotval.c (FT_OpenType_Free), src/base/ftpfr.c - (ft_pfr_check): Check `face'. + http://typedrawers.com/discussion/470/new-microsoft-size-specific-design-selection-mechanism - * src/base/ftobjs.c (FT_Get_Charmap_Index): Check `charmap' and - `charmap->face'. - (FT_Render_Glyph): Check `slot->face'. - (FT_Get_SubGlyph_Info): Check `glyph->subglyphs'. + for the announcement. -2010-05-22 Werner Lemberg + * include/freetype/tttables.h (TT_OS2): Add fields + `usLowerPointSize' and `usUpperPointSize'. Since FreeType returns + this structure only as a pointer through `FT_Get_Sfnt_Table', there + shouldn't be any ABI problems. - autofit: Remove dead code. - Suggested by Graham. + * src/sfnt/ttload.c (tt_face_load_os2): Implement it. - * src/autofit/afhints.c (af_glyph_hints_compute_inflections): - Removed. - (af_glyph_hints_reload): Remove third argument. - Update all callers. + * docs/CHANGES: Updated. -2010-05-21 Bram Tassyns +2013-10-24 Werner Lemberg - Fix Savannah bug #27987. + * README.git, docs/CHANGES, docs/INSTALL: Updated. - * src/cff/cffobjs.c (remove_subset_prefix): New function. - (cff_face_init): Use it to adjust `cffface->family_name'. +2013-10-24 John Cary -2010-05-20 Werner Lemberg + Provide cmake support. - TrueType: Make FreeType ignore maxSizeOfInstructions in `maxp'. + * CMakeLists.txt: New file. - Acroread does the same. +2013-10-23 Kenneth Miller + Werner Lemberg - * src/truetype/ttgload.c (TT_Process_Composite_Glyph): Call - `Update_Max' to adjust size of instructions array if necessary and - add a rough safety check. + Provide support for x64 builds in Visual C++ project files. - (load_truetype_glyph): Save `loader->byte_len' before recursive - call. + * src/builds/win32: Renamed to... + * src/builds/windows: This. - * src/truetype/ttinterp.h, src/truetype/ttinterp.c (Update_Max): - Declare it as FT_LOCAL. + * src/builds/windows/vc2010/*: Updated to handle x64 target. -2010-05-18 Hongbo Ni + * src/builds/windows/*.mk, docs/INSTALL.GNU: s/win32/windows/ where + appropriate. - Apply Savannah patch #7196. +2013-10-22 Werner Lemberg - * src/cff/cffgload.c (cff_slot_load): Prevent crash if CFF subfont - index is out of range. + * src/base/md5.c, src/base/md5.h: Updated to recent version. -2010-05-11 Werner Lemberg + * src/base/ftobjs.c: Updated; `md5.c' no longer uses `free'. - * docs/formats.txt: Give pointer to PCF documentation. - Information provided by Alan Coopersmith - . + The canonical URL to get updates for this file is -2010-05-10 Ken Sharp + http://cvsweb.openwall.com/cgi/cvsweb.cgi/Owl/packages/popa3d/popa3d/md5/ - Fix Savannah bug #29846. + as the author told me in private communication. - Previously we discovered fonts which used `setcurrentpoint' to set - the initial point of a contour to 0,0. This caused FreeType to - raise an error, because the `setcurrentpoint' operator is only - supposed to be used with the results from an OtherSubr subroutine. +2013-10-19 Werner Lemberg - This was fixed by simply ignoring the error and carrying on. + [autofit] s/SMALL_TOP/X_HEIGHT/. - Now we have found a font which uses setcurrentpoint to actually - establish a non-zero point for a contour during the course of a - glyph program. FWIW, these files may be produced by an application - called `Intaglio' on the Mac, when converting TrueType fonts to - Type 1. + * src/autofit/afblue.dat: Updated. - The fix allows the new invalid behaviour, the old invalid behaviour - and real proper usage of the operator to work the same way as Adobe - interpreters apparently do. + * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. - (t1_decoder_parse_charstrings): Make `setcurrentpoint' use the top - two elements of the stack to establish unconditionally the current x - and y coordinates. + * src/autofit/aflatin.c, src/autofit/aflatin.h, + src/autofit/atlatin2.c: Updated. - Make the `flex' subroutine handling (OtherSubr 0) put the current - x,y coordinates onto the stack, instead of two dummy uninitialised - values. +2013-10-19 Werner Lemberg + + * src/autofit/afblue.dat: s/MINOR/DESCENDER/. + + * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + +2013-10-16 Werner Lemberg + + [autofit] Add description strings to script entries. + + Currently, this is unused. + + * src/autofit/afscript.h: Do it. + * src/autofit/afglobal.c, src/autofit/afpic.c, + src/autofit/aftypes.h: Updated. + +2013-10-16 Werner Lemberg + + [autofit] Improve tracing message for extra light flag. + + * src/autofit/aflatin.c (af_latin_metrics_scale_dim): Do it. + +2013-10-15 Chongyu Zhu + + [arm] Fix thumb2 inline assembly under LLVM. + + When using `ADD' with an immediate operand, the instruction is + actually `ADD Rd, Rn, #', that is, the maximum of the + immediate operand cannot exceed 4095. It will fail to compile with + LLVM. + + However, in GCC, due to some legacy compatibility considerations, + `ADD.W' will be automatically emitted when the immediate operand is + larger than 4095. + + * builds/unix/ftconfig.in, include/freetype/config/ftconfig.h + (FT_MulFix_arm) [__GNUC__]: Support clang compiler. + + * src/truetype/ttinterp.c (TT_MulFix14_arm) [__GNUC__]: Ditto. + +2013-10-12 Werner Lemberg + + [autofit] Improve tracing of `latin' hinter. + + * src/autofit/aflatin.c (af_latin_metrics_init_blues): Report blue + zone types. + (af_latin_metrics_scale_dim): Report scaling changes due to x height + alignment. + Report scaled stroke width and blue zone values. + +2013-10-03 Dave Arnold + + * src/cff/cf2font.c (cf2_computeDarkening): Avoid division by zero. + + Note that the old code avoided using a region of the piecewise + linear function where the slope was zero. The recovery was to use a + different section of the function, which produced a different, + incorrect amount of darkening. + +2013-10-02 Darrell Bellert + + * src/sfnt/ttload.c (tt_face_load_pclt): Fix `pclt_fields'. + +2013-10-02 Dave Arnold + + * src/cff/cf2font.c (cf2_computeDarkening): Initialize darkenAmount. + + This line was lost in commit 89ca1fd6 (from 2013-06-25). The effect + is to use a previous darkening amount when producing an unhinted, + unscaled outline. This can cause autohint samples in ftgrid and + ftview to be based on darkened CFF outlines instead of unhinted, + undarkened ones. + +2013-09-29 Dave Arnold + + Fix Savannah bug #39295. + + The bug was caused by switching to the initial hintmap (the one in + effect when `moveto' executes) just before drawing the final element + in the charstring. This ensured that the path was closed (in both + Character Space and Device Space). But if the final element was a + curve and if the final hintmap was different enough from the initial + one, then the curve was visibly distorted. + + The first part of the fix is to draw the final curve using the final + hintmap as specified by the charstring. This corrects the + distortion but does not ensure closing in Device Space. It may + require the rasterizer to automatically generate an extra closing + line. Depending on the hintmap differences, this line could be from + zero to a couple pixels in length. + + The second part of the fix covers the case where the charstring + subpath is closed with an explicit line. We now modify that line's + end point to avoid the distortion. + + Some glyphs in the bug report font (TexGyreHeros-Regular) that show + the change are: + + 25ppem S (98) + 24ppem eight (52) + 25.5ppem p (85) + + Curves at the *end* of a subpath are no longer distorted. However, + some of these glyphs have bad hint substitutions in the middle of a + subpath, and these are not affected. + + The patch has been tested with a set of 106 fonts that shipped with + Adobe Creative Suite 4, together with 756 Open Source CFF fonts from + Google Fonts. There are 1.5 million glyphs, of which some 20k are + changed with the fix. A sampling of a few hundred of these changes + have been examined more closely, and the changes look good (or at + least acceptable). + + * src/cff/cf2hints.h (CF2_GlyphPathRec): New element `pathIsClosing' + to indicate that we synthesize a closepath line. + + * src/cff/cf2hints.c (cf2_glyphpath_init): Updated. + (cf2_glyphpath_pushPrevElem): If closing, use first hint map (for + `lineto' operator) and adjust hint zone. + For synthesized closing lines, use end point in first hint zone. + (cf2_glyphpath_lineTo): Take care of synthesized closing lines. In + particular, shift the detection of zero-length lines from character + space to device space. + (cf2_glyphpath_closeOpenPath): Remove assertion. + Updated. + +2013-09-25 Werner Lemberg + + * src/autofit/aflatin.c (af_{grek,cyrl}_uniranges): Fix arrays. + +2013-09-25 suzuki toshiya + + [bdf, pcf] Refuse non-zero face_index. + + Suggested by Akira Tagoh, see + + http://lists.gnu.org/archive/html/freetype/2013-09/msg00030.html + + * src/bdf/bdfdrivr.c (BDF_Face_Init): Return `Invalid_Argument' + error if the font could be opened but non-zero `face_index' is + given. + * src/pcf/pcfdrivr.c (PCF_Face_Init): Ditto. + + * src/type42/t42objs.c (T42_Face_Init): Remove unrequired FT_UNUSED + macro for `face_index' because it is validated later. + +2013-09-23 Werner Lemberg + + Fix Savannah bug #40090. + + * src/autofit/afcjk.c (af_cjk_metrics_scale): Revert commit + 306f8c5d (from 2013-08-25) affecting this function. + +2013-09-22 Werner Lemberg + + [autofit] Disunify Cyrillic and Greek handling from Latin. + + * src/autofit/afscript.h: Add Cyrillic and Greek. + + * src/autofit/afblue.dat (AF_BLUE_STRINGSET_GREK, + AF_BLUE_STRINGSET_CYRL): Add blue zones for Greek and Cyrillic. + (AF_BLUE_STRINGSET_LATN): Fix typo. + * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + + * src/autofit/aflatin.c (af_grek_uniranges, af_cyrl_uniranges): New + arrays. + (af_grek_script_class, af_cyrl_script_class): New scripts. + * src/autofit/aflatin.h: Updated. + +2013-09-20 Werner Lemberg + + * docs/CHANGES: Updated. + +2013-09-20 Behdad Esfahbod + + Fix vertical size of emboldened glyphs. + + Cf. https://bugzilla.gnome.org/show_bug.cgi?id=686709 + + * src/base/ftsynth.c (FT_GlyphSlot_Embolden): Adjust `horiBearingY' + also. + +2013-09-11 Alexei Podtelezhnikov + + * include/freetype/ftoutln.h: Correct FT_Outline_Get_Orientation + algorithm description. + +2013-09-11 Werner Lemberg + + [autofit] Improve Hebrew rendering. + + This change introduces a new blue zone property + `AF_BLUE_PROPERTY_LATIN_LONG' to make the auto-hinter ignore short + top segments. + + * src/autofit/afblue.dat: Fix Hebrew blue strings. + Use AF_BLUE_PROPERTY_LATIN_LONG for AF_BLUE_STRING_HEBREW_TOP. + + * src/autofit/afblue.hin (AF_BLUE_PROPERTY_LATIN_LONG): New macro. + + * src/autofit/afblue.c, src/autofit/afblue.h: Updated. + + * src/autofit/aflatin.c (af_latin_metrics_init_blues): Handle + `AF_LATIN_IS_LONG_BLUE'. + + * src/autofit/aflatin.h (AF_LATIN_IS_LONG_BLUE): New macro. + +2013-08-28 Behdad Esfahbod + + [sfnt] Fix frame access while reading WOFF table directory. + + * src/sfnt/sfobjs.c (woff_open_font): Using single memory frame + while reading the directory entries for the whole loop. + +2013-08-29 Werner Lemberg + Behdad Esfahbod + + Implement support for WOFF containers. + + We simply synthesize a SFNT from the WOFF, create a memory stream + for the new data, and load the SFNT as usual. + + Does NOT add any API to access WOFF metadata or private blocks. + + * include/freetype/internal/tttypes.h (WOFF_HeaderRec, + WOFF_TableRec): New structures. + + * include/freetype/tttags.h (TTAG_wOFF): New macro. + + * src/base/ftobjs.c (FT_Open_Face): Set `stream' after calling + `open_face'. + + * src/sfnt/sfobjs.c [FT_CONFIG_OPTION_SYSTEM_ZLIB]: Include + `FT_GZIP_H'. + (WRITE_BYTE, WRITE_USHORT, WRITE_ULONG): New temporary macros for + writing to a stream. + (sfnt_stream_close, compare_offsets, woff_open_font): New functions. + (sfnt_open_font): Handle `TTAG_wOFF'. + (sfnt_init_face): Set `stream' after calling `sfnt_open_font'. + + * src/truetype/ttobjs.c (tt_face_init): Set `stream' after calling + `sfnt->init_face'. + + * src/base/ftobjs.c (open_face): Use a pointer to FT_Stream as an + argument so that a changed stream survives. + Update callers. + +2013-08-28 Werner Lemberg + + [gzip] New function `FT_Gzip_Uncompress'. + + This is modeled after zlib's `uncompress' function. We need this + for WOFF support. + + * include/freetype/ftgzip.h, src/gzip/ftgzip.c (FT_Gzip_Uncompress): + New function. + + * src/gzip/rules.mk: Rewrite to better reflect dependencies. + +2013-08-28 Werner Lemberg + + [autofit] Fix `make multi' compilation. + + * src/autofit/afblue.cin, src/autofit/afblue.c: Don't include + `afblue.h' but `aftypes.h'. + * src/autofit/afcjk.c: Don't include `aftypes.h' but `afglobal.h'. + +2013-08-28 Werner Lemberg + + [autofit] Fix C++ compilation. + + * src/autofit/afglobal.c (af_face_globals_get_metrics), + src/autofit/afdummy.c (af_dflt_script_class), src/autofit/afindic.c + (af_deva_script_class): Use proper casts. + +2013-08-27 Behdad Esfahbod + + * src/sfnt/ttload.c (tt_face_load_font_dir): Fix sign typos. + +2013-08-27 Behdad Esfahbod + + FT_Open_Face: Improve external stream handling. + + If the font's `clazz->init_face' function wants to swap to new + stream, handling of whether original stream was external could + result to either memory leak or double free. Mark externality into + face flags before calling `init_face' such that the clazz can handle + external streams properly. + + * src/base/ftobjs.c (FT_Open_Face): Move code to set + FT_FACE_FLAG_EXTERNAL_STREAM to... + (open_face): This function. + +2013-08-27 Werner Lemberg + + Remove `FT_SqrtFixed' function. + + It's no longer used. + + * include/freetype/internal/ftcalc.h, src/base/ftcalc.c: Do it. + +2013-08-27 Werner Lemberg + + [autofit] While tracing, report script names instead of ID values. + + * src/autofit/afglobal.c (af_script_names) [FT_DEBUG_LEVEL_TRACE]: + New array. + * src/autofit/afglobal.h: Updated. + + * src/autofit/afcjk.c (af_cjk_metrics_init_widths, + af_cjk_hint_edges): Use `af_script_names'. + * src/autofit/aflatin.c (af_latin_metrics_init_widths, + af_latin_hint_edges): Ditto. + +2013-08-26 Werner Lemberg + + [autofit] Report used script while hinting a glyph. + + * src/autofit/afcjk.c (af_cjk_hint_edges), src/autofit/aflatin.c + (af_latin_hint_edges): Implement it. + +2013-08-26 Werner Lemberg + + [autofit] Add support for Hebrew script. + + * src/autofit/afblue.dat: Add blue strings for Hebrew. + * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + + * src/autofit/aflatin.c (af_hebr_uniranges): New array. + (af_hebr_script_class): New script. + * src/autofit/aflatin.h, src/autofit/afscript.h: Updated. + +2013-08-26 Werner Lemberg + + [autofit] Improve tracing messages. + + * src/autofit/afcjk.c (af_cjk_metrics_init_widths): Mention script + ID in tracing message. + (af_cjk_metrics_init_blues): Initialize `axis' outside of the inner + loop. + Improve tracing messages. + (af_cjk_hint_edges) [FT_DEBUG_LEVEL_TRACE]: New variable + `num_actions' to count hinting actions. + Improve tracing messages. + + * src/autofit/aflatin.c (af_latin_metrics_init_widths): Mention + script ID in tracing message. + (af_latin_metrics_init_blues, af_latin_hint_edges): Improve tracing + messages. + +2013-08-26 Werner Lemberg + + Better tracing of loaded glyphs. + + Previously, the loading of a glyph was traced at level 4, if at all. + With this change, all font loading routines emit a tracing message + at level 1, making it easier to select tracing output (for example + using F2_DEBUG="any:1 afhints:7 aflatin:7"). + + * src/bdf/bdfdrivr.c (BDF_Glyph_Load): Add tracing message. + * src/cff/cffdrivr.c (cff_glyph_load): Ditto. + * src/cff/cffgload.c (cff_decoder_prepare): Improve tracing + messages. + * src/cid/cidgload.c (cid_load_glyph): Use level 1 for tracing + message. + * src/pcf/pcfdrivr.c (PCF_Glyph_Load): Ditto. + * src/pfr/pfrobjs.c (pfr_slot_load): Add tracing message. + * src/truetype/ttgload.c (TT_Load_Glyph): Ditto. + * src/type1/t1gload.c (T1_Load_Glyph): Ditto. + * src/type42/t42objs.c (T42_GlyphSlot_Load): Ditto. + * src/winfonts/winfnt.c (FNT_Load_Glyph): Ditto. + +2013-08-26 Werner Lemberg + + [autofit] Fix script selection. + + * src/autofit/afglobal.c (af_face_globals_get_metrics): Use + `AF_SCRIPT_DFLT', not value 0. + Simplify code. + + * src/autofit/afscript.h: Sort by script name. + +2013-08-26 Werner Lemberg + + [autofit] Make `dummy' hinter work as expected. + + * src/autofit/afdummy.c (af_dummy_hints_init): Properly set scaling + information. + (af_dummy_hints_apply): Scale the glyphs. + +2013-08-25 Werner Lemberg + + [autofit] Make `cjk' module use blue stringsets. + + * src/autofit/afcjk.c (AF_CJK_MAX_TEST_CHARACTERS): Removed. + (af_cjk_hani_blue_chars): Removed. + (AF_CJK_BLUE_TYPE_*): Removed. + (af_cjk_metrics_init_blues): Replace AF_CJK_MAX_TEST_CHARACTERS with + AF_BLUE_STRING_MAX_LEN. + Change loops to use offsets (in file `afblue.h') into the new arrays + `af_blue_stringsets' and `af_blue_strings' (in file `afblue.c'). + Instead of three dimensions (as used in the old blue string array) + we now use properties to do the same, saving one loop nesting level. + + * src/autofit/afcjk.h: Remove old enumeration values superseded by + the new data in `afblue.h'. + (AF_CJK_IS_TOP_BLUE, AF_CJK_IS_HORIZ_BLUE, AF_CJK_IS_FILLED_BLUE, + AF_CJK_IS_RIGHT_BLUE): New macros, to be used in + `af_cjk_metrics_init_blues'. + (AF_CJK_BLUE_IS_RIGHT): Remove this now redundant enum value. + (AF_CJK_BLUE_IS_TOP): Renamed to... + (AF_CJK_BLUE_TOP): This. + (AF_CJK_MAX_BLUES): Remove. + (AF_CJKAxisRec): Updated. + +2013-08-25 Werner Lemberg + + [autofit] Typo. + + * src/autofit/afblue.hin, src/autofit/afblue.c (GET_UTF8_CHAR): Use + cast. + +2013-08-25 Werner Lemberg + + [autofit] Synchronize `cjk' with `latin' module (and vice versa). + + * src/autofit/afcjk.c (af_cjk_metrics_init_widths): Add tracing + messages. + (af_cjk_metrics_init_blues): Don't pass blue string array as + argument but use the global array directly. + Use `outline' directly. + Update and add tracing messages. + (af_cjk_metrics_init): Simplify code. + (af_cjk_metrics_scale_dim): Improve tracing message. + (af_cjk_metrics_scale): Synchronize. + + * src/autofit/aflatin.c (af_latin_metrics_init_widths, + af_latin_metrics_init_blues): Improve and add tracing messages. + +2013-08-25 Werner Lemberg + + [autofit] Make `latin' module use blue stringsets. + + * src/autofit/aflatin.c (AF_LATIN_MAX_TEST_CHARACTERS): Removed. + (af_latin_blue_chars): Removed. + (af_latin_metrics_init_blues): Replace AF_LATIN_MAX_TEST_CHARACTERS + with AF_BLUE_STRING_MAX_LEN. + Change loops to use offsets (in file `afblue.h') into the new arrays + `af_blue_stringsets' and `af_blue_strings' (in file `afblue.c'). + Use `AF_LATIN_IS_SMALL_TOP_BLUE' macro. + + * src/autofit/aflatin.h: Remove old enumeration values superseded by + the new data in `afblue.h'. + (AF_LATIN_IS_TOP_BLUE): Updated definition. + (AF_LATIN_IS_SMALL_TOP_BLUE): New macro. + (AF_LATIN_MAX_BLUES): Remove. + (AF_LatinAxisRec): Updated. + +2013-08-25 Werner Lemberg + + [autofit] Add blue stringsets. + + * src/autofit/aftypes.h: Include `afblue.h'. + (AF_ScriptClassRec): Add `blue_stringset' field. + (AF_DEFINE_SCRIPT_CLASS): Updated. + + * src/autofit/autofit.c: Include `afblue.c'. + + * src/autofit/afcjk.c (af_hani_script_class), src/autofit/afdummy.c + (af_dflt_script_class), src/autofit/afindic.c + (af_deva_script_class), src/autofit/aflatin.c + (af_latn_script_class), src/autofit/aflatin2.c + (af_ltn2_script_class): Updated. + + * src/autofit/rules.mk (AUTOF_DRV_SRC): Add `afblue.c'. + +2013-08-25 Werner Lemberg + + [autofit] Introduce data file for blue strings. + + The idea is to have a central file which gets processed by a Perl + script to create proper `.c' and `.h' files using templates. There + are two other reasons to do that: + + . The data file should be easily readable. We use UTF-8 encoding + which then gets converted to single bytes. + + . Since the number of supported scripts will increase soon, the + current usage of blue string arrays is a waste of space. Using + the Perl script it is possible to imitate jagged arrays, + defining enumeration constants as offsets into the arrays. + + This commit only adds files without changing any functionality. + + * src/autofit/afblue.dat: New data file. + * src/tools/afblue.pl: New Perl script for processing `afblue.dat'. + + * src/autofit/afblue.cin, src/autofit/afblue.hin: New template files + for... + * src/autofit/afblue.c, src/autofit/afblue.c: New source files. + To avoid a dependency on Perl, we add them too. + +2013-08-19 Alexei Podtelezhnikov + + [base] Enable new algorithm for `BBox_Cubic_Check'. + + * src/base/ftbbox.c: Enable new BBox_Cubic_Check algorithm, remove + the old one. + Improve comments. + +2013-08-18 Werner Lemberg + + * builds/unix/unix-def.in (freetype2.pc): Don't set executable bit. + +2013-08-18 Werner Lemberg + + Fix Savannah bug #39804. + + * builds/unix/configure.raw (LIBPNG): Define and export. + * builds/unix/freetype-config.in, builds/unix/freetype2.in: Handle + libpng. + +2013-08-17 Alexei Podtelezhnikov + + [base] Clean up BBox_Conic_Check. + + * src/base/ftbbox.c (BBox_Conic_Check): Remove redundant checks for + extremum at the segment ends, which are already within the bbox. + Slightly modify calculations. + +2013-08-15 Alexei Podtelezhnikov + + [base] Finish experimental (disabled) BBox_Cubic_Check implementation. + + * src/base/ftbbox.c (BBox_Cubic_Check): Scale arguments to improve + accuracy and avoid overflows. + +2013-08-13 Alexei Podtelezhnikov + + [base] Refactor experimental (disabled) BBox_Cubic_Check. + + * src/base/ftbbox.c (BBox_Cubic_Check): Implement the minimum search + as the mirror image of the maximum search implemented here... + (update_max): New function. + +2013-08-06 John Tytgat + + Fix Savannah bug #39702. + + * src/cff/cffload.c (cff_index_get_pointers): Check for `cur_offset + != 0'; this stronger test is mandated by the CFF specification. + Fix test for INDEX structures which have one or more empty entries + at the end. + +2013-08-05 Werner Lemberg + + Fix gcc pragmas, part 2. + + * src/truetype/ttinterp.c (TT_MulFix14_long_long, + TT_DotFix14_long_long): `#pragma gcc diagnostic {push,pop}' has been + introduced with gcc version 4.6. + +2013-08-05 Werner Lemberg + + Fix gcc pragmas. + + * src/truetype/ttinterp.c (TT_MulFix14_long_long, + TT_DotFix14_long_long): Older gcc versions don't accept diagnostic + pragmas within a function body. + +2013-08-05 Werner Lemberg + + Fix Savannah bug #39700. + + * builds/unix/ftconfig.h: Synchronize with + `include/freetype/config/ftconfig.h'. + + * builds/vms/ftconfig.h: Ditto. + Make the differences to the master `ftconfig.h' file as small as + possible for easier maintainance. + +2013-08-05 Werner Lemberg + + [autofit] Improve handling of `near' points. + + Points which are very near to each other are now marked as such. + The `weak' flag is then computed by using the `in' vector of the + first and the `out' vector of the last point of a group of near + points. + + For example, this fixes the rendering of glyph `Oslash' in + `Roboto-Thin.ttf'. + + * src/autofit/afhints.h (AF_Flags): New value `AF_FLAGS_NEAR'. + + * src/autofit/afhints.c (af_glyph_hints_reload): Introduce + the heuristic value `near_limit' to decide whether the current point + is near to the previous one, then set `AF_FLAG_NEAR' accordingly. + Store good `in' vector (of last non-near point) in + `last_good_in_{x,y}' and use it as an argument to + `ft_corner_is_flat' if necessary. + +2013-08-02 Werner Lemberg + + * include/freetype/ftcffdrv.h: Improve documentation. + This is based on blog entries from David Lemon and Dave Arnold (both + from Adobe) with kind permission. Dave also helped in + proof-reading. + +2013-08-02 Werner Lemberg + + [autofit] Move declaration of scripts into separate file. + + This has the benefit that we don't need to duplicate the data at + different places. + + * src/autofit/afscript.h: New file. + + * src/autofit/aftypes.h (AF_Script): Include `afscript.h' to define + the enumeration values. + + * src/autofit/afglobal.c: Include `afscript.h' to get the script + specific header files. + (af_script_classes): Include `afscript.h' to fill this array. + + * src/autofit/afpic.c: Include `afscript.h' to get the script + specific header files. + (autofit_module_class_pic_init): Include `afscript.h' for + initialization. + * src/autofit/afpic.h (AF_SCRIPT_CLASSES_COUNT, + AF_SCRIPT_CLASSES_REC_COUNT): Removed. Use `AF_SCRIPT_MAX' instead. + + * src/autofit/rules.mk (AUTOF_DRV_H): Updated. + +2013-08-02 Werner Lemberg + + [autofit] Move declaration of writing systems into separate file. + + This has the benefit that we don't need to duplicate the data at + different places. + + * src/autofit/afwrtsys.h: New file. + + * src/autofit/aftypes.h (AF_WritingSystem): Include `afwrtsys.h' to + define the enumeration values. + + * src/autofit/afglobal.c: Include `afwrtsys.h' to get the writing + system specific header files. + Include `afpic.h'. + (af_writing_system_classes): Include `afwrtsys.h' to fill this + array. + + * src/autofit/afpic.c: Include `afwrtsys.h' to get the writing + system specific header files. + (autofit_module_class_pic_init): Include `afwrtsys.h' for + initialization. + * src/autofit/afpic.h (AF_WRITING_SYSTEM_CLASSES_COUNT, + AF_WRITING_SYSTEM_CLASSES_REC_COUNT): Removed. Use + `AF_WRITING_SYSTEM_MAX' instead. + +2013-08-02 Werner Lemberg + + [sfnt] Fix compilation with g++. + + * src/sfnt/pngshim.c (error_callback, read_data_from_FT_stream): Use + cast. + (Load_SBit_Png): Pacify compiler. + +2013-08-02 suzuki toshiya + Werner Lemberg + + [autofit] Fix `make multi'. + + * include/freetype/config/ftconfig.h (FT_LOCAL_ARRAY, + FT_LOCAL_ARRAY_DEF): New macros. + + * src/autofit/afglobal.c (af_writing_system_classes, + af_script_classes): Use FT_LOCAL_ARRAY_DEF. + * src/autofit/afglobal.h: Declare `af_writing_system_classes' and + `af_script_classes'. + * src/autofit/afloader.c: Include `afpic.h'. + +2013-08-01 Werner Lemberg + + Another round of cppcheck nitpicks. + + The call was (from the top-level of the FreeType tree): + + cppcheck --force \ + --enable=all \ + -I /usr/include \ + -I /usr/local/include \ + -I /usr/lib/gcc/i586-suse-linux/4.7/include \ + -I include \ + -I include/freetype \ + -I include/freetype/config \ + -I include/freetype/internal \ + -DFT2_BUILD_LIBRARY \ + . &> cppcheck.log + + using cppcheck git commit f7e93f99. + + Note that cppcheck still can't handle `#include FOO' (with `FOO' a + macro). + + */* Improve variable scopes. + */* Remove redundant initializations which get overwritten. + + * src/gxvalid/*: Comment out redundant code or guard it with + FT_DEBUG_LEVEL_TRACE. + +2013-07-30 Werner Lemberg + + [autofit] Introduce `writing systems'. + + This patch adds a new top level to the auto-hinter's script class + hierarchy. It defines `writing systems' which can contain multiple + scripts. + + For example, the `latin' writing system (in file `aflatin.c') is + able to support scripts like Latin, Cyrillic, Armenian, etc., which + can be handled similarly. + + Scripts are now named using four-letter OpenType tags. + + * src/autofit/aftypes.h (AF_ScriptClassRec): Move relevant members + to... + (AF_WritingSystemClassRec): This new structure. It holds pointers + to functions which can be shared among related scripts. + (AF_WritingSystem): New enumeration. + (AF_Script): Revised values using four-letter tags. + (AF_DEFINE_WRITING_SYSTEM_CLASS): New macro. + (AF_DEFINE_SCRIPT_CLASS): Updated. + + * src/autofit/afglobal.c (af_writing_system_classes): New global, + constant array. + (af_script_classes): Updated. + (af_face_globals_free): Updated. + Remove assertion. + (af_face_globals_get_metrics): Updated. + + * src/autofit/afglobal.h (AF_SCRIPT_FALLBACK) + [!AF_CONFIG_OPTION_CJK]: Handle this case. + + * src/autofit/afloader.c (af_loader_load_g, af_loader_load_glyph): + Updated. + + * src/autofit/afpic.c (autofit_module_class_pic_init): Updated; + initialize structures for both writing systems and scripts. + * src/autofit/afpic.h: Updated. + (AF_WRITING_SYSTEM_CLASSES_GET): New macro. + + * src/autofit/afcjk.c (af_cjk_writing_system_class): New writing + system. + (af_cjk_uniranges): Renamed to... + (af_hani_uniranges): This. + (af_cjk_script_class): Reduced and renamed to... + (af_hani_script_class): This. + * src/autofit/afcjk.h: Updated. + + * src/autofit/afdummy.c (af_dummy_writing_system_class): New writing + system. + (af_dummy_script_class): Reduced and renamed to... + (af_dflt_script_class): This. + * src/autofit/afdummy.h: Updated. + + * src/autofit/afindic.c (af_indic_writing_system_class): New writing + system. + (af_indic_uniranges): Renamed to... + (af_deva_uniranges): This. + (af_indic_script_class): Reduced and renamed to... + (af_deva_script_class): This. + * src/autofit/afcjk.h: Updated. + + * src/autofit/aflatin.c (af_latin_writing_system_class): New writing + system. + (af_latin_uniranges): Renamed to... + (af_latn_uniranges): This. + (af_latin_script_class): Reduced and renamed to... + (af_latn_script_class): This. + * src/autofit/aflatin.h: Updated. + + * src/autofit/aflatin2.c (af_latin2_writing_system_class): New + writing system. + (af_latin2_uniranges): Renamed to... + (af_ltn2_uniranges): This. + Synchronize ranges with `latin'. + (af_latin2_script_class): Reduced and renamed to... + (af_ltn2_script_class): This. + * src/autofit/aflatin2.h: Updated. + +2013-07-30 Werner Lemberg + + [autofit] Variable renaming. + + * src/autofit/aftypes.h (AF_ScriptMetricsRec): + s/clazz/script_class/. + Update all users. + +2013-07-30 suzuki toshiya + + Ignore libpng-config under cross-building configuration, + because it will return the flags for the hosting environment. + + * builds/unix/configure.raw: Ignore libpng-config when + `cross_compiling' == yes. + +2013-07-30 Behdad Esfahbod + + Prevent division by zero by a transparent color. + + * src/base/ftbitmap.c (ft_gray_for_premultiplied_srgb_bgra): + Return 0 immediately, when alpha channel is zero. + +2013-07-25 Behdad Esfahbod + + Add FT_FACE_FLAG_COLOR and FT_HAS_COLOR. + + Also disambiguate Google's color bitmap tables. + + * include/freetype/freetype.h (FT_FACE_FLAG_COLOR, FT_HAS_COLOR): + New macros. + + * include/freetype/internal/tttypes.h (TT_SbitTableType): Add + TT_SBIT_TABLE_TYPE_CBLC. + + * src/sfnt/sfobjs.c (sfnt_load_face): Handle FT_FACE_FLAG_COLOR. + + * src/sfnt/ttsbit.c (tt_face_load_sbit, + tt_face_load_strike_metrics, tt_face_load_sbit_image): Handle + TT_SBIT_TABLE_TYPE_CBLC. + +2013-07-24 suzuki toshiya + + [sfnt] Fix for `make multi' target. + + * src/sfnt/pngshim.c (Load_SBit_Png): Use FT_LOCAL_DEF(). + +2013-07-20 Werner Lemberg + + * docs/INSTALL.GNU: Updated. + +2013-07-20 Behdad Esfahbod + + [sfnt] Fix `sbix' table version handling. + + * src/sfnt/ttsbit.c (tt_face_load_sbit) [TT_SBIT_TABLE_TYPE_SBIX]: + USHORT version numbers are to be considered as `minor'. + +2013-07-19 Werner Lemberg + + [autofit] Fix segment classification for blue zones. + + The old code (essentially unchanged since the very beginning) + incorrectly handled this configuration + + x -o- x + / \ + / \ + / \ + o o + + as flat and this + + o o + / / + x| x| + | | + o---------------o + + as round. (`o' and `x' are on and off points, respectively). + + This is a major change which should improve the rendering results + enormously for many TrueType fonts, especially in the range approx. + 20-40ppem, fixing the appearance of many overshoots. + + * src/autofit/aflatin.c (af_latin_metrics_init_blues): Look at the + first and last points of the segment, not the points right before + and after. + +2013-07-19 Behdad Esfahbod + + [sfnt] `sbix' fix-ups. + + * src/sfnt/sfobjs.c (sfnt_load_face): Apple's `sbix' color bitmaps + are rendered scaled and then the `glyf' outline rendered on top. We + don't support that yet, so just ignore the `glyf' outline and + advertise it as a bitmap-only font. + + * src/sfnt/ttsbit.c (tt_face_load_strike_metrics) + [TT_SBIT_TABLE_TYPE_SBIX]: Return metrics in 26.6 units. + (tt_face_load_sbix_image): Typo. + +2013-07-18 Behdad Esfahbod + + [sfnt] Add support for Apple's `sbix' color bitmap table. + + * include/freetype/internal/tttypes.h (TT_SBit_MetricsRec): Widen + fields to FT_Short and FT_UShort, respectively. + (TT_SBitTableType): New enumeration. + (TT_FaceRec): Add `sbit_table_type' field. + + * include/freetype/tttags.h (TTAG_sbix): New macro. + + * src/sfnt/pngshim.c (Load_SBit_Png): Pass a more generic + FT_GlyphSlot argument instead FT_Bitmap. + Add flag to control map and metrics handling. + Update all users. + + * src/sfnt/ttsbit.c: Include `ttmtx.h'. + (tt_face_load_eblc): Renamed to... + (tt_face_load_sbit): This. + Handlic `sbix' bitmaps. + (tt_face_free_eblc): Renamed to... + (tt_face_load_sbit): This. + Updated. + (tt_face_load_strike_metrics): Handle `sbix' bitmaps. + (tt_face_load_sbix_image): New function. + (tt_sbit_decoder_alloc_bitmap, tt_sbit_decoder_load_image, + tt_sbit_decoder_load_byte_aligned, tt_sbit_decoder_load_bit_aligned, + tt_sbit_decoder_load_compound, tt_sbit_decoder_load_png, + tt_sbit_decoder_load_image, tt_sbit_decoder_load_bitmap): Don't pass + and handle load flags. + (tt_sbit_decoder_load_bitmap) [!FT_CONFIG_OPTION_USE_PNG]: Better + handle formats 17-19. + Move color to grayscale conversion to... + (tt_face_load_sbit_image): Here. + Handle `sbix' bitmaps. + + * src/sfnt/pngshim.h: Updated. + * src/sfnt/ttsbit.h: Updated. + * src/sfnt/sfdriver.c: Updated. + +2013-07-18 Werner Lemberg + + [sfnt] Ignore invalid magic number in `head' or `bhed'. + + Other font engines seem to ignore it also. Problem reported by + Hin-Tak Leung . + + * src/sfnt/ttload.c (check_table_dir): Don't abort but warn only if + we have an invalid magic number. + +2013-07-16 Werner Lemberg -2010-04-14 Ken Sharp + [smooth] Fix segfault caused by previous commit. - Fix Savannah bug #29444. + * src/smooth/ftgrays.c (gray_set_cell): Always compute + `ras.invalid'. - * src/psaux/psobjs.c (t1_builder_start_point): Accept (invalid) - `lineto' immediately after `hsbw', in accordance with Acrobat, GS, - and others. +2013-07-16 David Turner -2010-04-14 Michał Cichoń + [smooth] Improve performance. - Fix Savannah bug #27999. + Provide a work-around for an ARM-specific performance bug in GCC. + This speeds up the rasterizer by more than 5%. - * src/cache/ftcmanag.c (FTC_Manager_RemoveFaceID): Only remove - selected entry, not all. + Also slightly optimize `set_gray_cell' and `gray_record_cell' (which + also improves performance on other platforms by a tiny bit (<1%). -2010-04-06 Jonathan Kew + * src/smooth/ftgrays.c (FT_DIV_MOD): New macro. + Use it where appropriate. - Add overflow check to `fvar' table. + (gray_record_cell, gray_set_cell, gray_move_to, + gray_convert_glyph_inner): Streamline condition handling. - * src/truetype/ttgxvar.c (TT_Get_MM_Var): Check axis and instance - count. +2013-07-16 David Turner -2010-04-05 Ken Sharp + [truetype] Add assembler code for TT_MulFix14 and TT_DotFix14. - Fix Savannah bug #29335. + This patch provides slightly optimized versions for ARM, x86, and + x86_64 CPUs if built with GCC. - * src/raster/ftraster.c (Line_Up): Use slow multiplication to - prevent overflow. This shouldn't have any serious impact on speed, - however. + Also remove some dead code. -2010-04-05 Werner Lemberg + * src/truetype/ttinterp.c (TT_MulFix14_arm, TT_MulFix14_long_long, + TT_DotFix14_long_long): New functions. - Add new function `FT_Library_SetLcdFilterWeights'. +2013-07-16 David Turner - This is based on code written by Lifter - . It fixes - FreeDesktop bug #27386. + Optimize FT_MulFix for x86_64 GCC builds. - * src/base/ftlcdfil.c (FT_Library_SetLcdFilterWeights): New - function. + This patch provides an optimized `FT_MulFix' implementation for + x86_64 machines when FreeType is built with GCC, or compatible + compilers like Clang. + + Example: + bin/ftbench -p -t 5 -s 14 -f 0008 Arial.ttf + + Before: + + Load 4.863 us/op + Load_Advances (Normal) 4.816 us/op + Load_Advances (Fast) 0.028 us/op + Render 2.753 us/op + Get_Glyph 0.463 us/op + Get_CBox 0.077 us/op + Get_Char_Index 0.023 us/op + Iterate CMap 13.898 us/op + New_Face 12.368 us/op + Embolden 0.028 us/op + Get_BBox 0.302 us/op + + After: + + Load 4.617 us/op + Load_Advances (Normal) 4.645 us/op + Load_Advances (Fast) 0.027 us/op + Render 2.789 us/op + Get_Glyph 0.460 us/op + Get_CBox 0.077 us/op + Get_Char_Index 0.024 us/op + Iterate CMap 13.403 us/op + New_Face 12.278 us/op + Embolden 0.028 us/op + Get_BBox 0.301 us/op + + * builds/unix/ftconfig.in, include/freetype/config/ftconfig.h + (FT_MulFix_x86_64): New function. + +2013-07-16 David Turner + + Speed up ARMv7 support. + + When building for ARMv7 with thumb2 instructions, the optimized + `FT_MulFix_arm' assembly routine was not being used. + + The reason for this is in the `ftconfig.h' header, namely: + + - The assembly routine uses the `smull' instruction which is not + available when generating Thumb-1 machine code. It is available + in Thumb-2 mode, though. + + - The header was written a long time ago before Thumb-2 became + widely popular (e.g. with Android). So it simply doesn't use the + assembly routine if the `__thumb__' built-in macro is defined. + + - When compiling in Thumb-2 mode, the compiler will define both + `__thumb__' and `__thumb2__'. + + By checking for `(__thumb2__ || !__thumb__)', we ensure that the + assembly routine is only avoided when generating Thumb-1 code. - * include/freetype/ftlcdfil.h: Updated. + Given that this is performance-sensitive function, this improves + `ftbench' as follows on a Galaxy Nexus: + + Before (us/op) After (us/op) + + - loading Arial.ttf glyphs at 14 ppem [1] + + Load 34.285 33.098 + + - same operation with the light auto-hinter [2] + + Load 31.317 29.590 + + - same operation without hinting [3] + + Load 6.143 5.376 + + - loading Arial.ttf advances at 14 ppem [4] + + Load_Advances (normal) 34.216 33.016 + Load_Advances (fast) 0.176 0.176 + + [1] ftbench -t 5 -p -s 14 -b a -f 0008 Arial.ttf + [2] ftbench -t 5 -p -s 14 -b a -r 1 -f 0028 Arial.ttf + [3] ftbench -t 5 -p -s 14 -b a -f 000a Arial.ttf + [4] ftbench -t 5 -p -s 14 -b b -f 0008 Arial.ttf + + * builds/unix/ftconfig.in, include/freetype/config/ftconfig.h + (FT_MULFIX_ASSEMBLER): Fix handling for ARMv7. + +2013-06-28 Werner Lemberg * docs/CHANGES: Updated. -2010-04-01 John Tytgat +2013-06-27 Werner Lemberg + + * src/winfonts/winfnt.c (FNT_Load_Glyph): Fix bitmap width guard. + +2013-06-25 Werner Lemberg + + [cff] Add darkening limit to `darkening-parameters'. + + * src/cff/cffdrivr.c (cff_property_set): Add check. + +2013-06-25 Werner Lemberg + + [cff] Add `darkening-parameters' property. + + * include/freetype/ftcffdrv.h: Document it. + + * src/cff/cffdrivr.c (cff_property_set, cff_property_get): Handle + `darkening-parameters' property. + + * src/cff/cf2font.h (CF2_FontRec): Add `darkenParams' array. + + * src/cff/cf2font.c (cf2_computeDarkening): Add `darkenParams' + argument and use it. + Update all callers. + + * src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Copy + `darken_params' values. + + * src/cff/cffobjs.h (CFF_DriverRec): Add `darken_params' array. + + * src/cff/cffobjs.c (cff_driver_init): Set default values for + `darken_params'. + +2013-06-25 Werner Lemberg + + [docmaker] Code shuffling. + + * src/tools/docmaker/tohtml.py (re_url): Move regexp... + * src/tools/docmaker/sources.py: ... to this file. + +2013-06-25 Werner Lemberg + + [docmaker] Remove unused functions. + + * src/tools/docmaker/content.py (DocMarkup.get_start, + DocBlock.get_markup_name): Removed. + * src/tools/docmaker/tohtml.py (html_quote0, dump_html_code, + HtmlFormatter.make_html_words): Removed. + +2013-06-25 Werner Lemberg + + * builds/freetype.mk (dll): Remove target. + + Problem reported by Jörg Günnewig . + +2013-06-25 Werner Lemberg + + [docmaker] Recognise URLs. + + * src/tools/docmaker/tohtml.py (re_url): New regular expression. + (make_html_para): Use it. + +2013-06-19 Werner Lemberg + + * Version 2.5.0.1 released. + =========================== + + + Tag sources with `VER-2-5-0-1'. + + * include/freetype/config/ftoption.h: Undefine + CFF_CONFIG_OPTION_OLD_ENGINE. + * devel/ftoption.h: Define CFF_CONFIG_OPTION_OLD_ENGINE. + +2013-06-19 Werner Lemberg + + * builds/unix/install.mk (install): Don't create `cache' directory. + + Found by Peter Breitenlohner . + +2013-06-19 Werner Lemberg + + * Version 2.5.0 released. + ========================= + + + Tag sources with `VER-2-5-0'. + + * docs/VERSION.DLL: Update documentation and bump version number to + 2.5.0. + + * README, Jamfile (RefDoc), + builds/win32/vc2005/freetype.vcproj, builds/win32/vc2005/index.html, + builds/win32/vc2008/freetype.vcproj, builds/win32/vc2008/index.html, + builds/win32/vc2010/freetype.vcxproj, builds/win32/vc2010/index.html, + builds/win32/visualc/freetype.dsp, + builds/win32/visualc/freetype.vcproj, + builds/win32/visualc/index.html, builds/win32/visualce/freetype.dsp, + builds/win32/visualce/freetype.vcproj, + builds/win32/visualce/index.html, + builds/wince/vc2005-ce/freetype.vcproj, + builds/wince/vc2005-ce/index.html, + builds/wince/vc2008-ce/freetype.vcproj, + builds/wince/vc2008-ce/index.html: s/2.4.12/2.5.0/, s/2412/250/. + + * include/freetype/freetype.h (FREETYPE_MINOR): Set to 5. + (FREETYPE_PATCH): Set to 0. + + * builds/unix/configure.raw (version_info): Set to 16:2:10. + + * src/base/ftobjs.c (FT_Open_Face): Pacify compiler. + * src/truetype/ttinterp.c (Ins_MSIRP, Ins_MIRP): Ditto. + +2013-06-18 Werner Lemberg + + Fix Savannah bug #39269. + + * src/base/ftgloadr.c (FT_GlyphLoader_CheckPoints): Free memory in + case of reacollocation failures. + +2013-06-18 Andrew Church + + Fix Savannah bug #39266. + + If memory allocations fail at certain points while opening a font, + FreeType can either crash due to a NULL dereference or leak memory. + + * include/freetype/internal/ftobjs.c (FT_Face_InternalRec, + FT_LibraryRec): Make `refcount' a signed integer. If, for example, + FT_Open_Face() fails in a memory allocation before the face's + reference count is set to 1, a subsequent `FT_Done_Library' call + would otherwise loop over `FT_Done_Face' 2^32 times before freeing + the face. + + * src/base/ftobjs.c (open_face): Initialize `stream' and friends + earlier. + (FT_Open_Face) : Behave correctly if `node' is NULL. + (FT_Destroy_Module) : Check that `renderer_clazz' is valid. + +2013-06-14 Werner Lemberg + + * src/smooth/ftgrays.c One final pragma to silence 64-bit MSVC. + +2013-06-06 Dave Arnold + Werner Lemberg + + [cff] Add code to Adobe's engine to handle ppem > 2000. + + * src/cff/cffgload.c (cff_slot_load): If we get + FT_Err_Glyph_Too_Big, retry unhinted and scale up later on. + +2013-06-12 Werner Lemberg + + Another try on pragmas. + + * include/freetype/internal/ftdebug.h: Move pragmas to... + * include/freetype/internal/internal.h: ... this file since it gets + included by all source files. + * include/freetype/internal/ftserv.h: Remove pragma which has no + effect. + +2013-06-12 Werner Lemberg + + * include/freetype/internal/ftdebug.h: Disable MSVC warning C4127. + + This partially undoes commit 3f6e0e0c. + +2013-06-12 Werner Lemberg + + More compiler warning fixes. + + */*: Use cast to `FT_Bool' (or `Bool') where appropriate. + +2013-06-10 Werner Lemberg + + [truetype] Improve handling of broken sbit advance widths. + + * src/truetype/ttgload.c (TT_Load_Glyph): Use the glyph's (scaled) + `linearHoriAdvance' if the sbit's `horiAdvance' value is zero. + + Cf. font `Fixedsys Excelsior' v3.01 (FSEX300.ttf), glyph A, 16ppem. + +2013-06-10 Werner Lemberg + + [sfnt] Improve embedded bitmap tracing. + + * src/base/ftobjs.c (FT_Request_Size): Move trace message regarding + bitmap strike match to... + (FT_Match_Size): This function. + + * src/sfnt/ttsbit.c (tt_sbit_decoder_load_metrics, + tt_sbit_decoder_load_byte_aligned, tt_sbit_decoder_load_bit_aligned, + tt_sbit_decoder_load_compound, tt_sbit_decoder_load_png, + tt_sbit_decoder_load_image): Decorate with tracing messages. + +2013-06-10 Werner Lemberg + + Fix Savannah bug #39160. + + * src/truetype/ttinterp.c (Ins_SDPVTL): Set projection vector too + for the degenerate case. + +2013-06-09 David Turner + + * src/cache/ftcmanag.c (FTC_Manager_Reset): Add missing cache flush. + + This code, present since eight(!) years in the unused `CACHE' + branch, has been forgotten to apply to the master branch. It's + really amazing that noone has ever complained since + `FTC_Manager_Reset' is pretty useless without flushing the cache. + +2013-06-07 Werner Lemberg + + Add and improve pragmas for MSVC compiler. + + * include/freetype/internal/ftdebug.h: Remove pragmas. + * include/freetype/internal/ftserv.h: Use push and pop for pragmas. + * include/freetype/internal/ftvalid.h: Handle warning C4324. + * src/base/ftobjs.c: Use push and pop for pragmas. + * src/gzip/ftgzip.c: Handle warning C4244. + +2013-06-07 Werner Lemberg - Fix Savannah bug #29404. + [cff] s/cf2_getGlyphWidth/cf2_getGlyphOutline/. - * src/truetype/ttgload.c: Revert change 2752bd1a (check on bit 1 - of `head' table of TrueType fonts). + * src/cff/cf2font.c, src/cff/cf2font.h, src/cff/cf2ft.c: Do it. -2010-03-14 suzuki toshiya +2013-06-06 Dave Arnold - Fix `multi build' for Tytgat's CFF driver improvement. + [cff] Add early exit feature for width-only calls. - * src/base/cffload.h (cff_index_get_name): Added. + This is for `FT_Get_Advance'. -2010-03-12 suzuki toshiya + There are 7 places where the spec says the width can be defined: - Remove duplicated inclusion of `FT_OUTLINE_H' in ftobjs.c. + hstem/hstemhm + vstem/vstemhm + cntrmask/hintmask + hmoveto + vmoveto + rmoveto + endchar - * src/base/ftobjs.c: Remove 2nd inclusion of `FT_OUTLINE_H'. + * src/cff/cf2intrp.c (cf2_doStems): Exit early for width-only calls, + if possible. -2010-03-11 Chris Liddell + (cf2_interpT2CharString) , , + , , , + , : Exit early for width-only calls. - Fix Savannah bug #27442. +2013-06-06 Werner Lemberg - * src/raster/ftraster.c (ft_black_reset): Fix `buffer_size'. + Next round of compiler fixes. -2010-03-09 Werner Lemberg + * builds/win32/ftdebug.c, builds/wince/ftdebug.c (ft_debug_init): + Add proper cast. + * include/freetype/internal/ftserv.h (FT_SERVICE_UNAVAILABLE): Fix + cast. + * include/freetype/internal/ftstream.h: Decorate stream and frame + macros with `FT_Long' and `FT_ULong' as appropriate. + + * src/base/ftrfork.c (raccess_guess_darwin_hfsplus, + raccess_guess_darwin_newvfs): Use cast. + + * src/bdf/bdflib.c (_bdf_set_default_spacing): Use cast. + + * src/cache/ftcmanag.c (FTC_Manager_Check): Fix cast. + * src/cache/ftcmanag.h (FTC_ManagerRec): Ditto. + + * src/cff/cf2arrst.c (cf2_arrstack_setNum_Elements): Use cast. + * src/cff/cf2ft.c (cf2_freeSeacComponent): Ditto. + * src/cff/cffobjs.c (remove_subset_prefix, remove_style): Ditto. + + * src/cid/cidparse.c (cid_parser_new): Use cast. + + * src/pcf/pcfdrivr.c (PCF_Glyph_Load): Use cast. + + * src/psaux/psobjs.c (reallocate_t1_table): Fix argument type. + + * src/raster/ftraster.c (ft_black_reset): Use cast. + + * src/truetype/ttgxvar.c (FT_Stream_FTell): Use cast. + (ALL_POINTS): Fix cast. + + * src/type1/t1driver.c (t1_ps_get_font_value): Add casts. + * src/type1/t1parse.c (T1_Get_Private_Dict): Add cast. + +2013-06-05 Dave Arnold + + Fix more MSVC Win32 compiler warnings. + + * src/base/ftobjs.c: Fix typo in MS pragma. + + * src/base/bdflib.c (_bdf_set_default_spacing, _bdf_add_property): + `lineno' is only used in debug mode. + + * src/cff/cf2ft.c (cf2_builder_moveTo): `params' is only used in + debug mode. + +2013-06-05 Werner Lemberg + + Fix compiler warnings. + + * include/freetype/internal/ftmemory.h: Decorate memory allocation + macros with `FT_Long' where appropriate. + Remove duplicate of FT_MEM_QRENEW_ARRAY definition. + + * src/base/ftbitmap.c (ft_gray_for_premultiplied_srgb_bgra): Use + cast. + + * src/base/ftobjs.c: Add warning disabling pragma for MSVC while + including `md5.c'. + + * src/cff/cf2intrp.c (cf2_interpT2CharString) : Add + cast. + + * src/sfnt/ttsbit.c (tt_sbit_decoder_load_compound): Fix casts. + (tt_sbit_decoder_load_bitmap): Beautification. + + * src/smooth/ftsmooth.c (ft_smooth_render_generic): Initialize + variables (earlier). + + * src/truetype/ttgload.c (TT_Process_Simple_Glyph): Pacify compiler. + + * src/truetype/ttgxvar.c (TT_Get_MM_Var): Use unsigned constants + where appropriate. + + * src/type1/t1load.c (T1_Get_MM_Var): Ditto. + +2013-06-04 Werner Lemberg + + * src/cff/cf2font.c (cf2_getGlyphWidth): Initialize `advWidth'. + + Problem reported by Ingmar Sittl . + +2013-06-04 Werner Lemberg + + Apply fixes for cppcheck nitpicks. + + http://cppcheck.sourceforge.net/ + + The call was (from the top-level of the FreeType tree): + + cppcheck --force \ + --enable=all \ + -I include \ + -I include/freetype/ \ + -I include/freetype/config/ \ + -I include/freetype/internal/ \ + . &> cppcheck.log + + Note that the current version heavily chokes on FreeType, delivering + many wrong results. I will report those issues to the cppcheck team + so that a newer version gives improved results hopefully. + + */* Improve variable scopes. + */* Remove redundant initializations which get overwritten. + + * src/base/ftmac.c, builds/mac/ftmac.c (count_faces_scalable): Remove unused variable. - Reported by Graham. - - * src/cff/cffparse.c (cff_parse_real): Remove `rest'. - -2010-03-02 John Tytgat - - Improve CFF string (especially glyphname) lookup performance. - - We do this by avoiding memory allocation and file I/O. This is - Savannah patch #7104. - - * src/cff/cfftypes.h: Include PS cmaps service and - FT_INTERNAL_POSTSCRIPT_HINTS_H. - (CFF_SubFontRec): Remove `num_local_subrs'. - (CFF_FontRec): Add `num_strings', `strings', and `string_pool' - fields. - Remove `string_index' and `num_global_subrs' fields. - Use real types instead of `void' for `pshinter' and `psnames' fields. - - * src/cff/cffload.c: Don't include PS cmaps service. - (cff_index_get_pointers): Add `pool' parameter which allows to - insert an extra NUL character for each String INDEX entry. - (cff_index_get_name): Make it a local function. - (cff_index_get_string): New function. - (cff_subfont_load): Updated. - (cff_font_load): Initialize `num_strings', `strings', and - `string_pool' fields in the `CFF_FontRec' structure. - (cff_index_get_sid_string): Use `cff_index_get_string' instead of - `cff_index_get_name'. - (cff_font_done): Updated. - - * src/cff/cffload.h: Don't include PS cmaps service. - (cff_index_get_string): Added. - (cff_index_get_sid_string): Updated. - - * src/cff/cffobjs.c: Don't include PS cmaps service and - FT_INTERNAL_POSTSCRIPT_HINTS_H. - (cff_size_get_globals_funcs, cff_slot_init): Updated. - (cff_face_init): Follow `cff_index_get_name', - `cff_index_get_string', and `cff_index_get_sid_string' changes. - - * src/cff/cffcmap.c (cff_sid_free_glyph_name): Removed. - (cff_sid_to_glyph_name): Use `cff_index_get_cid_string'. - (cff_cmap_unicode_init): Updated. - - * src/cff/cffdrivr.c: Don't include PS cmap service. - (cff_get_glyph_name): Avoid unnecessary lookup for POSTSCRIPT_CMAPS - service. - (cff_get_glyph_name, cff_ps_get_font_info, cff_get_ros): Follow API - `cff_index_get_sid_string' change. - (cff_get_name_index): Use `cff_index_get_string' instead of - `cff_index_get_name'. - - * src/cff/cffgload.c: Don't include FT_INTERNAL_POSTSCRIPT_HINTS_H. - (cff_decoder_init, cff_decoder_prepare): Updated. - -2010-02-27 Werner Lemberg - Simplify code. - Suggested by Behdad. + * src/base/ftdbgmem.c (ft_mem_table_destroy): `table' can't be zero. - * src/base/ftobjs.c (FT_Get_First_Char): Don't use a loop since we - call FT_Get_Next_Char anyway if necessary. + * src/gxvalid/gxvkern.c (gxv_kern_subtable_fmt1_entry_validate): + Remove functionless code. -2010-02-26 Behdad Esfahbod + * src/tools/ftrandom.c (main): Fix memory leak. - Improve handling of invalid glyph indices in char->index functions. +2013-06-03 Werner Lemberg - * src/base/ftobjs.c (FT_Get_First_Char, FT_Get_Next_Char): Use a - loop. + Add CFF_CONFIG_OPTION_OLD_ENGINE configuration option. + + This controls whether the old FreeType CFF engine gets compiled into + FreeType. It is now disabled by default. + + * devel/ftoption.h, include/freetype/config/ftoption.h + (CFF_CONFIG_OPTION_OLD_ENGINE): New macro. + + * src/cff/cffdrivr.c (cff_property_set), src/cff/cffgload.c + (CFF_Operator, cff_argument_counts, cff_builder_add_point, + cff_operator_seac, cff_decoder_parse_charstrings, cff_slot_load), + src/cff/cffgload.h, src/cff/cffobjs.c (cff_driver_init): Use + CFF_CONFIG_OPTION_OLD_ENGINE to guard the affected code. + + * docs/CHANGES: Updated. + +2013-06-02 Werner Lemberg + + Fix PNG library handling. -2010-02-18 Chris Liddell + * builds/unix/configure.raw: Don't use LIBPNG_LIBS but + LIBPNG_LDFLAGS. - Fix Savannah bug #28905. +2013-05-23 Behdad Esfahbod - Initialize phantom points before calling the incremental interface - to update glyph metrics. + Add support for color embedded bitmaps (eg. color emoji). - * src/truetype/ttgload.c (tt_get_metrics_incr_overrides) - [FT_CONFIG_OPTION_INCREMENTAL]: New function, split off from... - (tt_get_metrics): This. + A new load flag, FT_LOAD_COLOR, makes FreeType load color + embedded-bitmaps, following this draft specification + + https://color-emoji.googlecode.com/git/specification/v1.html + + which defines two new SFNT tables, `CBDT' and `CBLC' (named and + modeled after `EBDT' and `EBLC', respectively). The color bitmaps + are stored in the new FT_PIXEL_MODE_BGRA format to represent BGRA + pre-multiplied sRGB images. If PNG support is available, PNG color + images as defined in the same proposed specification are supported + also. + + Note that color bitmaps are converted to grayscale if client didn't + ask for color. + + * builds/unix/configure.raw: Search for libpng. + Add `--without-png' option. + + * devel/ftoption.h, include/freetype/config/ftoption.h + (FT_CONFIG_OPTION_USE_PNG): New macro. + + * include/freetype/freetype.h (FT_LOAD_COLOR): New load flag. + + * include/freetype/ftimage.h (FT_Pixel_Mode): Add + `FT_PIXEL_MODE_BGRA'. + + * include/freetype/tttags.h (TTAG_CBDT, TTAG_CBLC): New tags. + + * src/base/ftbitmap.c (FT_Bitmap_Embolden): Updated. + (ft_gray_for_premultiplied_srgb_bgra): New function. + (FT_Bitmap_Convert): Handle FT_PIXEL_MODE_BGRA. + + * src/sfnt/pngshim.c, src/sfnt/pngshim.h: New files. + + * src/sfnt/sfnt.c: Include `pngshim.c'. + + * src/sfnt/ttsbit.c: Include FT_BITMAP_H and `pngshim.h' + (tt_face_load_eblc): Load `CBLC'. + (tt_sbit_decoder_init): Load `CBDT'. + (tt_sbit_decoder_alloc_bitmap): Pass load flags to select between + color and grayscale bitmaps. + Set `num_grays'. This is used by `ftview' to choose the blending + algorithm. + (tt_sbit_decoder_load_byte_aligned, + tt_sbit_decoder_load_bit_aligned, tt_sbit_decoder_load_compound, + tt_sbit_decoder_load_image): Pass load flag. + s/write/pwrite/. + Don't call `tt_sbit_decoder_alloc_bitmap'. Updated. - (load_truetype_glyph): Use tt_get_metrics_incr_overrides. + (tt_sbit_decoder_load_png) [FT_CONFIG_OPTION_USE_PNG]: New function. + (tt_sbit_decoder_load_bitmap): Pass load flag. + Handle new glyph formats 17, 18, and 19. + Call `tt_sbit_decoder_alloc_bitmap'. + Flatten color bitmaps if necessary. + (tt_face_load_sbit_image): Updated. + + * src/sfnt/rules.mk (SFNT_DRV_SRC): Add `pngshim.c'. + + * docs/CHANGES: Updated. + +2013-05-24 Guenter + + Apply Savannah patch #8055. + + Make `apinames' create an import file for NetWare. + + * src/tools/apinames.c (PROGRAM_VERSION): Set to 0.2. + (OutputFormat): Add `OUTPUT_NETWARE_IMP'. + (names_dump): Handle it. + (usage): Updated. + (main): Handle new command line flag `-wN'. + +2013-05-23 Behdad Esfahbod + + Compilation fix. + + * src/truetype/ttinterp.c (TT_RunIns) + [!TT_CONFIG_OPTION_SUBPIXEL_HINTING]: Make it work. + +2013-05-22 Infinality + + [truetype] Formatting and an additional subpixel tweak. + + * src/truetype/ttinterp.c (Ins_SHPIX): Formatting fix. + * src/truetype/ttsubpix.c (SKIP_NONPIXEL_Y_MOVES_Rules): + Revert previous modification for Verdana clones. + +2013-05-22 Infinality + + [truetype] Adjust subpixel zp2 moves and tweak rules. + + These modifications fix thin diagonal stems in some legacy fonts. + + * src/truetype/ttinterp.c (Direct_Move_X): Remove unused macro. + (Move_Zp2_Point): Don't always disable x moves for subpixel rendering. + (Ins_SHP): Disable x moves here for subpixel rendering. + (Ins_SHPIX): Only disable x moves in compatibility mode. + Split out zp2 move reversals and reorder conditional respectively. + + * src/truetype/ttsubpix.c (SKIP_NONPIXEL_Y_MOVES_Rules): Fix oversight. + Only adjust Verdana clones for 17 ppem. + (SKIP_NONPIXEL_Y_MOVES_Rules_Exceptions): Add Courier New. + (ALWAYS_SKIP_DELTAP_Rules): Found additional cases for Arial `s'. + +2013-05-20 Infinality + + [truetype] Simplify and improve subpixel function detection. + + Some small enhancements have allowed the removal of many macros and + the simplification of existing rules in `ttsubpix.c'. + + * src/truetype/ttsubpix.h (SPH_TWEAK_ALLOW_X_DMOVEX, + SPH_TWEAK_ALLOW_X_MOVE_ZP2, + SPH_TWEAK_DELTAP_SKIP_EXAGGERATED_VALUES, + SPH_TWEAK_SKIP_INLINE_DELTAS, SPH_TWEAK_MIRP_CVT_ZERO): Removed. + (SPH_TWEAK_SKIP_NONPIXEL_Y_MOVES_DELTAP): New rule macro. + + * src/truetype/ttsubpix.c: Updated affected rules. + + * src/truetype/ttinterp.c (Direct_Move_X): Updated. + (INS_FDEF): Add additional function detection. + (INS_ENDF): Set runtime flag. + (Ins_CALL): Skip the call under certain conditions. + Remove bad code. + (Ins_LOOPCALL): Skip the call under certain conditions. + Remove bad code. + (Move_Zp2_Point): Updated. + (Ins_SHPIX): Updated. + Skip the move under some situations. + (Ins_MIAP): Improve conditions. + (Ins_MIRP): Updated. + (Ins_DELTAP): Skip move under certain conditions. + Simplify conditions. + (TT_RunIns): Updated. + Add code to handle new function detection. + Trace messages. + +2013-05-17 Werner Lemberg + + Update more FT_Err_XXX macros using FT_ERR and FT_THROW; + + * builds/amiga/src/base/ftsystem.c, builds/mac/ftmac.c, + builds/unix/ftsystem.c, builds/vms/ftsystem.c: Do it. + +2013-05-15 Werner Lemberg + + [truetype] Add `interpreter-version' property. + + This makes the option TT_CONFIG_OPTION_SUBPIXEL_HINTING controllable + at runtime. + + * include/freetype/ftttdrv.h: New file. + + * include/freetype/config/ftheader.h (FT_TRUETYPE_DRIVER_H): New + macro. + + * src/truetype/ttdriver.c: Include FT_TRUETYPE_DRIVER_H. + (tt_property_set, tt_property_get): Fill templates. + + * src/truetype/ttobjs.h (TT_DriverRec): Add `interpreter_version' + member. + Remove unused `extension_component' member. + + * src/truetype/ttgload.c: Include FT_TRUETYPE_DRIVER_H. + (tt_get_metrics, TT_Hint_Glyph, TT_Process_Simple_Glyph, + compute_glyph_metrics, tt_loader_init): Use `interpreter_version'. + + * src/truetype/ttinterp.c: Include FT_TRUETYPE_DRIVER_H. + (SUBPIXEL_HINTING): New macro to check `interpreter_version' flag. + Update all affected functions to use it. + Use TT_INTERPRETER_VERSION_XXX where appropriate. + + * src/truetype/ttobjs.c: Include FT_TRUETYPE_DRIVER_H. + (tt_driver_init): Initialize `interpreter_version'. + + * src/truetype/ttsubpix.c: Include FT_TRUETYPE_DRIVER_H. + Use TT_INTERPRETER_VERSION_XXX where appropriate. + +2013-05-13 Werner Lemberg + + [truetype] Avoid empty source file. + + * src/truetype/ttsubpix.c [!TT_CONFIG_OPTION_SUBPIXEL_HINTING]: + Provide dummy typedef. + +2013-05-13 Werner Lemberg + + * src/cff/cf2font.c (cf2_getGlyphWidth): Fix uninitialized variable. + + Fix suggested by Vaibhav Nagarnaik . + +2013-05-13 Brian Nixon + + Fix Savannah bug #38970. + + * src/base/ftdebug.c, builds/win32/ftdebug.c, + builds/wince/ftdebug.c, builds/amiga/src/base/ftdebug.c + (ft_debug_init): Don't read past the environment variable FT2_DEBUG. + +2013-05-12 Werner Lemberg + + [truetype] Add framework for TrueType properties. + + * src/truetype/ttdrivr.c: Include FT_SERVICE_PROPERTIES_H. + (tt_property_set, tt_property_get): New functions, still empty. + Define `tt_service_properties' service. + Update `tt_services'. + + * src/truetype/ttpic.h: Include FT_SERVICE_PROPERTIES_H. + (TT_SERVICE_PROPERTIES_GET): New macro. + (TTModulePIC): Add `tt_service_properties'. + +2013-05-12 Werner Lemberg + + Fix Savannah bug #38967. + + * src/base/ftcalc.c (FT_DivFix) [FT_LONG64]: Fix cast. + +2013-05-12 Werner Lemberg + + Introduce unsigned 64bit type (if available). + + * include/freetype/config/ftconfig.h: Define FT_UINT64 if available. + [FT_LONG64]: Provide FT_UInt64. + + * builds/unix/ftconfig.in: Synchronized. + +2013-05-12 Werner Lemberg + + Fix Savannah bug #38968. + + * include/freetype/ftmodapi.h: Add `FT_EXPORT' to + FT_Property_{Set,Get}. + * src/base/ftobjs.c: Add `FT_EXPORT_DEF' to + FT_Property_{Set,Get}. + +2013-05-10 Werner Lemberg + + [sfnt] Clean up bitmap code. + + * src/sfnt/ttsbit.c: Deleted. + * src/sfnt/ttsbit0.c: Renamed to `ttsbit.c'. + * rules.mk (SFNT_DRV_H): Updated. + +2013-05-10 Werner Lemberg + + */* [FT_CONFIG_OPTION_OLD_INTERNALS]: Remove macro and guarded code. ---------------------------------------------------------------------------- -Copyright 2010-2012 by +Copyright 2013-2014 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/ChangeLog.21 b/ChangeLog.21 index d6371d1..300a094 100644 --- a/ChangeLog.21 +++ b/ChangeLog.21 @@ -6260,7 +6260,7 @@ Adding a new API `FT_Get_BDF_Property' to retrieve the BDF properties of a given PCF or BDF font. - * include/freetype/ftbdf.h (FT_PropertyType): New enumeration. + * include/freetype/ftbdf.h (BDF_PropertyType): New enumeration. (BDF_Property, BDF_PropertyRec): New structure. FT_Get_BDF_Property): New function. * include/freetype/internal/bdftypes.h: Include FT_BDF_H. diff --git a/ChangeLog.23 b/ChangeLog.23 index bc46c84..1a23848 100644 --- a/ChangeLog.23 +++ b/ChangeLog.23 @@ -6668,7 +6668,7 @@ 2007-01-10 Derek Clegg - * src/type1/t1load.c (T1_Get_MM_Var): Always return fixed point + * src/type1/t1load.c (T1_Get_MM_Var): Always return fixed-point values. 2007-01-08 David Turner diff --git a/ChangeLog.24 b/ChangeLog.24 new file mode 100644 index 0000000..01eb3b7 --- /dev/null +++ b/ChangeLog.24 @@ -0,0 +1,6360 @@ +2013-05-08 Werner Lemberg + + * Version 2.4.12 released. + ========================== + + + Tag sources with `VER-2-4-12'. + + * docs/VERSION.DLL: Update documentation and bump version number to + 2.4.12. + + * README, Jamfile (RefDoc), + builds/win32/vc2005/freetype.vcproj, builds/win32/vc2005/index.html, + builds/win32/vc2008/freetype.vcproj, builds/win32/vc2008/index.html, + builds/win32/vc2010/freetype.vcxproj, builds/win32/vc2010/index.html, + builds/win32/visualc/freetype.dsp, + builds/win32/visualc/freetype.vcproj, + builds/win32/visualc/index.html, builds/win32/visualce/freetype.dsp, + builds/win32/visualce/freetype.vcproj, + builds/win32/visualce/index.html, + builds/wince/vc2005-ce/freetype.vcproj, + builds/wince/vc2005-ce/index.html, + builds/wince/vc2008-ce/freetype.vcproj, + builds/wince/vc2008-ce/index.html: s/2.4.11/2.4.12/, s/2411/2412/. + + * include/freetype/freetype.h (FREETYPE_PATCH): Set to 12. + + * builds/unix/configure.raw (version_info): Set to 16:1:10. + +2013-05-08 Werner Lemberg + + * docs/CHANGES: Updated. + +2013-05-08 Werner Lemberg + + * src/autofit/aflatin.c (af_latin_metrics_scale_dim): Typo. + +2013-05-05 Werner Lemberg + + Synchronize `ftconfig.h'. + + * builds/unix/ftconfig.in: Updated. + +2013-05-05 Werner Lemberg + + Fix compilation with C++. + + * src/base/md5.c (body): Use proper cast. + +2013-05-05 Werner Lemberg + + Fix 64bit compilation issues. + + * include/freetype/config/ftconfig.h [FT_LONG64]: Typedef + `FT_Int64' here. + + * src/base/ftcalc.c: Remove typedef of `FT_Int64'. + (FT_DivFix): Fix cast. + * src/base/fttrigon.c: Remove typedef of `FT_Int64'. + +2013-05-05 Werner Lemberg + + [raster] Fix clang issues. + + Fix suggested by . + + * src/raster/ftraster.c (ULong): New typedef. + (SCALED): Add proper cast. + +2013-05-04 Werner Lemberg + + Fix clang fixes. + + * src/base/fttrigon.c (ft_trig_prenorm, FT_Vector_Rotate): Use + correct types. + + * src/cff/cf2intrp.c (cf2_interpT2CharString) : Force + unsigned for computations. + * src/cff/cffgload.c (cff_decoder_parse_charstrings): Ditto. + * src/cff/cffparse.c (cff_parse_integer): Ditto. + + * src/psaux/t1decode.c (t1_decoder_parse_charstrings): Ditto. + +2013-05-04 Werner Lemberg + + [cff] Make Adobe CFF engine work correctly on 64bit hosts. + + Reported by numerous people on the `freetype-devel' list. Without + this fix, glyphs aren't properly aligned on a common baseline. + + On 64bit systems, `FT_Pos' expands to `long int', having a width of + 64bit. `CF2_Fixed' expands to `int' which is normally 32bit wide on + 64bit hosts also. Wrong casts filled up the blues arrays with + incorrect values. Note that all blues values are accessed with the + `cf2_blueToFixed' macro which handles the 64bit to 32bit conversion. + + * src/cff/cf2ft.h (cf2_getBlueValues, cf2_getOtherBlues, + cf2_getFamilyBlues, cf2_getFamilyOtherBlues): Use `FT_Pos' for + `data', not `CF2_Fixed'. + * src/cff/cf2ft.c (cf2_getBlueValues, cf2_getOtherBlues, + cf2_getFamilyBlues, cf2_getFamilyOtherBlues): Updated. + * src/cff/cf2blues.c (cf2_blues_init): Updated. + +2013-05-04 Werner Lemberg + + More fixes for clang's `sanitize' feature. + + * src/base/ftcalc.c (FT_DivFix): Use unsigned values for + computations which use the left shift operator and convert to signed + as the last step. + * src/base/fttrigon.c (ft_trig_prenorm, FT_Vector_Rotate, + FT_Vector_Length, FT_Vector_Polarize): Ditto. + + * src/cff/cffgload.c (cff_decoder_parse_charstrings): Simplify. + * src/cff/cffload.c (cff_subfont_load): Fix constant. + * src/cff/cffparse.c (cff_parse_integer, cff_parse_real, do_fixed, + cff_parse_fixed_dynamic): Use unsigned values for computations which + use the left shift operator and convert to signed as the last step. + + * src/cid/cidload.c (cid_get_offset): Ditto. + + * src/psaux/psconv.c (PS_Conv_ToFixed): Ditto. + * src/psaux/t1decode.c (t1_decoder_parse_charstrings): Ditto. + + * src/truetype/ttinterp.c (TT_MulFix14, TT_DotFix14): Ditto. + +2013-05-04 Werner Lemberg + + Fix errors reported by clang's `sanitize' feature. + + * include/freetype/internal/ftstream.h: Simplify and fix integer + extraction macros. + (FT_INT8_, FT_BYTE_I16, FT_BYTE_I32, FT_INT8_I16, FT_INT8_I32, + FT_INT8_I32, FT_INT8_U32): Removed. + (FT_PEEK_SHORT, FT_PEEK_LONG, FT_PEEK_OFF3, FT_PEEK_SHORT_LE, + FT_PEEK_LONG_LE, FT_PEEK_OFF3_LE): Use unsigned values for + computations and convert to signed as the last step. + + * src/cff/cf2fixed.h (cf2_intToFixed, cf2_fixedToInt, + cf2_fracToFixed): Avoid shifts of negative values. + (cf2_intToFrac, cf2_fixedToFrac, cf2_fixedTo26Dot6): Removed, + unused. + + * src/cff/cf2intrp.c (cf2_interpT2CharString) : Use unsigned values for computations and convert to signed + as the last step. + Use proper types in tracing messages. + + * src/cff/cffgload.c (cff_decoder_parse_charstrings): Use unsigned + values for computation of operands and convert to signed as the last + step. + Use proper type in tracing message. + +2013-05-03 Werner Lemberg + + * src/cff/cf2blues.c: Remove dead code. + +2013-05-02 Chris Liddell + + * src/cff/cffgload.c: Include FT_CFF_DRIVER_H. + +2013-04-27 Werner Lemberg + + * docs/CHANGES: Updated. + * README: Improved. + +2013-04-13 Werner Lemberg + + [cff] Add a new Type 2 interpreter and hinter. + + This work, written by Dave Arnold and fully + integrated into FreeType by me, is a donation by Adobe in + collaboration with Google. It is vastly superior to the old CFF + engine, and it will replace it soon. Right now, it is still off by + default, and you have to explicitly select it using the new + `hinting-engine' property of the cff driver. + + For convenience, (most of) the new files are committed separately. + + * include/freetype/config/ftheader.h (FT_CFF_DRIVER_H): New macro. + * include/freetype/ftcffdrv.h: New file to access CFF driver + properties. + * include/freetype/fterrdef.h (FT_Err_Glyph_Too_Big): New error + code. + * include/freetype/internal/fttrace.h: Add `cf2blues', `cf2hints', + and `cf2interp'. + + * src/cff/cffgload.h (CFF_SubFont): New member `current_subfont'. + * src/cff/cffobjs.h (CFF_DriverRec): New members `hinting_engine' + and `no_stem_darkening'. + * src/cff/cfftypes.h (CFF_FontRec): New member `cf2_instance'. + + * src/cff/cff.c: Include new files. + * src/cff/cffdrivr.c (cff_property_set, cff_property_get): Handle + `hinting-engine' and `no-stem-darkening' properties (only the Adobe + engine listens to them). + * src/cff/cffgload.c: Include `cf2ft.h'. + (cff_decoder_prepare): Initialize `current_subfont'. + (cff_build_add_point): Handle Adobe engine which uses 16.16 + coordinates. + (cff_slot_load): Handle FT_LOAD_NO_SCALE and FT_LOAD_NO_HINTING + separately. + Choose rendering engine based on `hinting_engine' property. + * src/cff/cffload.c (cff_font_done): Call finalizer of the Adobe + engine. + * src/cff/cffobjs.c: Include FT_CFF_DRIVER_H. + (cff_driver_init): Set default property values. + + * src/cff/rules.mk (CFF_DRV_SRC, CFF_DRV_H): Add new files. + + * src/cff/cf2*.*: New files, containing the Adobe engine. + +2013-04-12 Werner Lemberg + + [cff] Minor code administration issues. + + * src/cff/cffgload.c (check_points): Rename to... + (cff_check_points): ...this and make it FT_LOCAL. + (cff_builder_add_point, cff_builder_add_point1, + cff_builder_start_point, cff_builder_close_contour, + cff_lookup_glyph_by_stdcharcode, cff_get_glyph_data, + cff_free_glyph_data): Make them FT_LOCAL. + + * src/cff/cffgload.h: Updated. + +2013-04-12 Werner Lemberg + + Add output bitmap checksums. + + Use `FT2_DEBUG=bitmap:3' for tracing. + + * src/base/md5.c, src/base/md5.h: New files, taken from + + http://openwall.info/wiki/people/solar/software/public-domain-source-code/md5 + + * include/freetype/internal/fttrace.h: Add `bitmap'. + + * src/base/ftobjs.c [FT_DEBUG_LEVEL_TRACE]: Include `md5.c' + + (FT_Render_Glyph_Internal) [FT_DEBUG_LEVEL_TRACE]: For tracing, + convert resulting bitmap to a uniform format and compute a checksum. + Use `bitmap' category for the tracing message. + + * src/base/rules.mk (BASE_H): Updated. + + * docs/LICENSE.TXT: Updated. + +2013-04-12 Werner Lemberg + + [cff] Add framework for CFF properties. + + * include/freetype/internal/ftserv.h (FT_DEFINE_SERVICEDESCREC7): + New macro. + + * src/cff/cffdrivr.c: Include FT_SERVICE_PROPERTIES_H. + (cff_property_set, cff_property_get): New functions, still empty. + Define `cff_service_properties' service. + Update `cff_services'. + + * src/cff/cffpic.h: Include FT_SERVICE_PROPERTIES_H. + (CFF_SERVICE_PROPERTIES_GET): New macro. + (CffModulePIC): Add `cff_service_properties'. + +2013-04-03 Werner Lemberg + + [bdf] Fix Savannah bug #38589. + + * src/bdf/bdflib.c (_bdf_readstream): Thinko. + +2013-03-31 Werner Lemberg + + * configure: Use egrep, not grep. + + Problem reported Mojca Miklavec . + +2013-03-29 Werner Lemberg + + * include/freetype/ftlcdfil.h: Add description of color filtering. + + Based on a contribution from Antti S. Lankila + (Savannah bug #38607). + +2013-03-23 Werner Lemberg + + [autofit] Minor. + + * src/autofit/afmodule.c (af_property_set): Typo. + (af_autofitter_init, af_autofitter_done): Use cast. + +2013-03-21 Werner Lemberg + + * configure: Automatically test for `gmake' also. + + Suggested by Mojca Miklavec . + +2013-03-21 Peter Breitenlohner + + Respect CONFIG_SHELL from the environment. + + Some large packages using FreeType have to use a broken (deficient) + /bin/sh. The configure scripts (as generated by Autoconf) are + clever enough to find a better shell and put that one into the + environment variable CONFIG_SHELL. If that environment variable is + already set the script skips the test and assumes to be already + running under a good shell. + + * builds/unix/detect.mk: Honour CONFIG_SHELL. + * builds/unix/unix-def.in (SHELL): Define. + +2013-03-21 Werner Lemberg + + Fix Savannah patch #7971. + + * configure: Handle MAKE environment variable also. + +2013-03-17 Werner Lemberg + + Fix Savannah bug #38538. + + * builds/amiga/src/base/ftdebug.c, builds/win32/ftdebug.c, + builds/wince/ftdebug.c (FT_Throw): Add function. + +2013-03-17 Werner Lemberg + + [raster] Remove dead code. + + * src/raster/rastpic.c (ft_raster1_renderer_class_pic_init) + src/smooth/ftspic.c (ft_smooth_renderer_class_pic_init): Do it. + +2013-03-17 Werner Lemberg + + * src/pshinter/pshpic.h (GET_PIC): Use correct container. + +2013-03-15 Werner Lemberg + + * include/freetype/ftmoderr.h: Fix commit from 2013-03-11. + + The previous version was not backwards compatible. Reported by + Behdad. + +2013-03-14 Werner Lemberg + + */*: Use FT_ERR_EQ, FT_ERR_NEQ, and FT_ERR where appropriate. + + FT_Err_XXX and friends are no longer directly used in the source + code. + +2013-03-14 Werner Lemberg + + New error management macros. + + * include/freetype/fterrors.h (FT_ERR_XCAT, FT_ERR_CAT): Move to... + * include/freetype/fttypes.h: ... this file. + (FT_ERR, FT_ERR_EQ, FT_ERR_NEQ, FT_MODERR_EQ, FT_MODERR_NEQ): New + macros. + + * include/freetype/freetype.h: Updated. + +2013-03-14 Werner Lemberg + + */*: Use FT_Err_Ok only. + + This is a purely mechanical conversion. + +2013-03-14 Werner Lemberg + + */*: Use `FT_THROW'. + + This is essentially a mechanical conversion, adding inclusion of + `FT_INTERNAL_DEBUG_H' where necessary, and providing the macros for + stand-alone compiling modes of the rasterizer modules. + + To convert the remaining occurrences of FT_Err_XXX and friends it is + necessary to rewrite the code. Note, however, that it doesn't harm + if some cases are not handled since FT_THROW is a no-op. + +2013-03-13 Werner Lemberg + + Introduce `FT_THROW' macro. + + The idea is to replace code like + + return FT_Err_Foo_Bar; + + or + + return CFF_Err_Foo_Bar; + + with + + return FT_THROW( Foo_Bar ); + + The FT_THROW macro has two functions: + + . It hides the module specific prefix. + + . In debug mode, it calls the empty function `FT_Throw' which can + be thus used to set a breakpoint. + + * include/freetype/internal/ftdebug.h (FT_THROW): New macro. + (FT_Throw): New prototype. + * src/base/ftdebug.c (FT_Throw): New function. + +2013-03-12 Werner Lemberg + + Remove `FT_KEEP_ERR_PREFIX'. + + The idea is to always have FT_ERR_PREFIX available internally. + + * include/freetype/fterrors.h: Use FT2_BUILD_LIBRARY to guard + undefinition of FT_ERR_PREFIX + + * src/gxvalid/gxverror.h, src/otvalid/otverror.h, + src/sfnt/sferrors.h: Updated. + +2013-03-11 Werner Lemberg + + [gxvalid] Fix module error. + + * src/gxvalid/gxverror.h (FT_ERR_BASE): Define as + FT_Mod_Err_GXvalid. + * include/freetype/ftmoderr.h: Add module error for `GXvalid'. + +2013-03-11 Werner Lemberg + + Always use module related error codes. + + * src/cff/cffobjs.c (cff_face_init), src/type1/t1objs.c + (T1_Face_Init), src/type42/t42objs.c (T42_Face_Init): Use + `FT_ERROR_BASE'. + + * src/type1/t1load.c (parse_encoding): Use + T1_Err_Unknown_File_Format. + +2013-03-08 Werner Lemberg + + [cff] Set `linear{Hori,Vert}Advance' for embedded bitmaps also. + + Problem reported by Khaled Hosny . + + * src/cff/cffgload.c (cff_slot_load): Implement it. + +2013-02-23 Alexei Podtelezhnikov + + [base] Fix commit ab02d9e8. + + * src/base/ftbbox.c (BBox_Cubic_Check): Change scaling to msb of 22. + +2013-02-19 Alexei Podtelezhnikov + + [base] New bisecting BBox_Cubic_Check (disabled). + + * src/base/ftbbox.c (BBox_Cubic_Check): New bisecting algorithm + for extremum search built around simple condition that defines + which half contains the extremum. + +2013-02-18 Alexei Podtelezhnikov + + [tools] Update BBox testing tool. + + * src/tools/test_bbox.c: Add another cubic outline with exact BBox. + (REPEAT): Increase the number of benchmarking cycles. + (profile_outline): Tweak output formatting. + +2013-02-02 Werner Lemberg + + Fix Savannah bug #38235. + + * builds/unix/configure.raw: Don't generate `freetype-config' and + `freetype.pc'. + + * builds/unix/unix-def.in (FT2_EXTRA_LIBS, LIBBZ2, LIBZ, + build_libtool_libs, ft_version): New variables to be substituted. + (freetype-config, freetype.pc): New rules to generate those files. + + * builds/unix/freetype-config.in: Remove code for handling `rpath'. + The use of $rpath has been accidentally removed in a patch from + 2009-12-22, and apparently noone has missed it since. + Use `%' instead of `@' as a variable substitution marker. + Use quotes. + + * builds/unix/freetype.in: Use `%' instead of `@' as a variable + substitution marker. + Use quotes. + +2013-02-07 Werner Lemberg + + * src/truetype/ttobjs.c (tt_size_run_prep): Reset more GS variables. + + BTW, Greg agrees that the OpenType specification is missing the list + of GS variables which will always be reset to the default values + after the `prep' table has been executed. + +2013-02-06 Werner Lemberg + + * src/truetype/ttobjs.c (tt_size_run_prep): Reset reference points. + + Up to now, we simply took a snapshot of the Graphics State after the + `prep' table has been executed, and right before a glyph's bytecode + was run it got reloaded. However, as Greg Hitchcock has told us in + private communication, reference points get reset to zero in the MS + rasterizer and we follow in due course. While reasonable, this is + undocumented behaviour. + + Most notably, this fixes the rendering of Arial's `x' glyph in + subpixel hinting mode. + +2013-02-05 Werner Lemberg + + [truetype] A better fix for Savannah bug #38211. + + * src/truetype/ttinterp.c (Ins_IP): Implement identical behaviour to + MS rasterizer if rp1 == rp2 (confirmed by Greg Hitchcock). + +2013-02-01 Alexei Podtelezhnikov + + [pcf] Streamline parsing of PCF encoding table. + + * src/pcf/pcfread.c (pcf_get_encodings): Use simpler double for-loop. + Reallocate array instead of using temporary storage. + +2013-02-01 Werner Lemberg + + Fix Savannah bug #38227. + + * builds/unix/freetype-config.in: Set LC_ALL. + +2013-02-01 Werner Lemberg + + Fix Savannah bug #38221. + + This complements commit 83c0ebab. + + * src/base/ftcalc.c (FT_MulDiv_No_Round): Don't enclose with + `TT_USE_BYTECODE_INTERPRETER'. + +2013-02-01 Werner Lemberg + + [truetype] Fix Savannah bug #38211. + + * src/truetype/ttinterp.c (Ins_IP): Make FreeType behave identical + to other interpreters if rp1 == rp2 (which is invalid). + +2013-01-28 Alexei Podtelezhnikov + + [base] Small optimization of BBox calculation. + + * src/base/ftbbox.c (BBox_Cubic_Check): Use FT_MSB function in + scaling algorithm. + +2013-01-26 Infinality + + [truetype] Minor formatting fix. + + * src/truetype/ttinterp.c: Updated. + (DO_RS): Fix indentation. + +2013-01-26 Infinality + + [truetype] Fix rasterizer_version logic in sph. + + * src/truetype/ttsubpix.c: Updated. + (ALWAYS_SKIP_DELTAP_Rules): Remove rule for Trebuchet MS. + (sph_set_tweaks): Fix `rasterizer_version' logic. + +2013-01-26 Infinality + + [truetype] Align more to ClearType whitepaper for sph. + + * include/freetype/internal/tttypes.h (TT_FaceRec): Add flags + for detected opcode patterns and compatibility mode. + + * src/truetype/ttgload.c (tt_loader_init): Complete conditional. + + * src/truetype/ttinterp.c: Updated. + Remove SPH_DEBUG and replace with FT_TRACE7. + (DO_RS): More conditions. + (Ins_FDEF): Add more opcode detection patterns. + More specific conditions when flagging an fdef. + Make compatibility mode only turn on when delta fdefs are found. + (Ins_CALL, Ins_LOOPCALL): Set flags for currently executed fdef. + (Ins_SHPIX): Remove logic to handle ttfautohinted fonts. + Simplify conditionals where possible. + Use `&' instead of `%' operator for dumb compilers. + (Ins_MIAP): Adjust twilight zone conditional. + Ensure `ignore_x_mode' is on when testing sph conditionals. + (Ins_MIRP): Ensure `ignore_x_mode' is on when testing sph + conditionals. + Do cvt cutin always when `ignore_x_mode' is active. + Remove test for ttfautohinted fonts. + (Ins_DELTAP): Ensure `ignore_x_mode' is on when testing sph + conditionals. + Do cvt cutin always when `ignore_x_mode' is active. + Remove test for ttfautohinted fonts. + Use `&' instead of `%' operator for dumb compilers. + (Ins_GETINFO): Remove SPH_DEBUG and replace with FT_TRACE7. + + * src/truetype/ttinterp.h: Updated. + (TT_ExecContextRec): Remove compatibility_mode variable. + Add variable to indicate when executing in special fdefs for sph. + + * src/truetype/ttobjs.h: Updated. + (TT_DefRecord): Add flags to identify special fdefs for sph. + (TT_SizeRec): Remove unnecessary ttfautohinted variable. + + * src/truetype/ttsubpix.c: Updated. + (COMPATIBILITY_MODE_Rules): Remove all. Auto-detected now. + (PIXEL_HINTING_Rules): Remove all. Unnecessary after fixes. + (SKIP_NONPIXEL_Y_MOVES_Rules): Remove Ubuntu. + (SKIP_NONPIXEL_Y_MOVES_Rules_Exceptions): Add Arial Bold `N'. + (SKIP_OFFPIXEL_Y_MOVES_Rules): Remove all. Happens automatically + now. + (ROUND_NONPIXEL_Y_MOVES_Rules): Remove Ubuntu. + (ROUND_NONPIXEL_Y_MOVES_Rules_Exceptions): Remove all. + (NORMAL_ROUND_Rules): Remove Verdana. + (NO_DELTAP_AFTER_IUP_Rules): Remove all. + (sph_set_tweaks): Performance fix. Don't run prep always. + Adjust conditional for sph_compatibility_mode. + + * src/truetype/ttsubpix.h: Add new fdef flags for sph. + +2013-01-23 Alexei Podtelezhnikov + + [base] Fix broken emboldening at small sizes. + + * src/base/ftoutln.c (FT_Outline_EmboldenXY): Do not attempt to + normalize zero-length vectors. + +2013-01-25 Werner Lemberg + + Fix Savannah bug #38167. + + This fixes commit 83c0ebab from 2012-06-27. + + * src/truetype/ttinterp.h: + s/TT_CONFIG_OPTION_BYTECODE_INTERPRETER/TT_USE_BYTECODE_INTERPRETER/. + +2013-01-25 Xi Wang + + [sfnt] Fix broken pointer overflow checks. + + Many compilers such as gcc and clang optimize away pointer overflow + checks `p + n < p', because pointer overflow is undefined behavior. + Use a safe form `n > p_limit - p' instead. + + Also avoid possible integer overflow issues, for example, using + `num_glyphs > ( p_limit - p ) / 2' rather than `num_glyphs * 2' + given a large `num_glyphs'. + + * src/sfnt/ttsbit0.c (tt_sbit_decoder_load_image): Implement it. + +2013-01-25 Werner Lemberg + + [base] Fix `make multi'. + + * src/base/ftoutln.c, src/base/fttrigon.c: Include + FT_INTERNAL_CALC_H. + +2013-01-25 David 'Digit' Turner + + [truetype] Fix C++ compilation. + + * src/truetype/ttsubpix.h: Updated. + (SPH_X_SCALING_RULES_SIZE): Moved and renamed to... + * src/truetype/ttsubpix.c (X_SCALING_RULES_SIZE): This. + (sph_X_SCALING_Rules): Removed. + (scale_test_tweak): Make function static. + (sph_test_tweak_x_scaling): New function. + + * src/truetype/ttgload.c (TT_Process_Simple_Glyph): Updated. + +2013-01-23 Werner Lemberg + + [base] Make `FT_Hypot' really internal. + + * include/freetype/fttrigon.h (FT_Hypot): Move to... + * include/freetype/internal/ftcalc.h: This file. + + * src/base/fttrigon.c (FT_Hypot): Move to... + * src/base/ftcalc.c: This file. + Include FT_TRIGONOMETRY_H. + + * src/truetype/ttgload.c: Don't include FT_TRIGONOMETRY_H. + +2013-01-23 Werner Lemberg + + [truetype] Revert change from 2013-01-22. + + FreeType's `height' value is the baseline-to-baseline distance... + + * src/truetype/ttobjs.c (tt_size_reset): Undo. + +2013-01-23 Alexei Podtelezhnikov + + [base, truetype] New internal `FT_Hypot' function. + + * include/freetype/fttrigon.h (FT_Hypot): Declare it. + * src/base/fttrigon.c (FT_Hypot): Define it. + * src/truetype/ttgload.c (TT_Process_Composite_Component): Use it + instead of explicit expressions. + * src/truetype/ttinterp.c (Current_Ratio, Normalize): Use it instead + of TT_VecLen. + (TT_VecLen): Removed. + +2013-01-23 Alexei Podtelezhnikov + + [base] Fix integer overflow. + + * src/base/ftoutln.c (FT_Outline_EmboldenXY): Normalize incoming and + outgoing vectors and use fixed point arithmetic. + +2013-01-23 Alexei Podtelezhnikov + + [base] Fix integer overflow. + + * src/base/ftoutln.c (FT_Outline_Get_Orientation): Scale the + coordinates down to avoid overflow. + +2013-01-23 Alexei Podtelezhnikov + + [base] Split out MSB function. + + * src/base/fttrigon.c (ft_trig_prenorm): Borrow from here. + * include/freetype/internal/ftcalc.h (FT_MSB): Declare here. + * src/base/ftcalc.c (FT_MSB): Define here. + +2013-01-22 Werner Lemberg + + [truetype] Fix font height. + + * src/truetype/ttobjs.c (tt_size_reset): The Windows rendering + engine uses rounded values of the ascender and descender to compute + the TrueType font height. + +2013-01-16 Behdad Esfahbod + + [sfnt] Fix optimized sbit loader. + + It was not taking bit_depth into consideration when blitting! + + * src/sfnt/ttsbit0.c (tt_sbit_decoder_load_byte_aligned, + * tt_sbit_decoder_load_bit_aligned): Handle bit + depth. + +2013-01-16 David 'Digit' Turner + + [truetype] Improve sub-pixel code. + + This patches fixes many issues with the ttsubpix implementation. + + 1. Data tables are defined, instead of declared, in the header, and + thus copied into each source file that includes it. + + 2. These tables were defined as global, mutable, visible variables, + and thus costing private RAM to every process that loads the + library (> 50 KB / process, this is huge!). + + Additionally, this also made the library export the symbols + completely needlessly. + + 3. Missing `sph_' and `SPH_' prefixes to some of the definitions. + + Note that this doesn't try to fix the incredibly inefficient storage + format for the data tables used by the code. This one will require + another pass in the future. + + * src/truetype/ttinterp.h (MAX_NAME_SIZE, MAX_CLASS_MEMBERS): + Renamed to... + (SPH_MAX_NAME_SIZE, SPH_MAX_CLASS_MEMBERS): This. + Update all users. + + (SPH_TweakRule, SPH_ScaleRule): Decorate with `const' where + appropriate. + + (Font_Class): Rename to... + (SPH_Font_Class): This. Decorate with `const' where appropriate. + + * src/truetype/ttsubpix.h (scale_test_tweak, sph_test_tweak): + Decorate arguments with `const' where appropriate. + + Move font tweaking tables to... + + * src/truetype/ttsubpic.c: This file and decorate them with `static' + and `const' where appropriate. + + (X_SCALING_Rules, X_SCALING_RULES_SIZE): Renamed to... + (spu_X_SCALING_Rules, SPH_X_SCALING_RULES_SIZE): This. + Update all users. + +2013-01-12 Alexei Podtelezhnikov + + [truetype] Improve accuracy of normalization of short vectors. + + Unit vector components are stored as 2.14 fixed-point numbers. In + order to calculate all 14 bits accurately, a short vector to be + normalized has to be upscaled to at least 14 bits before its length + is calculated. This has been safe since accurate CORDIC algorithms + were adopted. + + * src/truetype/ttinterp.c (Normalize): Scale short vectors by 0x4000. + +2013-01-12 Alexei Podtelezhnikov + + [truetype] Kill very old vector normalization hacks. + + Back in the days, vector length calculations were not very accurate + and the vector normalization function, Normalize, had to meticulously + correct the errors for long vectors [commit b7ef2b096867]. It was no + longer necessary after accurate CORDIC algorithms were adopted, but + the code remained. It is time to kill it. + + * src/truetype/ttinterp.c (Normalize): Remove error compensation. + (TT_VecLen): Remove any mention of old less accurate implementation. + +2013-01-11 Werner Lemberg + + Disable FT_CONFIG_OPTION_OLD_INTERNALS. + + After the next release we are going to remove the code completely. + + * devel/ftoption.h, include/freetype/config/ftoption.h + (FT_CONFIG_OPTION_OLD_INTERNALS): Comment out. + * docs/CHANGES: Document it. + +2013-01-10 Alexei Podtelezhnikov + + [base] Update the overflow protection bit. + + The recent optimizations of CORDIC iterations drastically reduce the + expansion factor. Vector components with MSB of 29 are now safe + from overflow. + + * src/base/fttrigon.c (FT_TRIG_SAFE_MSB): New macro. + (ft_trig_prenorm): Use it and remove dead code. + +2013-01-09 Alexei Podtelezhnikov + + [base, pshinter] Use FT_ABS, FT_MIN, and FT_MAX for readability. + + * src/base/ftbbox.c: Updated. + * src/base/ftobjs.c: Updated. + * src/base/fttrigon.c: Updated. + * src/pshinter/pshalgo.c: Updated. + * src/pshinter/pshrec.c: Updated. + +2013-01-08 Alexei Podtelezhnikov + + [base] Clean up trigonometric core. + + * src/base/fttrigon.c: Document the algorithm in a large comment. + (FT_TRIG_COSCALE): Remove macro. + (FT_Tan: Use `FT_TRIG_SCALE' instead. + (FT_Cos, FT_Vector_Unit): Ditto and round the return values. + +2013-01-02 Alexei Podtelezhnikov + + [base] Use rounding in CORDIC iterations. + + * src/base/fttrigon.c (ft_trig_pseudo_rotate, + ft_trig_pseudo_polarize): Improve accuracy by rounding. + +2013-01-02 Alexei Podtelezhnikov + + [base] Reduce trigonometric algorithms. + + After we get within 45 degrees by means of true 90-degree rotations, + we can remove initial 45-degree CORDIC iteration and start from + atan(1/2) pseudorotation, reducing expansion factor thereby. + + * src/base/fttrigon.c (FT_TRIG_SCALE, FT_TRIG_COSCALE): Update macros. + (ft_trig_pseudo_rotate, ft_trig_pseudo_polarize): Update. + + * src/tools/cordic.py: Bring up to date with trigonometric core. + + * docs/CHANGES: Old typo. + +2013-01-02 Alexei Podtelezhnikov + + * src/pshinter/pshalgo.h: Remove unused code. + +2012-12-27 Werner Lemberg + + * src/truetype/ttgload.c (tt_loader_init): Add more tracing. + +2012-12-23 Werner Lemberg + + [type1] Fix handling of /FontBBox in MM fonts. + Problem reported by Del Merritt + + If we have + + /FontBBox { { 11 12 13 14 15 16 17 18 } + { 21 22 23 24 25 26 27 28 } + { 31 32 33 34 35 36 37 38 } + { 41 42 43 44 45 46 47 48 } } + + in the /Blend dictionary, then the first BBox is { 11 21 31 41 }, + the second { 12 22 32 42 }, etc. + + * include/freetype/internal/psaux.h (T1_FieldType): Add + `T1_FIELD_TYPE_MM_BBOX' (for temporary use). + + * src/psaux/psobjs.c (ps_parser_load_field) : + Implement it. + +2012-12-21 Alexei Podtelezhnikov + + * src/tools/cordic.py: Bring up to date with trigonometric core. + +2012-12-21 Werner Lemberg + + Check parameters of `FT_Outline_New'. + Problem reported by Robin Watts . + + * src/base/ftoutln.c (FT_Outline_New_Internal): Ensure that + `numContours' and `numPoints' fit into FT_Outline's `n_points' and + `n_contours', respectively. + +2012-12-20 Werner Lemberg + + * Version 2.4.11 released. + ========================== + + + Tag sources with `VER-2-4-11'. + + * docs/CHANGES, docs/release: Updated. + + * docs/VERSION.DLL: Update documentation and bump version number to + 2.4.11. + + * README, Jamfile (RefDoc), + builds/win32/vc2005/freetype.vcproj, builds/win32/vc2005/index.html, + builds/win32/vc2008/freetype.vcproj, builds/win32/vc2008/index.html, + builds/win32/vc2010/freetype.vcxproj, builds/win32/vc2010/index.html, + builds/win32/visualc/freetype.dsp, + builds/win32/visualc/freetype.vcproj, + builds/win32/visualc/index.html, builds/win32/visualce/freetype.dsp, + builds/win32/visualce/freetype.vcproj, + builds/win32/visualce/index.html, + builds/wince/vc2005-ce/freetype.vcproj, + builds/wince/vc2005-ce/index.html, + builds/wince/vc2008-ce/freetype.vcproj, + builds/wince/vc2008-ce/index.html: s/2.4.10/2.4.11/, s/2410/2411/. + + * include/freetype/freetype.h (FREETYPE_PATCH): Set to 11. + + * builds/unix/configure.raw (version_info): Set to 16:0:10. + + * builds/toplevel.mk (dist): Don't include `.mailmap'. + +2012-12-20 Alexei Podtelezhnikov + + [base] Improve trigonometric core. + + FreeType used to rely on a 24-step iteration CORDIC algorithm to + calculate trigonometric functions and rotate vectors. It turns out + that once the vector is in the right half-plane, the initial rotation + by 63 degrees is not necessary. The algorithm is perfectly capable + to converge to any angle starting from the second 45 degree rotation. + This patch removes the first rotation and makes it a 23-step CORDIC + algorithm. + + * src/base/fttrigon.c (FT_TRIG_SCALE, FT_TRIG_COSCALE): Update macro + values. + (ft_trig_pseudo_rotate, ft_trig_pseudo_polarize): Remove initial + rotation. + +2012-12-19 Werner Lemberg + + * src/base/ftobjs.c (ft_property_do): Fix compiler warning. + +2012-12-19 Alexei Podtelezhnikov + + * src/base/ftrfork.c (FT_Raccess_Guess): Switch to FT_Int counters. + +2012-12-19 Alexei Podtelezhnikov + + [base] Clean up trigonometric core. + + * src/base/fttrrigon.c (ft_trig_pseudo_polarize): Align algorithm + with `ft_trig_pseudo_rotate'. + +2012-12-18 Infinality + + [truetype] Minor performance enhancement. + + * src/truetype/ttgload.c: (TT_Process_Simple_Glyph): Use FT_MulFix + instead of FT_MulDiv. + +2012-12-17 Infinality + + [truetype] Remove unusued code and variables. + + * src/truetype/ttinterp.c: Updated. + (Ins_FDEF): Remove opcode patterns that are not being used. + +2012-12-16 Werner Lemberg + + Various compiler warning fixes. + + * include/freetype/internal/ftserv.h (FT_SERVICE_UNAVAILABLE): Use + `logical not' operator instead of negation. The idea is that `~' + returns exactly the data type enforced by the cast to a pointer (be + it 32bit or 64bit or whatever), while a negative integer has not + this flexibility. + * src/cache/ftccmap.c (FTC_CMAP_UNKNOWN): Ditto. + * src/truetype/ttgxvar.c (ALL_POINTS, TT_Get_MM_Var): Ditto. + * src/type/t1load.c (T1_Get_MM_Var): Ditto. + (parse_blend_axis_types): Use cast. + * src/bdf/bdflib.c (_bdf_readstream): Use cast. + +2012-12-16 Infinality + + [truetype] Remove unusued code and variables. Add minor fixes. + + * src/truetype/ttsubpix.h: Updated. + (SKIP_NONPIXEL_Y_MOVES_Rules_Exceptions): Add Trebuchet MS. + (ALLOW_X_DMOVEX_Rules): Remove Arial characters. + (ALLOW_X_DMOVE_Rules): Remove Arial characters. + (RASTERIZER_35_Rules): Verdana no longer needs to be here. + (SKIP_IUP_Rules): Formatting fix. + (DELTAP_SKIP_EXAGGERATED_VALUES_Rules): Remove Segoe UI. + (COMPATIBLE_WIDTHS_Rules): Add Monaco and Trebuchet MS. + (X_SCALING_Rules): Add misc. corrective fixes. + + * src/truetype/ttgload.c: (TT_Process_Simple_Glyph): Adjust correction + factor for emboldening during scaling. + + * src/truetype/ttinterp.h: Updated. + (TT_ExecContextRec): Remove unused variables. + + * src/truetype/ttobjs.h: Updated. + (TT_SizeRec): Add ttfautohinted variable. + + * src/truetype/ttinterp.c: Updated. + (Ins_FDEF): Rework code to fix bugs and add more detection. + (Ins_CALL): Remove unused code. + (Ins_LOOPCALL): Remove unused code. + (TT_RunIns): Remove unusued code. + (Ins_SHPIX): Add logic to handle ttfautohinted fonts. + (Ins_MIRP): Don't round x in cut-in calculation. Add logic to handle + ttfautohinted fonts. + +2012-12-16 Werner Lemberg + + [sfnt] Fix Savannah bug #37936. + + * src/sfnt/ttload.c (tt_face_load_gasp): Avoid memory leak. + +2012-12-15 Alexei Podtelezhnikov + + [base] Fix 11-year old bug. + + Since the initial commit (ebe85f59) the value of FT_TRIG_SCALE has + always been slightly less than the correct value, which has been + given in the comment as a hexadecimal. As a result, vector lengths + were underestimated and rotated vectors were shortened. + + * src/base/fttrigon.c (FT_TRIG_SCALE): Fix macro value. + +2012-12-15 Werner Lemberg + + [bdf] Fix Savannah bug #37907. + + * src/bdf/bdflib.c (_bdf_parse_glyphs) : Normalize + negative second parameter of `ENCODING' field also. + +2012-12-15 Werner Lemberg + + [bdf] Fix Savannah bug #37906. + + * src/bdf/bdflib.c (_bdf_parse_glyphs) : Use correct array + size for checking `glyph_enc'. + +2012-12-15 Werner Lemberg + + [bdf] Fix Savannah bug #37905. + + * src/bdf/bdflib.c (_bdf_parse_start) : Reset + `props_size' to zero in case of allocation error; this value gets + used in a loop in `bdf_free_font'. + +2012-12-10 Alexei Podtelezhnikov + + [truetype] Scale F_dot_P down. + + The dot product between freeVector and projVector or cosine of + the angle between these FT_F2Dot14 unit vectors used to be scaled up + by 4 and routinely occupied 32 bits in an FT_Long field F_dot_P. + This patch scales the value down by 2^14 instead, which simplifies + its use throughout the bytecode interpreter. + + This does not lead to the loss of precision because the lower bits + are unreliable anyway. Consider two unit vectors (1,0) and (.6,.8) + for which the true value of F_dot_P is .6 * 0x40000000 = 0x26666666. + These vectors are stored as (0x4000,0) and (0x2666,0x3333) after + rounding and F_dot_P is assigned 0x26660000. The lower bits were + already lost while rounding the unit vector components. + + Besides code simplification, this change can lead to better + performance when FT_MulDiv with the scaled-down F_dot_P is less + likely to use the costly 64-bit path. We are not changing the type + of F_dot_P to FT_F2Dot14 at this point. + + * src/truetype/ttinterp.c (Compute_Funcs): Scale F_dot_P down by 14 + bits and modify its use accordingly. + (Direct_Move, Direct_Move_Orig, Compute_Point_Displacement): Modify + the use of F_dot_P field. + * src/truetype/ttobjs.c (tt_size_run_fpgm): Change arbitrary + assignment of F_dot_P to its theoretical maximum in case we decide + to scale back its type later. + +2012-12-09 Johnson Y. Yan + + [type1] Another fix for 2012-09-17 commit. + + * src/type1/t1parse.c (T1_Get_Private_Dict) : Correctly set + `limit' value. + +2012-12-06 Alexei Podtelezhnikov + + [truetype] Tweak the previous commit. + + * src/truetype/ttinterp.c (Current_Ratio): Put unit vector + components as the second TT_MulFix14 arguments. This is required + on 16-bit systems. + +2012-12-06 Alexei Podtelezhnikov + + [truetype] Microoptimizations in bytecode interpreter. + + * src/truetype/ttinterp.c (TT_DivFix14): New macro. + (Normalize): Use it here. + (Current_Ratio): Use TT_MulFix14 instead of FT_MulDiv. + (Ins_SHPIX): Cancel out two TT_MulFix14 calls. + +2012-12-05 Alexei Podtelezhnikov + + [truetype] Cosmetic improvement in bytecode interpreter. + + * src/truetype/ttinterp.c: Use explicit calls to FT_MulDiv, + FT_MulFix, and FT_DivFix instead of macros. + +2012-12-03 John Tytgat + + [pshinter] Clamp BlueScale value. + + This is Savannah bug #37856. + + * src/pshinter/pshglob.c (psh_calc_max_height): New function. + (psh_globals_new): Use it to limit BlueScale value to + `1 / max_of_blue_zone_heights'. + +2012-12-01 Alexei Podtelezhnikov + + [truetype, type1] Revise the use of FT_MulDiv. + + * src/truetype/ttgxvar.c: Updated. + * src/truetype/ttobjs.c: Updated. + * src/type1/t1load.c: Updated. + +2012-11-30 Werner Lemberg + + [configure] Preserve customized `ftoption.h'. + + Problem reported by Del Merritt . + + * builds/unix/configure.raw : Don't + remove existing FreeType configuration files. + +2012-11-29 John Tytgat + + [type1] Fix Savannah bug #37831. + + The bug report also contains a patch. + + * src/type1/t1parse.c (T1_Get_Private_Dict) : Really fix + change from 2012-09-17. + +2012-11-28 Alexei Podtelezhnikov + + [truetype] Fix formatting and typo. + +2012-11-27 Alexei Podtelezhnikov + + [cid, type1, type42] Clean up units_per_EM calculations. + + * src/cid/cidload.c (cid_parse_font_matrix): Updated. + * src/type1/t1load.c (t1_parse_font_matrix): Updated. + * src/type42/t42parse.c (t42_parse_font_matrix): Updated. + +2012-11-27 Alexei Podtelezhnikov + + [ftstroke] Minor improvement. + + * src/base/ftstroke.c: Replace nested FT_DivFix and FT_MulFix with + FT_MulDiv. + +2012-11-17 Werner Lemberg + + * src/base/fttrigon.c (ft_trig_downscale): Make 64bit version work. + +2012-11-15 Alexei Podtelezhnikov + + [base] Fix integer overflows in dd5718c7d67a. + + * src/base/ftoutln.c (FT_Outline_EmboldenXY): Use FT_MulDiv. + +2012-11-15 Werner Lemberg + + [autofit] Trace stem widths. + + * src/autofit/aflatin.c (af_latin_metrics_init_widths): Add some + FT_TRACE calls. + +2012-11-13 Werner Lemberg + + [cff] Add support for OpenType Collections (OTC). + + * src/cff/cffload.c (cff_font_load): Separate subfont and face + index handling to load both pure CFFs with multiple subfonts and + OTCs (with multiple faces where each face holds exactly one + subfont). + * src/cff/cffobjs.c (cff_face_init): Updated. + +2012-11-12 Werner Lemberg + + [autofit] Minor improvement. + + * src/autofit/aflatin.c (af_latin_hints_compute_blue_edges): Fix + loop. + +2012-11-10 Werner Lemberg + + [autofit] Improve tracing. + + * src/autofit/aflatin.c (af_latin_hint_edges) + [FT_DEBUG_LEVEL_TRACE]: Count number of actions and emit something + if there weren't any. + +2012-11-04 Alexei Podtelezhnikov + + [base] Fortify emboldening code against egregious distortions. + + * src/base/ftoutln.c (FT_Outline_EmboldenXY): Threshold emboldening + strength when it leads to segment collapse. + +2012-11-03 Alexei Podtelezhnikov + + [base] Clean up emboldening code and improve comments there. + + * src/base/ftoutln.c (FT_Outline_EmboldenXY): Replace sequential + calls to FT_MulFix and FT_DivFix with FT_MulDiv. + Mention that bisectors are used to figure out the shift direction. + +2012-10-24 Werner Lemberg + + [autofit] Add standard character to `AF_ScriptClassRec' structure. + + * src/autofit/aftypes.h (AF_ScriptClassRec): Add `standard_char' + member. + (AF_DEFINE_SCRIPT_CLASS): Updated. + + * src/autofit/aflatin.c (af_latin_metrics_init_widths): Use it. + (af_latin_metrics_init, af_latin_script_class): Updated. + + * src/autofit/aflatin.c (af_latin2_metrics_init_widths): Use it. + (af_latin2_metrics_init, af_latin2_script_class): Updated. + + * src/autofit/afcjk.c (af_cjk_metrics_init_widths): Use it. + (af_cjk_metrics_init, af_cjk_script_class): Updated. + + * src/autofit/afindic.c (af_indic_metrics_init, + af_indic_script_class): Updated. + + * src/autofit/afcjk.h, src/autofit/aflatin.h: Updated. + + * src/autofit/afdummy.c: Updated. + +2012-10-24 Werner Lemberg + + [autofit] Only use Unicode CMap. + + * src/autofit/aflatin.c (af_latin_metrics_init): Implement it, to be + in sync with `af_face_globals_compute_script_coverage'. + +2012-10-21 Werner Lemberg + + [psaux] Improve parsing of invalid numbers. + + * src/psaux/psconv.c (PS_Conv_Strtol): Always parse complete number, + even in case of overflow. + (PS_Conv_ToInt): Only increase cursor if parsing was successful. + (PS_Conv_ToFixed): Ditto. + Trace underflow and data error. + +2012-10-21 Werner Lemberg + + [smooth] Improve tracing. + + * src/smooth/ftgrays.c (gray_sweep): Trace last sweep line of + current band also. + +2012-10-20 Alexei Podtelezhnikov + + [truetype] Cheaper way to threshold angles between vectors. + + * src/truetype/ttinterp.c (Ins_ISECT): Thresholding tangent is a lot + cheaper than thresholding sine. + +2012-10-20 Werner Lemberg + + [cff] Improve parsing of invalid real numbers. + + * src/cff/cffparse.c (cff_parse_real): Always parse complete number, + even in case of overflow or underflow. + Also trace one more underflow. + +2012-10-20 Andreas Pehnack + + [sfnt] Load pure CFF fonts wrapped in SFNT container. + + Such fonts only have a `cmap' and a `CFF' table. + + * src/sfnt/ttload.c (tt_face_load_font_dir): Don't call + `check_table_dir' if font signature is `OTTO'. + +2012-10-20 Werner Lemberg + + [psaux] Fix some value overflows and improve tracing. + + * src/psaux/psconv.c: Include FT_INTERNAL_DEBUG_H. + (FT_COMPONENT): Define. + (PS_Conv_Strtol): Return FT_Long. + Handle bad data and overflow. + Emit some tracing messages in case of error. + (PS_Conv_ToInt): Return FT_Long. + (PS_Conv_ToFixed): Updated. + * src/psaux/psconv.h: Updated. + + * include/freetype/internal/fttrace.h: Add `psconv'. + +2012-10-20 Werner Lemberg + + [autofit] Fix `make multi CC=c++'. + + * src/autofit/aflatin.c, src/autofit/aflatin2.c: Include + `afglobal.h'. + * src/autofit/afloader.c: Fix order of header files. + * src/autofit/afmodule.c: Include `afglobal.h' and `aferrors.h'. + +2012-10-19 Werner Lemberg + + [cff] Fix more value errors and improve tracing. + + * src/cff/cffparse.c (cff_parse_integer): Emit tracing message in + case of error. + (cff_parse_real): Handle and trace overflow, underflow, and bad data + consistently. + (do_fixed): New helper function, handling and tracing overflow. + (cff_parse_fixed, cff_parse_fixed_scaled): Use `do_fixed'. + +2012-10-17 Werner Lemberg + + [psaux] Fix some value overflows. + + * src/psaux/psconv.c (PS_Conv_ToFixed): Implement it. + +2012-10-17 Bram Tassyns + + [cff] Fix value overflow. + + * src/cff/cffparse.c (cff_parse_fixed_scaled): Implement it. + +2012-10-17 Werner Lemberg + + [truetype] Fix Savannah bug #37572. + + * src/truetype/ttinterp.c (Ins_ISECT): Use angle between vectors to + avoid grazing intersections. The previous threshold was too coarse, + incorrectly rejecting short but valid vectors. + +2012-09-30 Gilles Espinasse + + Remove useless `rm' detection. + + `rm -f' is directly used in the `configure' script created by + autoconf, thus no availability test is necessary. + + * builds/unix/configure.raw (RMF): Remove test. + * builds/unix/unix-def.in (DELETE): Updated. + +2012-09-29 Werner Lemberg + + [autofit] Minor optimization. + + * src/autofit/afglobals.c (af_face_globals_compute_script_coverage): + Add loop condition. + +2012-09-29 Werner Lemberg + + [autofit] Fix thinko. + + * src/autofit/aftypes.h (AF_SCRIPT): + s/AF_SCRIPT_NONE/AF_SCRIPT_DUMMY/. We already use `AF_SCRIPT_NONE' + as a bit mask. + + * src/autofit/afdummy.c: Updated. + +2012-09-18 Werner Lemberg + + [autofit] Implement `increase-x-height' property. + + * include/freetype/ftautoh.h (FT_Prop_IncreaseXHeight): New + structure. + + * include/autofit/afmodule.c (af_property_get_face_globals): New + function, re-using code from `af_property_get'. + (af_property_set, af_property_get): Handle `increase-x-height'. + Updated. + +2012-09-18 Werner Lemberg + + [autofit] Implement Infinality's `increase glyph heights'. + + This is an improved version of a similar fix contained in the + so-called `Infinality patch', taken from + + http://www.infinality.net/fedora/linux/zips/freetype-infinality-2.4.10-20120616_01-x86_64.tar.bz2 + + which addresses various enhancements of the auto-hinter. Without + properties to control a module's metadata it wasn't possible to + adapt the patches because everything was originally controlled by + environment variables which I consider not suitable in general. + + A patch to control `increase_x_height' follows. + + * src/autofit/afglobal.h (AF_PROP_INCREASE_X_HEIGHT_MIN, + AF_PROP_INCREASE_X_HEIGHT_MAX): New macros. + (AF_FaceGlobalsRec): Add `increase_x_height' member. + * src/autofit/afglobal.c (af_face_globals_new): Initialize it. + + * src/autofit/aflatin.c (af_latin_metrics_scale_dim), + * src/autofit/aflatin2.c (af_latin2_metrics_scale_dim): Implement + handling of `increase_x_height'. + +2012-09-18 Werner Lemberg + + [autofit] Add hierarchical property access to some structures. + + * src/autofit/afglobal.h: Include `afmodule.h'. + (AF_FaceGlobalsRec): Add `module' member. + (AF_FaceGlobals): Typedef moved to... + * src/autofit/aftypes.h: Here. + (AF_ScriptMetricsRec): Add `globals' member. + + * src/autofit/afglobal.c (af_face_globals_new, + af_face_globals_compute_script_coverage, + af_face_globals_get_metrics): Updated. + + * src/autofit/afloader.c (af_loader_reset), src/autofit/afmodule.c + (af_property_get): Updated. + +2012-09-17 Werner Lemberg + + [type1] Fix Savannah bug #37350. + + * src/type1/t1parse.c (T1_Get_Private_Dict) : Check for ASCII + storage only if we actually have at least four bytes. + +2012-09-15 Werner Lemberg + + [autofit] Implement `fallback-script' property. + + * src/autofit/afglobal.c: s/default_script/fallback_script/. + * src/autofit/afglobal.h: s/AF_SCRIPT_DEFAULT/AF_SCRIPT_FALLBACK/. + + * src/autofit/afmodule.c: s/default_script/fallback_script/. + (af_property_set, af_property_get): Implement `fallback-script'. + * src/autofit/afmodule.h: s/default_script/fallback_script/. + + * include/freetype/ftautoh.h: Document it. + +2012-09-15 Werner Lemberg + + [autofit] Correct previous Unicode 6.1.0 change. + + The auto-hinter's latin module only handles latin ligatures in the + `Alphabetical Presentation Forms' block. + + * src/autofit/aflatin.c (af_latin_uniranges): Fix it. + +2012-09-15 Werner Lemberg + + * src/autofit/afmodule.c: s/FT_Err_/AF_Err_/. + +2012-09-15 Werner Lemberg + + [autofit] Make default script a global property. + + * src/autofit/afmodule.h (AF_ModuleRec): Add `default_script' field. + + * src/autofit/afglobal.c (af_face_globals_compute_script_coverage, + af_face_globals_new), src/autofit/afloader.c (af_loader_reset), + src/autofit/afmodule.c (af_property_get) , + af_autofitter_init: + Handle default script. + + * src/autofit/afglobal.h: Updated. + +2012-09-15 Werner Lemberg + + Use `FT_Module' instead of `FT_Library' argument in property funcs. + + This internal change simplifies access to global module data. + + * include/freetype/internal/services/svprop.h + (FT_Properties_SetFunc, FT_Properties_GetFunc): Change accordingly. + + * src/base/ftobjs.c (ft_property_do), src/autofit/afmodule.c + (af_property_set, af_property_get): Updated. + +2012-09-14 Werner Lemberg + + [autofit] Update to Unicode 6.1.0. + + * src/autofit/afcjk.c (af_cjk_uniranges), src/autofit/aflatin.c + (af_latin_uniranges): Add and fix ranges. + +2012-09-14 Werner Lemberg + + [autofit] Pass `AF_Module' instead of `AF_Loader'. + + We want to access the (not yet existing) module's global data later + on. + + * src/autofit/afloader.c: Include `afmodule.h'. + (af_loader_init, af_loader_reset, af_loader_done, + af_loader_load_glyph): Change accordingly. + * src/autofit/afmodule.c (AF_ModuleRec): Move to `afmodule.h'. + Updated. + + * src/autofit/afmodule.h: Include `afloader.h'. + (AF_ModuleRec): Define here. + * src/autofit/afloader.h (AF_Module): Define here. + Updated. + +2012-09-14 Werner Lemberg + + [autofit] Fix `make multi'. + + * include/freetype/internal/fttrace.h: Add `afmodule'. + * src/autofit/afmodule.c: Include FT_INTERNAL_DEBUG_H. + (FT_COMPONENT): Define. + +2012-09-14 Werner Lemberg + + * src/autofit/afmodule.c: s/FT_Autofitter/AF_Module/. + +2012-09-12 Werner Lemberg + + [autofit] Minor reorganization. + + * src/autofit/afglobal.c (AF_SCRIPT_LIST_DEFAULT, + AF_SCRIPT_LIST_NONE, AF_DIGIT): Move to... + * src/autofit/afglobal.h (AF_SCRIPT_DEFAULT, AF_SCRIPT_LIST_NONE, + AF_DIGIT): This and update code. + +2012-09-01 Werner Lemberg + + [autofit] Implement `glyph-to-script-map' property. + + * include/freetype/ftautoh.h: New public header file. + * include/freetype/config/ftheader.h (FT_AUTOHINTER_H): New macro. + + * src/autofit/afglobal.c (AF_FaceGlobalsRec): Move structure to... + * src/autofit/afglobal.h: This header file. + * src/autofit/afmodule.c: Include FT_AUTOHINTER_H. + (af_property_get): Handle `glyph-to-script-map'. + +2012-08-31 Werner Lemberg + + [autofit] Implement properties service framework. + + No properties are added yet. + + * src/autofit/afmodule.c: Include FT_SERVICE_PROPERTIES_H. + (af_property_set, af_property_get): New dummy functions. + (af_service_properties, af_services, af_get_interface): Provide + service setup. + (autofit_moduleclass): Add service interface. + + * src/autofit/afpic.c: Add necessary forward declarations. + (autofit_module_class_pic_init): Add code for service addition. + (autofit_module_pic_free): Add code for service removal. + * src/autofit/afpic.h (AF_SERVICES_GET, AF_SERVICE_PROPERTIES_GET): + New macros which provide necessary syntactical sugar for PIC + support. + +2012-08-30 Werner Lemberg + + Implement properties to control FreeType modules. + + * include/freetype/fterrdef.h (FT_Err_Missing_Property): New error + code. + * include/freetype/ftmodapi.h (FT_Property_Set, FT_Property_Get): + New API. + + * include/freetype/internal/services/svprop.h: New file. + * include/freetype/internal/ftserv.h (FT_SERVICE_PROPERTIES_H): New + macro. + + * src/base/ftobjs.c: Include FT_SERVICE_PROPERTIES_H. + (ft_property_do, FT_Property_Set, FT_Property_Get): New functions. + +2012-08-29 Werner Lemberg + + [docmaker] Allow `-' in tags and identifiers. + + * src/tools/docmaker/content.py (re_identifier), + src/tools/docmaker/sources.py (re_markup_tag1, re_markup_tag2, + re_crossref): Add `-' in patterns. + +2012-08-27 Werner Lemberg + + [FT_CONFIG_OPTION_PIC] Fix g++ 4.6.2 compiler warnings. + + * include/freetype/internal/ftdriver.h (FT_DEFINE_DRIVER), + include/freetype/internal/ftobjs.h (FT_DEFINE_RENDERER, + FT_DEFINE_MODULE), include/freetype/internal/ftserv.h + (FT_DEFINE_SERVICEDESCREC1, FT_DEFINE_SERVICEDESCREC2, + FT_DEFINE_SERVICEDESCREC3, FT_DEFINE_SERVICEDESCREC4, + FT_DEFINE_SERVICEDESCREC5, FT_DEFINE_SERVICEDESCREC6), + src/autofit/afpic.c (autofit_module_class_pic_init), + src/base/basepic.c (ft_base_pic_init), src/base/ftinit.c + (ft_create_default_module_classes), src/cff/cffparse.c + (FT_Create_Class_cff_field_handlers), src/cff/cffpic.c + (cff_driver_class_pic_init), src/pshinter/pshpic.c + (pshinter_module_class_pic_init), src/psnames/pspic.c + (psnames_module_class_pic_init), src/raster/rastpic.c + (ft_raster1_renderer_class_pic_init), src/sfnt/sfntpic.c + (sfnt_module_class_pic_init), src/sfnt/ttcmap.c + (FT_Create_Class_tt_cmap_classes), src/smooth/ftspic.c + (ft_smooth_renderer_class_pic_init), src/truetype/ttpic.c + (tt_driver_class_pic_init): Initialize allocation variable. + +2012-08-27 Werner Lemberg + + [truetype] Fix compilation warning. + + * src/truetype/ttgload.c (IS_HINTED): Move macro to... + * src/truetype/ttobjs.h: This header file. + +2012-08-27 Werner Lemberg + + [autofit, cff, pshinter, psnames] More renamings for orthogonality. + + * src/autofit/afmodule.c, src/autofit/afpic.h: + s/AF_AUTOFITTER_/AF_/. + + * src/cff/cffdrivr.c, src/cff/cffobjs.c, src/cff/cffparse.c, + src/cff/cffpic.h: s/FT_CFF_/CFF_/. + + * src/pshinter/pshmod.c, src/pshinter/pshpic.h: + s/FT_PSHINTER_/PSHINTER_/. + + * src/psnames/psmodule.c, src/psnames/pspic.h: + s/FT_PSCMAPS/PSCMAPS_/. + +2012-08-27 Werner Lemberg + + [sfnt, truetype] More renamings for orthogonality. + + * src/sfnt/sfdriver.c, src/sfnt/sfntpic.h, src/sfnt/ttcmap.c, + src/truetype/ttdriver.c, src/truetype/ttpic.h: s/FT_SFNT_/SFNT_/, + s/FT_TT_/TT_/, s/GET_CMAP_INFO_GET/CMAP_INFO_GET/. + +2012-08-27 Werner Lemberg + + [autofit] Some macro and variable renamings for orthogonality. + + * include/freetype/internal/autohint.h, src/base/ftobjs.c, + src/autofit/afmodule.c, src/autofit/afpic.c, src/autofit/afpic.h: + s/SERVICE/INTERFACE/, s/service/interface/, s/Service/Interface/. + +2012-08-26 Werner Lemberg + + Fix Savannah bug #37178. + + * src/base/ftobjs.c (FT_Open_Face): Initialize `error' with + `FT_Err_Missing_Module' before loop to indicate `no valid drivers'. + +2012-08-17 Werner Lemberg + + * src/base/ftsynth.c (FT_GlyphSlot_Oblique): Fix shear angle. + + The old value was far too large (more than 20°). The new one + corresponds to 12°, quite common in typography. + +2012-08-12 Alexei Podtelezhnikov + + [smooth] Fix Savannah bug #37017. + + * src/smooth/ftgrays.c (gray_render_cubic): Use a different set of + checks when detecting super curvy splines to be split. + +2012-08-05 Werner Lemberg + + [autofit] Improve recognition of flat segments. + + Problem reported by Brad Dunzer . + + * src/autofit/aflatin.c (af_latin_metrics_init_blues): We have + a flat segment if the horizontal distance of best on-points is + larger than a given threshold. + +2012-08-05 Werner Lemberg + + [autofit] Variable renamings. + + * src/autofit/aflatin.c (af_latin_metrics_init_blues): Replace + `glyph' with `outline'. + s/best_first/best_contour_first/. + s/best_last/best_contour_last/. + +2012-07-31 Werner Lemberg + + [type1] Fix Savannah bug #37000. + + * src/type1/t1load.c (parse_encoding): Fix order of checks. + +2012-07-17 Werner Lemberg + + [psaux] Fix Savannah bug #36833. + + * src/psaux/t1decode.c (t1operator_seac): `seac' is not a valid + operator if we want metrics only. + +2012-07-16 Werner Lemberg + + [type1] Fix Savannah bug #36832. + + * src/type1/t1load.c (parse_charstrings): Reject negative number of + glyphs. + +2012-07-13 Werner Lemberg + + [type1] Fix Savannah bug #36829. + + * src/type1/t1load.c (parse_encoding): Check cursor position after + call to T1_Skip_PS_Token. + +2012-07-12 Alexei Podtelezhnikov + + Revert the last commit 45337b07. + + * src/base/ftstroke.c (FT_Stroker_New): Revert the previous change. + +2012-07-11 Alexei Podtelezhnikov + + [ftstroke] Fix uninitialized return value. + + * src/base/ftstroke.c (FT_Stroker_New): Return FT_Err_Ok instead. + +2012-07-11 Werner Lemberg + + [smooth] Avoid memory leak in case of failure. + + * src/smooth/ftsmooth.c (ft_smooth_render_generic): Use flags to + indicate what to clean up after finishing the function, with and + without errors. + +2012-07-09 Werner Lemberg + + Fix compilation with MSVC 5.0. + + Problem reported by Peter Breitenlohner and Akira Kakuto. + + * include/freetype/config/ftstdlib.h (ft_setjmp): Updated. + * src/sfnt/ttcmap.c (tt_face_build_cmaps): Remove cast. + +2012-07-09 Werner Lemberg + + [autofit] Improve debugging messages; do some code cleanup. + + * src/autofit/aflatin.c (af_latin_align_linked_edge, + af_latin_hint_edges): Synchronize with formatting used in the + ttfautohint project. + +2012-07-07 Gilles Espinasse + + Fix strict-aliasing warning. + + * src/base/ftglyph.c (FT_Glyph_To_Bitmap): Avoid double cast. + +2012-07-07 Dave Thomas + + [ARM] Fix FT_MulFix_arm. + + * include/freetype/config/ftconfig.h (FT_MulFix_arm) [__arm__]: + Avoid ADDS instruction to clobber condition codes. + +2012-07-06 Werner Lemberg + + [autofit] Do some code cleanup. + + * src/autofit/afglobal.c (af_face_globals_new): Simplify. + + * src/autofit/afhints.c: Use `FT_TRACE7' instead of `printf' + everywhere. + (FT_COMPONENT): New macro. + (af_glyph_hints_done): Simplify. + + * include/freetype/internal/fttrace.h: Updated. + +2012-07-05 Werner Lemberg + + [autofit] Improve output of debugging information. + + * src/autofit/afhints.c (af_glyph_hints_dump_segments): Print more + data; report no data. + (af_glyph_hints_dump_edges): Report no data. + +2012-07-04 Werner Lemberg + + [autofit] Fix Savannah bug #36091. + + * src/autofit/aflatin.c (af_latin_metrics_init_blues), + src/autofit/aflatin2.c (af_latin2_metrics_init_blues): Change the + constraint for testing round vs. flat segment: Accept either a + small distance or a small angle. + +2012-07-04 Werner Lemberg + + [autofit] Beautify blue zone tracing. + + * src/autofit/aflatin.c (af_latin_metrics_init_blues), + src/autofit/aflatin2.c (af_latin2_metrics_init_blues): Implement it. + +2012-07-03 Werner Lemberg + + [autofit] Quantize stem widths. + + * src/autofit/afangles.c (af_sort_widths): Rename to... + (af_sort_and_quantize_widths): This. + Add code to avoid stem widths which are almost identical. + * src/autofit/aftypes.h, src/autofit/aflatin.c, src/autofit/afcjk.c: + Updated. + +2012-07-03 Werner Lemberg + + [autofit] Minor speed-up. + + * src/autofit/afangles (af_sort_pos, af_sort_widths): Don't swap + elements if they are equal. + +2012-06-30 Gilles Espinasse + + Fix `checking if gcc static flag -static works' test. + + On my linux build tree, I receive yes answer in in every package I + build except freetype for this test checking if gcc static flag + `-static' works + + On freetype, no is received, unless bzip2 and zlib are disabled using + + ./configure --without-bzip2 --without-zlib + + The reason is that bzip2 and zlib tests add `-lz' and `-lbz2' to + LDFLAGS and this broke static flag test. + + * builds/unix/configure.raw: Update CFLAGS and LDFLAGS only after + LT_INIT has run. + +2012-06-28 Infinality + + [truetype] Fix various artifacts. + + Verdana was broken in the original Infinality commit. Also + includes other minor fixes. + + * src/truetype/ttsubpix.h: Updated. Removed unused macros. + (RASTERIZER_35_Rules): Add Verdana. + (SKIP_NONPIXEL_Y_MOVES_Rules): Add Tahoma `s'. + (MIRP_CVT_ZERO_Rules): Remove Verdana. + (ALWAYS_SKIP_DELTAP_Rules): Add Russian char 0x438. + (COMPATIBLE_WIDTHS_Rules): Rearrange some rules. + (X_SCALING_Rules): Adjust Verdana `a' at 12 and 13 ppem. + + * src/truetype/ttsubpix.c: Updated. + (sph_set_tweaks): Re-execute fpgm always. + +2012-06-28 Gilles Espinasse + + Fix CFLAGS and LDFLAGS share configure test. + + * builds/unix/configure.raw: Fix typo. + +2012-06-28 Werner Lemberg + + [truetype] Set the `subpixel_positioned' flag unconditionally. + + This is how the code currently behaves. + + * src/truetype/ttgload.c (tt_loader_init): Do it. + +2012-06-27 Werner Lemberg + + Fix conditional compilation. + + * src/base/basepic.c: Use FT_CONFIG_OPTION_MAC_FONTS. + +2012-06-27 Werner Lemberg + + Fix conditional compilation. + + * include/freetype/internal/ftcalc.h (FT_MulDiv_No_Round): Don't + enclose with `TT_USE_BYTECODE_INTERPRETER'; we now need the function + elsewhere also. + + * src/autofit/afcjk.h: Use AF_CONFIG_OPTION_CJK. + + * src/truetype/ttgload.c (tt_loader_init): Fix compiler warning. + + * src/truetype/ttinterp.c (Ins_MSIRP): Fix compiler warning. + + * src/truetype/ttinterp.h: Use + TT_CONFIG_OPTION_BYTECODE_INTERPRETER. + +2012-06-26 Infinality + + [truetype] Remove unused rounding functionality. + + The subpixel hinting patch contained the concept of an adjustable + number of gridlines per pixel. This is no longer used due to x + being completely ignored instead. This will return some of the + code to its existing state prior to the original Infinality + commit. + + * include/freetype/internal/ftobjs.h (FT_PIX_FLOOR_GRID, + FT_PIX_ROUND_GRID, FT_PIX_CEIL_GRID): Removed. + + * src/truetype/ttinterp.c: Updated. + (Round_None, Round_To_Grid, Round_To_Half_Grid, Round_Down_To_Grid, + Round_Up_To_Grid, Round_To_Double_Grid, Round_Super, Round_Super_45, + SetSuperRound): Remove parameter to handle the number of grid lines per + pixel. + (SET_SuperRound, ROUND_None, CUR_Func_round): Updated. + (DO_SROUND, DOS45ROUND, DO_ODD, DO_EVEN): Updated. + (DO_ROUND, DO_NROUND): Updated. + (Move_Zp2_Point, Ins_SHPIX, Ins_MSIRP, Ins_MDAP, Ins_MIAP, + Ins_MDRP, Ins_MIRP): Perform Round_None instead of calling a modified + rounding function. Remove gridlines_per_pixel. Create a local + variable to store control value cutin. Simplify the conditional for + ignore_x_mode. Adjust rounding calls to pass only two values. + +2012-06-25 Werner Lemberg + + [cff] Fix Savannah bug #36705. + + Handle numbers like 2.001 correctly. + + * src/cff/cffparse.c (cff_parse_real): Avoid negative values for + `shift'. + +2012-06-18 Infinality + + [truetype] Support subpixel hinting. + + This is the large, famous `Infinality' patch to support ClearType + bytecode which has been available from + http://www.infinality.net/blog/ for some time, and which has been + refined over the last years. While still experimental, it is now + mature enough to be included directly into FreeType. + + Most of the code is based on the ClearType whitepaper written by + Greg Hitchcock + + http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx + + which gives a detailed overview of the necessary changes to the + Microsoft rasterizer so that older fonts are supported. However, a + lot of details are still missing, and this patches provides a + framework to easily handle rendering issues down to the glyph level + of certain fonts. + + Note that ClearType support is not completely implemented! In + particular, full support for the options `compatible_widths', + `symmetrical_smoothing, and `bgr' (via the GETINFO bytecode + instruction) is missing. + + * src/truetype/ttsubpix.c: New file, providing code to handle + `tweaks', this is, rules for certain glyphs in certain fonts + (including wildcards) which need a special treatment. + + * src/truetype/ttsubpix.h: New file, holding the tweaking rules. + + * include/freetype/config/ftoption.h, src/devel/ftoption.h + (TT_CONFIG_OPTION_SUBPIXEL_HINTING): New macro. + + * include/freetype/internal/ftobjs.h (FT_PIX_FLOOR_GRID, + FT_PIX_ROUND_GRID, FT_PIX_CEIL_GRID): New macros. + + * src/truetype/truetype.c [TT_USE_BYTECODE_INTERPRETER]: Include + `ttsubpix.c'. + + * src/truetype/ttgload.c: Include `ttsubpix.h'. + [All changes below are guarded by TT_CONFIG_OPTION_SUBPIXEL_HINTING.] + + (tt_get_metrics): Set tweak flags. + (TT_Hint_Glyph): Call `FT_Outline_EmboldenXY' if necessary. + (TT_Process_Simple_Glyph): Compensate emboldening if necessary. + (compute_glyph_metrics): Handle `compatible widths' option. + (tt_loader_init): Handle ClearType GETINFO information bits. + + * src/truetype/rules.mk (TT_DRC_SRC): Updated. + + * src/truetype/ttinterp.c: Include `ttsubpix.h'. + [Where necessary, changes below are guarded by + TT_CONFIG_OPTION_SUBPIXEL_HINTING.] + + (Direct_Move, Direct_Move_X): Extended. + (Round_None, Round_To_Grid, Round_To_Half_Grid, Round_Down_To_Grid, + Round_Up_To_Grid, Round_To_Double_Grid, Round_Super, Round_Super_45, + SetSuperRound): Add parameter to handle the number of grid lines per + pixel. + (SET_SuperRound, ROUND_None, CUR_Func_round): Updated. + (DO_SROUND, DOS45ROUND, DO_ODD, DO_EVEN): Updated. + (DO_ROUND, DO_NROUND): Updated. + (DO_RS): Take care of `Typeman' bytecode patterns. + (Ins_FDEF): Add some debugging code. Commented out. + (Ins_ENDF): Restore state. + (Ins_CALL, Ins_LOOPCALL): Handle inline delta functions. + (Ins_MD): Handle `Vacuform' rounds. + (Move_Zp2_Point, Ins_SHPIX, Ins_MSIRP, Ins_MDAP, Ins_MIAP, + Ins_MDRP, Ins_MIRP): Handle tweaks. + (Ins_ALIGNRP): Add tweak guard. + (Ins_IUP, Ins_DELTAP): Handle tweaks. + (Ins_GETINFO): Handle new ClearType bits. + (TT_RunIns): Handle tweaks. + + * src/truetype/ttinterp.h: Updated. + (SPH_TweakRule, SPH_ScaleRule): New structures for tweaks. + (TT_ExecContextRec): Add members for subpixel hinting support. + + * src/truetype/ttobjs.h (TT_DefRecord): Add `inline_delta' member. + +2012-06-15 Werner Lemberg + + * Version 2.4.10 released. + ========================= + + + Tag sources with `VER-2-4-10'. + + * docs/VERSION.DLL: Update documentation and bump version number to + 2.4.10. + + * README, Jamfile (RefDoc), + builds/win32/vc2005/freetype.vcproj, builds/win32/vc2005/index.html, + builds/win32/vc2008/freetype.vcproj, builds/win32/vc2008/index.html, + builds/win32/vc2010/freetype.vcxproj, builds/win32/vc2010/index.html, + builds/win32/visualc/freetype.dsp, + builds/win32/visualc/freetype.vcproj, + builds/win32/visualc/index.html, builds/win32/visualce/freetype.dsp, + builds/win32/visualce/freetype.vcproj, + builds/win32/visualce/index.html, + builds/wince/vc2005-ce/freetype.vcproj, + builds/wince/vc2005-ce/index.html, + builds/wince/vc2008-ce/freetype.vcproj, + builds/wince/vc2008-ce/index.html: s/2.4.9/2.4.10/, s/249/2410/. + + * include/freetype/freetype.h (FREETYPE_PATCH): Set to 10. + + * builds/unix/configure.raw (version_info): Set to 15:0:9. + +2012-06-15 Alexei Podtelezhnikov + + * src/base/ftsynth.c (FT_GlyphSlot_Embolden): Improve spacing. + + * docs/CHANGES: Updated. + +2012-06-14 suzuki toshiya + + * builds/exports.mk: Add CCexe_CFLAGS and CCexe_LDFLAGS. + + to pass special compiler/linker flags under cross development. + Suggested by Savannah bug #36367. + + ChangeLog on 2010-07-15 saying as they were removed was wrong + for the official trunk of FreeType2. This commit is the first + introduction of them. + +2012-06-14 Werner Lemberg + + * docs/CHANGES: Updated. + +2012-06-14 suzuki toshiya + + [truetype] Add new versions of NEC FA family to tricky font list. + + NEC FA family dated in 1996 have different checksum. + Reported by Johnson Y. Yan ; see + + http://lists.gnu.org/archive/html/freetype-devel/2012-06/msg00023.html + + * src/truetype/ttobjs.c (tt_check_trickyness_sfnt_ids): 4 sets + of fpgm & prep table checksums for FA-Gothic, FA-Minchou, + FA-RoundedGothicM, FA-RoundedGothicB are added. The family + names in sample PDF are truncated, thus the list of the + family names in tt_check_trickyness_family() is not updated yet. + +2012-06-06 Werner Lemberg + + [ftraster] Fix rounding issue causing visual artifacts. + + Problem reported by jola ; see + + http://lists.gnu.org/archive/html/freetype-devel/2012-05/msg00036.html + + * src/raster/ftraster.c (SMulDiv_No_Round): New macro. + (Line_Up): Use it. + * src/raster/ftmisc.h (FT_MulDiv_No_Round): Copied from `ftcalc.c'. + +2012-05-28 Alexei Podtelezhnikov + + * src/base/ftoutln.c (FT_Outline_Get_Orientation): Simplify. + + We now use the cross product of the direction vectors to compute the + outline's orientation. + +2012-05-28 Werner Lemberg + + * docs/CHANGES: Updated. + +2012-05-28 Alexei Podtelezhnikov + + New function FT_Outline_EmboldenXY. + + * include/freetype/ftoutln.h (FT_Outline_EmboldenXY): Define it. + + * src/base/ftoutln.c (FT_Outline_EmboldenXY): Implement it, using a + simplified embolding algorithm. + (FT_Outline_Embolden): Make it a special case of + `FT_Outline_EmboldenXY' + +2012-05-07 Werner Lemberg + + [type1] Fix Savannah bug #36386. + + * src/type1/t1load.c (t1_load_keyword): Ignore keyword if context is + not valid. + +2012-04-07 Werner Lemberg + + Remove compiler warning. + + * src/truetype/ttgload.c (TT_Load_Glyph) + [!TT_CONFIG_OPTION_EMBEDDED_BITMAPS]: Access `glyph->face' directly. + +2012-03-28 Werner Lemberg + + [autofit] Properly copy scaler flags to script metrics object. + + Without this patch, only the dummy and cjk autohinter modules get + them (since they copy the whole scaler object). + + * src/autofit/aflatin.c (af_latin_metrics_scale), + src/autofit/aflatin2.c (af_latin2_metrics_scale): Implement it. + +2012-03-22 Alexei Podtelezhnikov + + [bdflib] Remove redundant macro. + + * src/bdf/bdflib.c (isdigok): Remove and replace with sbitset, which + is exactly the same. + +2012-03-20 suzuki toshiya + + [configure] Fix Savannah bug #35644. + + * builds/unix/configure.raw: Check `-ansi' flag works even if gcc + is used. Bionic libc headers for Android lose the consistency + when they are parsed with __STDC_VERSION__ older than 199901L or + __STRICT_ANSI__. + +2012-03-20 Werner Lemberg + + [bdf] Improvement to Savannah bug #35656. + + * src/bdf/bdflib.c (isdigok): Add cast, as suggested in report. + +2012-03-17 Chris Liddell + + [type1] Fix Savannah bug #35847. + + * src/type1/t1load.c (parse_subrs): Fix the loop exit condition; + we want to exit when we have run out of data. + +2012-03-16 Werner Lemberg + + [bdf] Really fix Savannah bug #35658. + + * src/bdf/bdflib.c (_bdf_list_split): Add one more `field' initializer. + +2012-03-14 Yann Droneaud + + [sfnt] Make arrays static like all others. + + * src/sfnt/ttload.c (tt_face_load_maxp, tt_face_load_os2), + src/sfnt/ttmtx.c (tt_face_load_hhea): Add `static' keyword to frame + fields. + +2012-03-14 Huw Davies + + [sfnt] A refinement of the previous commit. + + * src/sfnt/sfobjs.c (tt_name_entry_ascii_from_utf16, + tt_name_entry_ascii_from_other): Stop at null byte. + +2012-03-14 Huw Davies + + [sfnt] Add `name' table compatibility to MS Windows. + + * src/sfnt/sfobjs.c (tt_name_entry_ascii_from_utf16, + tt_name_entry_ascii_from_other): Don't replace `\0' with question + marks when converting strings. + +2012-03-14 Werner Lemberg + + [type1] Fix Savannah bug #35833. + + Based on the patch given in the bug report. + + * src/type1/t1load.c (IS_INCREMENTAL): New macro. + (read_binary_data): Add parameter `incremental'. + Update all callers using `IS_INCREMENTAL'. + +2012-03-11 Werner Lemberg + + [autofit] Return correct linear advance width values. + + This was quite a subtle bug which accidentally showed up with glyph + `afii10023' of arial.ttf (version 2.76). This glyph is a composite; + the first component, `E', has an advance width of 1366 font units, + while the advance width of the composite itself (which looks like + uppercase `E' with dieresis) is 1367 font units. I think this is + actually a bug in the font itself, because there is no reason that + this glyph has not the same width as uppercase `E' without the + dieresis. Anyway, it helped identify this problem. + + Using the TrueType hinter, the correct value (1367) of `afii10023' + was returned, but the autohinter mysteriously returned 1366. + + Digging in the code showed that the autohinter recursively calls + FT_Load_Glyph to load the glyph, adding the FT_LOAD_NO_SCALE load + flag. However, the `linearHoriAdvance' field is still returned as a + scaled value. To avoid scaling twice, the old code in autofit reset + `linearHoriAdvance', using the `horiAdvance' field. This seemed to + work since FT_LOAD_NO_SCALE was in use, but it failed actually, + because `horiAdvance' is defined as the distance of the first + subglyph's phantom points, which in turn are initialized using the + advance width of the first subglyph. And as the given example + shows, these widths can differ. + + * src/autofit/afloader.c (af_loader_load_g): Temporarily set + FT_LOAD_LINEAR_DESIGN while calling FT_Load_Glyph to get unscaled + values for the linear advance widths. + +2012-03-10 Werner Lemberg + + [truetype] Fix SSW instruction. + + * src/truetype/ttinterp.c (DO_SSW): SSW *does* use font units. For + verification, it took some time to find a font which actually uses + this instruction. + +2012-03-09 Vinnie Falco + + Prepare source code for amalgamation. + + * include/freetype/freetype.h: Swap order of preprocessor blocks. + +2012-03-08 Werner Lemberg + + * Version 2.4.9 released. + ========================= + + + Tag sources with `VER-2-4-9'. + + * docs/CHANGES: Updated. + + * docs/VERSION.DLL: Update documentation and bump version number to + 2.4.9. + + * README, Jamfile (RefDoc), + builds/win32/vc2005/freetype.vcproj, builds/win32/vc2005/index.html, + builds/win32/vc2008/freetype.vcproj, builds/win32/vc2008/index.html, + builds/win32/vc2010/freetype.vcxproj, builds/win32/vc2010/index.html, + builds/win32/visualc/freetype.dsp, + builds/win32/visualc/freetype.vcproj, + builds/win32/visualc/index.html, builds/win32/visualce/freetype.dsp, + builds/win32/visualce/freetype.vcproj, + builds/win32/visualce/index.html, + builds/wince/vc2005-ce/freetype.vcproj, + builds/wince/vc2005-ce/index.html, + builds/wince/vc2008-ce/freetype.vcproj, + builds/wince/vc2008-ce/index.html: s/2.4.8/2.4.9/, s/248/249/. + + * include/freetype/freetype.h (FREETYPE_PATCH): Set to 9. + + * builds/unix/configure.raw (version_info): Set to 14:1:8. + +2012-03-08 Werner Lemberg + + [bdf] Add missing overflow check. + + * src/bdf/bdflib.c (_bdf_parse_glyphs) : Add threshold for + `glyph->bpr'. + +2012-03-07 Vinnie Falco + + Prepare source code for amalgamation. + + * src/autofit/aferrors.h, src/bdf/bdferror.h, src/bzip2/ftbzip2.c, + src/cache/ftcerror.h, src/cff/cfferrs.h, src/cid/ciderrs.h, + src/gxvalid/gxverror.h, src/gzip/ftgzip.c, src/lzw/ftlzw.c, + src/otvalid/otverror.h, src/pcf/pcferror.h, src/pfr/pfrerror.h, + src/psaux/psauxerr.h, src/pshinter/pshnterr.h, + src/psnames/psnamerr.h, src/raster/rasterrs.h, src/sfnt/sferrors.h, + src/smooth/ftsmerrs.h, src/truetype/tterrors.h, + src/type1/t1errors.h, src/type42/t42error.h, src/winfonts/fnterrs.h: + Add #undef FT_ERR_PREFIX before #define FT_ERR_PREFIX. + +2012-03-03 Werner Lemberg + + Fix Savannah bug #35660. + + For some divisions, we use casts to 32bit entities. Always guard + against division by zero with these casts also. + + * src/base/ftcalc.c (ft_div64by32): Remove redundant cast. + (FT_MulDiv, FT_MulDiv_No_Round): Add 32bit cast. + (FT_DivFix): Add 32bit cast (this omission triggered the bug). + +2012-03-03 Werner Lemberg + + [psaux] Fix handling of track kerning. + + * src/psaux/afmparse.c (afm_parse_track_kern): Don't inverse sign + for `min_kern'. It is indeed quite common that track kerning + *increases* spacing for very small sizes. + +2012-03-02 Werner Lemberg + + [truetype] Fix Savannah bug #35689. + + * src/truetype/ttgload.c (TT_Load_Simple_Glyph): Check first outline + point. + +2012-03-01 Werner Lemberg + + [bdf] Fix Savannah bug #35656. + + * src/bdf/bdflib.c (_bdf_parse_glyphs) <_BDF_BITMAP>: Check validity + of nibble characters instead of accessing `a2i' array. + +2012-03-01 Werner Lemberg + + [winfonts] Fix Savannah bug #35659. + + * src/winfonts/winfnt.c (FNT_Face_Init): Check number of glyphs. + +2012-03-01 Werner Lemberg + + [bdf] Fix Savannah bug #35658. + + * src/bdf/bdflib.c (_bdf_list_split): Initialize `field' elements + properly. + +2012-03-01 Werner Lemberg + + [psaux] Fix Savannah bug #35657. + + If in function `skip_spaces' the routine `skip_comment' comes to the + end of buffer, `cur' is still increased by one, so we need to check + for `p >= limit' and not `p == limit'. + + * src/psaux/psconv.c (PS_Conv_Strtol, PS_Conv_ToFixed, + PS_Conv_ASCIIHexDecode, PS_Conv_EexecDecode): Fix boundary checking. + +2012-03-01 Werner Lemberg + + [truetype] Fix Savannah bug #35646. + + * src/truetype/ttinterp.c (Ins_MIRP): Typo, present since ages. The + code is now in sync with the other operators (e.g. MSIRP) which + modify twilight points. + +2012-03-01 Werner Lemberg + + [bdf] Fix Savannah bug #35643. + + * src/bdf/bdflib.c (_bdf_list_ensure): Bring code in sync with + comment before `_bdf_list_split', this is, really allocate at least + five `field' elements. + +2012-03-01 Werner Lemberg + + [bdf] Fix Savannah bug #35641. + + * src/bdf/bdflib.c (_bdf_parse_glyphs) : Abort if + _BDF_ENCODING isn't set. We need this because access to the `glyph' + variable might be undefined otherwise. + +2012-03-01 Werner Lemberg + + [truetype] Fix Savannah bug #35640. + + * src/truetype/ttinterp.c (SkipCode, TT_RunIns): Fix boundary check + for NPUSHB and NPUSHW instructions. + +2012-02-29 Werner Lemberg + + [truetype] Fix Savannah bug #35601. + + * src/truetype/ttinterp.c (Ins_SHZ): Use number of points instead of + last point for loop. + Also remove redundant boundary check. + +2012-02-29 Werner Lemberg + + [truetype] Remove redundant check. + + * src/truetype/ttgload.c (TT_Load_Simple_Glyph): Remove redundant + second check for ordered contour start points. + +2012-02-29 Werner Lemberg + + [truetype] Make SHC instruction behave similar to MS rasterizer. + + * src/truetype/ttinterp.c (Ins_SHC): Handle virtual contour in + twilight zone. + +2012-02-29 Alexei Podtelezhnikov + + Avoid modulo operators against a power-of-two denominator. + + * src/afcjk.c (af_hint_normal_stem), src/base/ftoutln.c + (ft_contour_has), src/cff/cffgload.c (cff_decoder_parse_charstrings) + , + src/gxvalid/gxvcommn.c (GXV_32BIT_ALIGNMENT_VALIDATE), + src/gxvalid/gxvfeat.c (gxv_feat_setting_validate): Replace `%' with + `&' operator. + +2012-02-29 Werner Lemberg + + [autofit] Don't synchronize digit widths for light rendering mode. + + We don't hint horizontally in this mode. + + * src/autofit/afloader.c (af_loader_load_g) : + Implement it. + +2012-02-26 Alexei Podtelezhnikov + + [type42] Minor code optimization (again). + + * src/type42/t42parse.c (t42_parse_sfnts): Simplify previous change. + +2012-02-26 Mateusz Jurczyk + Werner Lemberg + + [smooth] Fix Savannah bug #35604. + + * src/smooth/ftsmooth.c (ft_smooth_render_generic): Use `FT_Pos' + instead of `FT_UInt' for some variables and update comparisons + accordingly. A detailed analysis can be found in the bug report. + +2012-02-26 Alexei Podtelezhnikov + + [type42] Minor code optimization. + + * src/type42/t42parse.c (t42_parse_sfnts): Use bitmask instead of + modulo operator. + +2012-02-26 Werner Lemberg + + * docs/CHANGES: Updated. + +2012-02-26 Werner Lemberg + + [type1] Fix Savannah bug #35608. + + * src/type1/t1parse.c (T1_Get_Private_Dict): Reject too short + dictionaries. + +2012-02-26 Werner Lemberg + + [bdf] Support `ENCODING -1 ' format. + + * src/bdf/bdflib.c (_bdf_parse_glyphs) : Implement it. + +2012-02-26 Werner Lemberg + + [bdf] Fix Savannah bug #35607. + + * src/bdf/bdflib.c (_bdf_parse_glyphs) : Normalize + negative encoding values. + +2012-02-26 Werner Lemberg + + [type1] Fix Savannah bug #35606. + + * src/type1/t1load.c (parse_subrs): Add proper guards for `strncmp'. + + * src/psaux/psobjs.c (ps_parser_skip_PS_token): Emit error message + only if cur < limit. + +2012-02-25 Werner Lemberg + + [pcf] Fix Savannah bug #35603. + + * src/pcf/pcfread.c (pcf_get_properties): Assure final zero byte in + `strings' array. + +2012-02-25 Werner Lemberg + + [type42] Fix Savannah bug #35602. + + * src/type42/t42parse.c (t42_parse_sfnts): Check `string_size' more + thoroughly. + +2012-02-25 Werner Lemberg + + [bdf] Fix Savannah bugs #35599 and #35600. + + * src/bdf/bdflib.c (ACMSG16): New warning message. + (_bdf_parse_glyphs) <_BDF_BITMAP>: Check line length. + +2012-02-24 Werner Lemberg + + [bdf] Fix Savannah bugs #35597 and #35598. + + * src/bdf/bdflib.c (_bdf_is_atom): Fix handling of property value. + +2012-02-24  Vinnie Falco + + Prepare source code for amalgamation (6/6). + + * src/cff/cffdrivr.c: s/Load_Glyph/cff_glyph_load/. + + * src/cid/cidload.c: s/parse_font_matrix/cid_parse_font_matrix/. + s/t1_init_loader/cid_init_loader/. + s/t1_done_loader/cid_done_loader/. + + * src/pxaux/t1cmap.c: s/t1_get_glyph_name/psaux_get_glyph_name/. + + * src/truetype/ttdriver.c: s/Load_Glyph/tt_glyph_load/. + + * src/type1/t1load.c: s/parse_font_matrix/t1_parse_font_matrix/. + +2012-02-24  Vinnie Falco + + Prepare source code for amalgamation (5/6). + + * include/freetype/fterrors.h: Undefine FT_KEEP_ERR_PREFIX after + using it. + +2012-02-22  Vinnie Falco + + Prepare source code for amalgamation (4/6). + + * src/smooth/ftgrays.c, src/raster/ftraster.c: Undefine RAS_ARG, + RAS_ARGS, RAS_VAR, and RAS_VARS before defining it. + + * src/smooth/ftgrays.c: s/TRaster/black_TRaster/, + s/PRaster/black_PRaster/. + * src/raster/ftraster.c: s/TRaster/gray_TRaster/, + s/PRaster/gray_PRaster/. + +2012-02-20  Vinnie Falco + + Prepare source code for amalgamation (3/6). + + * src/smooth/ftgrays.c: s/TWorker/black_TWorker/, + s/PWorker/black_PWorker/. + * src/raster/ftraster.c: s/TWorker/gray_TWorker/, + s/PWorker/gray_PWorker/. + +2012-02-20  Vinnie Falco + + Prepare source code for amalgamation (2/6). + + * src/smooth/ftgrays.c, src/raster/ftraster.c: Undefine FLOOR, + CEILING, TRUNC, and SCALED before defining it. + +2012-02-20  Vinnie Falco + + Prepare source code for amalgamation (1/6). + + See discussion starting at + + http://lists.gnu.org/archive/html/freetype-devel/2012-01/msg00037.html + + * src/smooth/ftgrays.c: s/TBand/gray_TBand/. + * src/raster/ftraster.c: s/TBand/black_TBand/. + +2012-02-17 Alexei Podtelezhnikov + + [autofit] Fix outline flags. + + * src/autofit/afloader.c (af_loader_load_g): Don't reassign + `outline.flags' so that this information is preserved. See + discussion starting at + + http://lists.gnu.org/archive/html/freetype-devel/2012-02/msg00046.html + +2012-02-11 Werner Lemberg + + [truetype] Fix Savannah bug #35466. + + Jump instructions are now bound to the current function. The MS + Windows rasterizer behaves the same, as confirmed by Greg Hitchcock. + + * src/truetype/ttinterp.h (TT_CallRec): Add `Cur_End' element. + * src/truetype/ttobjs.h (TT_DefRecord): Add `end' element. + + * src/truetype/ttinterp.c (DO_JROT, DO_JMPR, DO_JROF): Check upper + bound of jump address. + (Ins_FDEF, Ins_CALL, Ins_LOOPCALL, Ins_UNKNOWN, TT_RunIns): Updated. + +2012-02-11 Werner Lemberg + + We don't use `extensions'. + + * include/freetype/internal/ftobjs.h (FT_DriverRec): Remove + `extensions' field. + +2012-02-11 Werner Lemberg + + Clean up `generic' fields. + + * include/freetype/internal/ftobjs.h (FT_ModuleRec, FT_LibraryRec): + Remove `generic' field since users can't access it. + + * src/base/ftobjs.c (FT_Done_GlyphSlot): Call `generic.finalizer' as + advertised in the documentation of FT_Generic. + (Destroy_Module, FT_Done_Library): Updated to changes in `ftobjs.h'. + +2012-02-07 Werner Lemberg + + [autofit] Harmonize function arguments. + + * src/autofit/afloader.c, src/autofit/afloader.h: Use `FT_Int32' for + `load_flags'. + +2012-02-07 Werner Lemberg + + * src/cff/cffobjs.c (cff_face_init): Remove unnecessary casts. + +2012-01-17 suzuki toshiya + + [gxvalid] Fix Savannah bug #35286. + + Patch submitted by anonymous reporter. + + * src/gxvalid/gxvcommn.c (gxv_XStateTable_subtable_setup): + gxv_set_length_by_ulong_offset() must be called with 3, not 4, + the number of the subtables in the state tables; classTable, + stateArray, entryTable. + +2012-01-17 suzuki toshiya + + [raccess] Modify for PIC build. + + Based on the patch provided by Erik Dahlstrom , + http://lists.gnu.org/archive/html/freetype-devel/2012-01/msg00010.html + + Also `raccess_guess_table[]' and `raccess_rule_by_darwin_vfs()' + are renamed with `ft_' suffixes. + + * src/base/ftbase.h: `raccess_rule_by_darwin_vfs()' is renamed + to `ft_raccess_rule_by_darwin_vfs()'. + * src/base/ftobjs.c: Ditto. + + * src/base/ftrfork.c: Declarations of FT_RFork_Rule, + raccess_guess_rec, are moved to... + * include/freetype/internal/ftrfork.h: Here. + + * include/freetype/internal/ftrfork.h: + FT_RFORK_RULE_ARRAY_{BEGIN,ENTRY,END} macros are defined + to replace raccess_guess_table[] in both of PIC and non-PIC + modes. + * src/base/ftrfork.c: raccess_guess_table[] array is rewritten + by FT_RFORK_RULE_ARRAY_{BEGIN,ENTRY,END}. + + * src/base/basepic.h (BasePIC): Add `ft_raccess_guess_table' + storage. (FT_RACCESS_GUESS_TABLE_GET): New macro to retrieve + the function pointer from `ft_raccess_guess_table' storage in + `BasePIC' structure. + * src/base/ftrfork.c (FT_Raccess_Guess): Rewritten with + FT_RACCESS_GUESS_TABLE_GET. + (raccess_get_rule_type_from_rule_index): Add `library' as the + first argument to the function, to retrieve the storage of + `ft_raccess_guess_table' from it. Also `raccess_guess_table' + is replaced by FT_RACCESS_GUESS_TABLE_GET. + (ft_raccess_rule_by_darwin_vfs): Ditto. + +2012-01-16 suzuki toshiya + + Remove trailing spaces. + +2012-01-16 suzuki toshiya + + Formatting PIC related sources. + + * src/autofit/afpic.c: Harmonize to FT2 coding conventions. + * src/base/basepic.c: Ditto. + * src/base/ftpic.c: Ditto. + * src/cff/cffpic.c: Ditto. + * src/pshinter/pshpic.c: Ditto. + * src/psnames/pspic.c: Ditto. + * src/raster/rastpic.c: Ditto. + * src/sfnt/sfntpic.c: Ditto. + * src/smooth/ftspic.c: Ditto. + * src/truetype/ttpic.c: Ditto. + +2012-01-16 suzuki toshiya + + [autofit] Fix the inclusion of `aflatin2.h' in PIC file. + + * src/autofit/afpic.c: Include `aflatin2.h' when + FT_OPTION_AUTOFIT2 is defined, as afglobal.c does so. + Unconditionally inclusion causes declared but unimplemented + warning by GCC 4.6. + +2012-01-16 suzuki toshiya + + [cff] Remove redundant declarations of cff_cmap_XXX_class_rec. + + * src/cff/cffpic.c: The declarations of + FT_Init_Class_cff_cmap_encoding_class_rec() and + FT_Init_Class_cff_cmap_unicode_class_rec() are removed. + They can be obtained by the inclusion of cffcmap.h. + cffcmap.h invokes FT_DECLARE_CMAP_CLASS() and it declares + FT_Init_Class_cff_cmap_encoding_class_rec() etc in PIC mode. + +2012-01-15 suzuki toshiya + + Fix redundant declaration warning in PIC mode. + + Originally FT_DEFINE_{DRIVER,MODULE,RENDERER}() macros were + designed to declare xxx_pic_{free,init} by themselves. + Because these macros are used at the end of the module + interface (e.g. ttdriver.c) and the wrapper source to build + a module as a single object (e.g. truetype.c) includes + the PIC file (e.g. ttpic.c) before the module interface, + these macros are expanded AFTER xxx_pic_{free,init} body + when the modules are built as single object. + The declaration after the implementation causes the redundant + declaration warnings, so the declarations are moved to module + PIC headers (e.g. ttpic.h). Separating to other header files + are needed for multi build. + + * include/freetype/internal/ftdriver.h (FT_DEFINE_DRIVER): + Remove class_##_pic_free and class_##_pic_init declarations. + * include/freetype/internal/ftobjs.h (FT_DEFINE_RENDERER, + FT_DEFINE_MODULE): Ditto. + + * src/base/basepic.h: Insert a comment and fix coding style. + * src/autofit/afpic.h: Declare autofit_module_class_pic_{free, + init}. + * src/cff/cffpic.h: Declare cff_driver_class_pic_{free,init}. + * src/pshinter/pshpic.h: Declare pshinter_module_class_pic_{free, + init}. + * src/psnames/pspic.h: Declare psnames_module_class_pic_{free, + init}. + * src/raster/rastpic.h: Declare + ft_raster{1,5}_renderer_class_pic_{free,init} + * src/sfnt/sfntpic.h: Declare sfnt_module_class_pic_{free,init}. + * src/smooth/ftspic.h: Declare + ft_smooth_{,lcd_,lcdv_}renderer_class_pic_{free,init}. + * src/truetype/ttpic.h: Declare tt_driver_class_pic_{free,init}. + +2012-01-15 suzuki toshiya + + Make pspic.c to include module error header to fix multi build. + + * src/psnames/pspic.c: Include `psnamerr.h'. + +2012-01-14 suzuki toshiya + + [base] Fix a dereference of uninitialized variable in PIC mode. + + * src/base/ftglyph.c (FT_Glyph_To_Bitmap): `glyph' must be + set before derefering to obtain `library'. The initialization + of `clazz', `glyph', `library' and NULL pointer check are + reordered to minimize PIC conditonals. + +2012-01-14 suzuki toshiya + + [base] Insert explicit cast for GCC 4.6 in PIC mode. + + * src/base/ftinit.c (FT_Add_Default_Modules): Under PIC + configuration, FT_DEFAULT_MODULES_GET returns + FT_Module_Class** pointer, GCC 4.6 warns that + const FT_Module_Class* const* variable is warned as + inappropriate to store it. To calm it, explicit cast is + inserted. Also `library' is checked to prevent the NULL + pointer dereference in FT_DEFAULT_MODULES_GET. + +2012-01-13 suzuki toshiya + + Fix PIC build broken by d9145241fe378104ba4c12a42534549faacc92e6. + + Under PIC configuration, FT_{CFF,PSCMAPS,SFNT,TT}_SERVICES_GET + take no arguments but derefer the variable named `library' + internally. + + * src/cff/cffdrivr.c (cff_get_interface): Declare `library' and + set it if non-NULL driver is passed. + * src/truetype/ttdriver.c (tt_get_interface): Ditto. + + * src/sfnt/sfdriver.c (sfnt_get_interface): Declare `library' + under PIC configuration, and set it if non-NULL module is given. + * src/psnames/psmodule.c (psnames_get_interface): Ditto. + +2012-01-13 suzuki toshiya + + Make PIC files include module error headers, to use the error codes + with per-module prefix. + + * src/autofit/afpic.c: Include `aferrors.h'. + * src/cff/cffpic.c: Include `cfferrs.h'. + * src/pshinter/pshpic.c: Include `pshnterr.h'. + * src/raster/rastpic.c: Include `rasterrs.h'. + * src/sfnt/sfntpic.c: Include `sferrors.h'. + * src/smooth/ftspic.c: Include `ftsmerrs.h'. + * src/truetype/ttpic.c: Include `tterrors.h'. + +2012-01-04 Tobias Ringström + + [truetype] Fix IP instruction if x_ppem != y_ppem. + + * src/truetype/ttinterp.c (Ins_IP): Scale `orus' coordinates + properly. + +2012-01-02 Werner Lemberg + + Fix tracing message for `loca' table. + + * src/truetype/ttpload.c (tt_face_get_location): Don't emit a + warning message if the last `loca' entry references an empty glyph. + +2011-12-10 Werner Lemberg + + Add some variable initializations. + Reported by Richard COOK . + + * src/type1/t1driver.c (t1_ps_get_font_value): Initialize `val'. + * src/smooth/ftgrays.c (gray_render_conic): Initialize `levels' + earlier. + +2011-12-08 Werner Lemberg + + Fix serious scaling bug in `FT_Get_Advances'. + + * src/base/ftadvanc.c (FT_Get_Advances): Advance values returned by + `FT_Load_Glyph' must be simply multiplied by 1024. + +2011-12-08 Werner Lemberg + + * src/bdf/bdflib.c (_bdf_parse_start): Drop redundant error tracing. + +2011-12-02 suzuki toshiya + + [mac] Unify DARWIN_NO_CARBON with FT_MACINTOSH. + + Originally FT_MACINTOSH was a pure auto macro and DARWIN_NO_CARBON + was a configurable macro to disable Carbon-dependent code. Because + now configure script sets DARWIN_NO_CARBON by default and disables + Darwin & Carbon-dependent codes, these macros can be unified. + FT_MACINTOSH (undefined by default) is kept and DARWIN_NO_CARBON + (defined by default) is removed, because DARWIN_NO_CARBON violates + FT_XXX naming convention of public macros, and a macro configured by + default is not portable for the building without configure (e.g. + make devel). + + * builds/unix/configure.raw: Define FT_MACINTOSH if Carbon-based + old Mac font support is requested and Carbon is available. + * builds/unix/ftconfig.in: Undefine FT_MACINTOSH when the support + for Mac OS X without Carbon (e.g. Mac OS X 10.4 for ppc64) is + requested. + * include/freetype/config/ftconfig.in: Ditto. + * builds/vms/ftconfig.h: Ditto. + + * src/base/ftbase.h: Remove DARWIN_NO_CARBON. + * src/base/ftbase.c: Ditto. + * src/base/ftobjs.c: Ditto. + * src/base/ftrfork.c: Ditto. + + * src/base/ftmac.c: Compile the body if FT_MACINTOSH is defined + (same with TT_USE_BYTECODE_INTERPRETER in ttinterp.c). + * builds/mac/ftmac.c: Ditto. + + * builds/mac/FreeType.m68k_cfm.make.txt: Define FT_MACINTOSH. + * builds/mac/FreeType.m68k_far.make.txt: Ditto. + * builds/mac/FreeType.ppc_classic.make.txt: Ditto. + * builds/mac/FreeType.ppc_carbon.make.txt: Ditto. + +2011-11-30 suzuki toshiya + + Fix Savannah bug #34728 (`make devel' on Mac OS X). + + * builds/toplevel.mk: Check `/dev/null' to identify the Unix- + like systems without `init' nor `hurd' (e.g. Mac OS X >= 10.4). + * builds/unix/detect.mk: Ditto. + +2011-11-30 suzuki toshiya + + [apinames] Fix the overflow of signed integer hash. + + * src/tools/apinames.c (names_add): Change the type of `h' from + int to unsigned int, to prevent undefined behaviour in the + overflow of signed integers (overflow of unsigned int is defined + to be wrap around). Found by clang test suggested by Sean + McBride. + +2011-11-30 Werner Lemberg + + [winfonts] Remove casts. + + * src/winfonts/winfnt.c (winfnt_driver_class): Remove all casts and + update affected functions. + (FNT_Size_Select): Fix number of arguments. + +2011-11-30 Werner Lemberg + + [type42] Remove casts. + + * src/type42/t42driver.c (t42_driver_class): Remove all casts and + update affected functions. + + * src/type42/t42objs.c, src/type42/t42objs.h: Updated for t42driver + changes. + +2011-11-30 Werner Lemberg + + [type1] Remove casts. + + * src/type1/t1driver.c (t1_driver_class): Remove all casts and + update affected functions. + + * src/type1/t1gload.c, src/type1/t1gload.h, src/type1/t1objs.c: + Updated for t1driver changes. + src/type1/t1objs.h (T1_Driver): Remove unused typedef. + Updated for t1driver changes. + +2011-11-27 Werner Lemberg + + [bdf] Fix Savannah bug #34896. + + ENCODING now covers the whole Unicode range. + + Note, however, that this change is quite expensive since it + increases the size of three arrays by almost 400kByte in total. The + right fix is to replace the logic with something smarter. + Additionally, there exist very old BDFs for three-byte CCCII + encoding which exceeds the range of Unicode (another reason to have + a smarter logic). + + * src/bdf/bdf.h (bdf_font_t): Increase size of `nmod' and `umod' + arrays. + * src/bdf/bdflib.c (bdf_parse_t): Increase size of `have' array. + +2011-11-27 Werner Lemberg + + [bdf] Improve tracing. + + * src/bdf/bdflib.c (DBGMSG1, DBGMSG2): New macros. + (_bdf_parse_glyphs): Use them. + +2011-11-26 Werner Lemberg + + Improve tracing. + + * src/bdf/bdfdrivr.c (BDF_Face_Done), src/pcf/pcfdrivr.c + (PCF_Face_Done): Remove tracing message. + + * src/bdf/bdfdrivr.c (BDF_Face_Init), src/cff/cffobjs.c + (cff_face_init), src/cid/cidobjs.c (cid_face_init), + src/pfr/pfrobjs.c (pfr_face_init), src/sfnt/sfobjs.c + (sfnt_init_face), src/truetype/ttobjs.c (tt_face_init), + src/type1/t1objs.c (T1_Face_Init), src/type42/t42objs.c + (T42_Face_Init), src/winfonts/winfnt.c (FNT_Face_Init): Add + `greeting' message. + + * src/sfnt/sfobjs.c (sfnt_open_font), src/type42/t42objs.c + (T42_Open_Face): Improve tracing. + +2011-11-26 Werner Lemberg + + [cid] Fix error code. + + * src/cid/cidparse.c (cid_parser_new): Do it. + +2011-11-26 Werner Lemberg + + [cff] Fix error code. + + * src/cff/cffload.c (cff_font_load): Do it. + +2011-11-26 Werner Lemberg + + Add new error code FT_Err_Missing_Module. + + Previously, FreeType misleadingly returned + FT_Err_Unknown_File_Format if a module was missing (or a test was + missing completely). + + * include/freetype/fterrdef.h (FT_Err_Missing_Module): Define. + + * src/cff/cffobjs.c (cff_face_init), src/cff/cffdrivr.c + (cff_get_glyph_name), src/cid/cidobjs.c (cid_face_init), + src/sfnt/sfobjs.c (sfnt_init_face), src/truetype/ttobjs.c + (tt_face_init), src/type1/t1objs.c (T1_Face_Init), + src/type42/t42objs.c (T42_Face_Init, T42_Driver_Init): Updated. + + * src/type1/t1afm.c (T1_Read_Metrics), src/type/t1objs.c + (T1_Face_Init), src/type42/t42objs.c (T42_Face_Init): Remove now + redundant test for `psaux'. + +2011-11-25 Werner Lemberg + + [bdf] Add more error messages. + + * src/bdf/bdflib.c (_bdf_set_default_spacing, _bdf_add_property): + Add line number argument. + Update all callers. + (ERRMSG5, ERRMSG6, ERRMSG7, ERRMSG8, ERRMSG9): New macros. + (_bdf_readstream, _bdf_set_default_spacing, _bdf_add_property, + _bdf_parse_glyphs, _bdf_parse_start): Add error messages. + +2011-11-24 Werner Lemberg + + * include/freetype/fterrors.h: Remove dead code. + +2011-11-15 Werner Lemberg + + * docs/releases: Updated. + +2011-11-15 Werner Lemberg + + * Version 2.4.8 released. + ========================= + + + Tag sources with `VER-2-4-8'. + + * docs/CHANGES: Updated. + + * docs/VERSION.DLL: Update documentation and bump version number to + 2.4.8. + + * README, Jamfile (RefDoc), + builds/win32/vc2005/freetype.vcproj, builds/win32/vc2005/index.html, + builds/win32/vc2008/freetype.vcproj, builds/win32/vc2008/index.html, + builds/win32/vc2010/freetype.vcxproj, builds/win32/vc2010/index.html, + builds/win32/visualc/freetype.dsp, + builds/win32/visualc/freetype.vcproj, + builds/win32/visualc/index.html, builds/win32/visualce/freetype.dsp, + builds/win32/visualce/freetype.vcproj, + builds/win32/visualce/index.html, + builds/wince/vc2005-ce/freetype.vcproj, + builds/wince/vc2005-ce/index.html, + builds/wince/vc2008-ce/freetype.vcproj, + builds/wince/vc2008-ce/index.html: s/2.4.7/2.4.8/, s/247/248/. + + * include/freetype/freetype.h (FREETYPE_PATCH): Set to 8. + + * builds/unix/configure.raw (version_info): Set to 14:0:8. + +2011-11-13 Chris Liddell + + Add FT_Get_PS_Font_Value() API. + + This allows a Type 1 font face to be interrogated to retrieve most + of the dictionary keys (keys not relevant to FreeType's Type 1 + interpreter are not available). + + * include/freetype/internal/services/svpsinfo.h + (PS_GetFontValueFunc): New typedef. + (PSInfo): Add `ps_get_font_value'. + (FT_DEFINE_SERVICE_PSINFOREC): Updated. + + * include/freetype/internal/t1types.h (T1_EncodingType): Moved to... + * include/freetype/t1tables.h: Here. + (PS_Dict_Keys): New enumeration. + (FT_Get_PS_Font_Value): New declaration. + + * src/base/fttype1.c (FT_Get_PS_Font_Value): New function. + + * src/type1/t1driver.c (t1_ps_get_font_value): This new function + does the real job. + (t1_service_ps_info): Add it. + + * src/cff/cffdrivr.c (cff_service_ps_info), src/cid/cidriver.c + (cid_service_ps_info), src/type42/t42drivr.c (t42_service_ps_info): + Updated. + +2011-11-08 Braden Thomas + + [cid] Various loading fixes. + + * src/cid/cidload.c (cid_load_keyword) , + (parse_font_matrix, parse_expansion_factor): Correctly check number + of dictionaries. + (cid_read_subrs): Protect against invalid values of `num_subrs'. + Assure that the elements of the `offsets' array are ascending. + +2011-11-05 Werner Lemberg + + * README: We use copyright ranges also. + + According to + + http://www.gnu.org/prep/maintain/html_node/Copyright-Notices.html + + this should be mentioned explicitly. + +2011-10-30 suzuki toshiya + + [raccess] Supplement for previous fix. + + * src/base/ftbase.h (raccess_rule_by_darwin_vfs): Do not declare + it on native Mac OS X. + * src/base/ftrfork.c (raccess_get_rule_type_from_rule_index): + Hide raccess_get_rule_type_from_rule_index() on native Mac OS X + too. + +2011-10-30 suzuki toshiya + + [raccess] Hide raccess_rule_by_darwin_vfs() on native Mac OS X. + + * src/base/ftrfork.c (raccess_rule_by_darwin_vfs): Do not + compile on native Mac OS X because it is not used. + +2011-10-25 Werner Lemberg + + [truetype] Fix MD instruction for twilight zone. + + * src/truetype/ttinterp.c (Ins_MD): Without this fix, the MD + instruction applied to original coordinates of twilight points + always returns zero. + +2011-10-18 Werner Lemberg + + * Version 2.4.7 released. + ========================= + + + Tag sources with `VER-2-4-7'. + + * docs/CHANGES: Updated. + + * docs/VERSION.DLL: Update documentation and bump version number to + 2.4.7. + + * README, Jamfile (RefDoc), + builds/win32/vc2005/freetype.vcproj, builds/win32/vc2005/index.html, + builds/win32/vc2008/freetype.vcproj, builds/win32/vc2008/index.html, + builds/win32/vc2010/freetype.vcxproj, builds/win32/vc2010/index.html, + builds/win32/visualc/freetype.dsp, + builds/win32/visualc/freetype.vcproj, + builds/win32/visualc/index.html, builds/win32/visualce/freetype.dsp, + builds/win32/visualce/freetype.vcproj, + builds/win32/visualce/index.html, + builds/wince/vc2005-ce/freetype.vcproj, + builds/wince/vc2005-ce/index.html, + builds/wince/vc2008-ce/freetype.vcproj, + builds/wince/vc2008-ce/index.html: s/2.4.6/2.4.7/, s/246/247/. + + * include/freetype/freetype.h (FREETYPE_PATCH): Set to 7. + + * builds/unix/configure.raw (version_info): Set to 13:2:7. + +2011-10-15 Kal Conley + + Fix handling of transformations if no renderer is present. + + * src/base/ftobjs.c (FT_Load_Glyph): Thinko. + +2011-10-15 Kal Conley + + Fix conditions for autohinting. + + * src/base/ftobjs.c (FT_Load_Glyph): Handle + FT_LOAD_IGNORE_TRANSFORM. + +2011-10-07 suzuki toshiya + + [gxvalid] Fix a bug to detect too large offset in morx table. + + * src/gxvalid/gxvmorx2.c + (gxv_morx_subtable_type2_ligActionIndex_validate): Fix a bug + that too large positive offset cannot be detected. + +2011-10-01 Braden Thomas + + Handle some border cases. + + * include/freetype/config/ftstdlib.h (FT_USHORT_MAX): New macro. + + * src/base/ftbitmap.c (FT_Bitmap_Convert): Protect against invalid + value of `target->rows'. + + * src/psaux/t1decode.c (t1_decoder_parse_charstrings): Add check for + flex start. + + * src/raster/ftrend1.c (ft_raster1_render): Check `width' and + `height'. + + * src/truetype/ttgxvar.c (TT_Vary_Get_Glyph_Deltas): Protect against + invalid values in `localpoints' array. + +2011-10-01 Werner Lemberg + + [psnames] Handle zapfdingbats. + Problem reported by Nicolas Rougier . + + * src/tools/glnames.py (adobe_glyph_list): Add data from AGL's + `zapfdingbats.txt' file. + + * src/psnames/pstables.h: Regenerated. + +2011-09-27 Simon Bünzli + + [type1] Fix Savannah bug #34189. + + * src/type1/t1load.c (T1_Open_Face): Initialize + `face->len_buildchar'. + +2011-09-26 Werner Lemberg + + [cff] Dump SIDs while tracing. + + * src/cff/cffobjs.c (cff_face_init): Do it. + + * src/cff/cffparse.c (cff_parser_run) [FT_DEBUG_LEVEL_TRACE] + : Identify as SID. + +2011-09-17 Werner Lemberg + + Remove unused FT_ALIGNMENT macro. + + * builds/unix/ftconfig.in, builds/vms/ftconfig.h, + include/freetype/config/ftconfig.h: Do it. + +2011-09-17 Alexei Podtelezhnikov + + [smooth] Slightly optimize conic and cubic flatterners. + + * src/smooth/ftgrays.c (gray_render_conic, gray_render_cubic): Move + out some code from the main loop to speed it up. + +2011-09-11 Tomas Hoger + + Slightly improve LZW_CLEAR handling. + + * src/lzw/ftzopen.c (ft_lzwstate_io) : + Ensure that subsequent (modulo garbage byte(s)) LZW_CLEAR codes are + handled as clear codes. This also re-sets old_code and old_char to + predictable values, which is a little better than using `random' + ones if the code following LZW_CLEAR is invalid. + +2011-09-11 Tomas Hoger + + Add explicit LZW decompression stack size limit. + + Stack larger than 1<prefix[code - 256] + when traversing prefix table. Such check is less efficient and + should not be required if prefix table is constructed correctly in + the first place. + + * src/lzw/ftzopen.c (ft_lzwstate_stack_grow): Implement it. + +2011-09-11 Tomas Hoger + + Protect against loops in the prefix table. + + LZW decompressor did not sufficiently check codes read from the + input LZW stream. A specially-crafted or corrupted input could + create a loop in the prefix table, which leads to memory usage + spikes, as there's no decompression stack size limit. + + * src/lzw/ftzopen.c (ft_lzwstate_io) : First + code in valid LZW stream must be 0..255. + : In the special KwKwK case, code == free_ent, + code > free_ent is invalid. + +2011-09-09 Werner Lemberg + + Better tracing of metrics. + + * src/base/ftobjs.c (FT_Request_Size, FT_Select_Size): Decorate with + FT_TRACE. + +2011-09-07 Werner Lemberg + + [cff] Fix Savannah bug #33816. + + * src/cff/cfftypes.h (CFF_FontRecDictRec): New member + `has_font_matrix'. + * src/cff/cffparse.c (cff_parse_font_matrix): Set it. + Update tracing output. + * src/cff/cffobjs.c (cff_face_init): Use it so that the heuristics + can be removed. + +2011-08-30 Werner Lemberg + + Better tracing of metrics. + + * src/base/ftobjs.c (FT_Select_Metrics, FT_Request_Metrics): + Decorate with FT_TRACE. + +2011-08-25 Werner Lemberg + + [cff] Better tracing of the parsing process. + + * src/cff/cffload.c (cff_subfont_load, cff_font_load): Decorate with + FT_TRACE. + + * src/cff/cffparse.c (cff_parse_font_matrix, cff_parse_font_bbox, + cff_parse_private_dict, cff_parse_cid_ros): Updated. + (CFF_FIELD_NUM, CFF_FIELD_FIXED, CFF_FIELD_FIXED_1000, + CFF_FIELD_STRING, CFF_FIELD_BOOL, CFF_FIELD_CALLBACK, CFF_FIELD, + CFF_FIELD_DELTA): Add argument for ID. + (cff_parser_run): Decorate with FT_TRACE. + + * src/cff/cffparse.h (CFF_Field_Handler) [FT_DEBUG_LEVEL_TRACE]: Add + `id' member. + + * src/cff/cfftoken.h: Add IDs to all fields. + +2011-08-16 Werner Lemberg + + Fix Savannah bug #34022. + + * README, docs/INSTALL: Remove references to UPGRADE.UNIX. + +2011-08-15 Werner Lemberg + + Fix Savannah bug #34018. + + * docs/UPGRADE.UNIX: Removed. Obsolete. + +2011-08-15 David Bevan + + Fix Savannah bug #33992. + + * src/base/ftstroke.c (FT_Stroker_ParseOutline): Fix border case. + +2011-08-12 Werner Lemberg + + [cff] Fix Savannah bug #33975. + + * src/cff/cffparse.c (cff_parse_font_matrix): Fix typo. + +2011-07-29 Werner Lemberg + + * Version 2.4.6 released. + ========================= + + + Tag sources with `VER-2-4-6'. + + * docs/CHANGES: Updated. + + * docs/VERSION.DLL: Update documentation and bump version number to + 2.4.6. + + * README, Jamfile (RefDoc), + builds/win32/vc2005/freetype.vcproj, builds/win32/vc2005/index.html, + builds/win32/vc2008/freetype.vcproj, builds/win32/vc2008/index.html, + builds/win32/vc2010/freetype.vcxproj, builds/win32/vc2010/index.html, + builds/win32/visualc/freetype.dsp, + builds/win32/visualc/freetype.vcproj, + builds/win32/visualc/index.html, builds/win32/visualce/freetype.dsp, + builds/win32/visualce/freetype.vcproj, + builds/win32/visualce/index.html, + builds/wince/vc2005-ce/freetype.vcproj, + builds/wince/vc2005-ce/index.html, + builds/wince/vc2008-ce/freetype.vcproj, + builds/wince/vc2008-ce/index.html: s/2.4.5/2.4.6/, s/245/246/. + + * include/freetype/freetype.h (FREETYPE_PATCH): Set to 6. + + * builds/unix/configure.raw (version_info): Set to 13:1:7. + +2011-07-29 Werner Lemberg + + [cff] Add some more tracing infos. + + * src/cff/cffparse.c (cff_parse_font_matrix, cff_parse_font_bbox, + cff_parse_cid_ros): Add tracing. + +2011-07-22 Dirk Müller + + [psaux, type1] Fix null pointer dereferences. + + Found with font fuzzying. + + * src/psaux/t1decode.c (t1_decoder_parse_charstrings): Check + `decoder->buildchar'. + + * src/type1/t1load.c (t1_load_keyword): Check `blend->num_designs'. + +2011-07-20 Chris Morgan + + Add FT_CONFIG_OPTION_DISABLE_STREAM_SUPPORT. + + Useful for embedded systems which don't need file stream support. + + * src/base/ftsystem.c, src/base/ftobjs.c (FT_Stream_New): Implement + it. + +2011-07-20 Elton Chung + + * src/base/ftpatent.c (FT_Face_SetUnpatentedHinting): Fix typo. + +2011-07-16 Steven Chu + + [truetype] Fix metrics on size request for scalable fonts. + + * src/truetype/ttdriver.c (tt_size_request): Fix copying metrics + from TT_Size to FT_Size if scalable font. + + See + + http://lists.gnu.org/archive/html/freetype-devel/2011-07/msg00049.html + + for some comparison images. + +2011-07-14 Matthias Drochner . + + [psaux] Fix potential sign extension problems. + + When shifting right a signed value, it is not defined by the + C standard whether one gets a sign extension or not. Use a macro to + do an explicit cast from a signed short (assuming that this is + 16bit) to an int. + + * src/psaux/t1decode.c (Fix2Int): New macro. + Use it where appropriate. + +2011-07-14 Werner Lemberg + + * src/psaux/t1decode.c (t1_decoder_parse_charstrings) + : Better handling of subroutine index 0. + From Matthias Drochner . + +2011-07-10 Алексей Подтележников + + [psaux] Optimize previous commit. + + * src/psaux/t1decode.c (t1_decoder_parse_charstrings) + : Move error check down to avoid testing twice for + good cases. + +2011-07-08 Werner Lemberg + + [psaux] Add better argument check for `callothersubr'. + + * src/psaux/t1decode.c (t1_decoder_parse_charstrings) + : Reject negative arguments. + +2011-07-07 Werner Lemberg + + [sfnt] Try harder to find non-zero values for ascender and descender. + + * src/sfnt/sfobjs.c (sfnt_load_face): Consult `OS/2' table in case + the `hhea' table's values are zero. + +2011-07-03 Werner Lemberg + + Fix previous commit. + + We want to unset FT_FACE_FLAG_SCALABLE only if there are bitmap + strikes in the font. + + * src/truetype/ttobjs.c (tt_face_init): Implement it. + + * docs/CHANGES: Updated. + +2011-07-02 Just Fill Bugs + + [truetype] Fix Savannah bug #33246. + + * src/truetype/ttobjs.c (tt_check_single_notdef): New function. + (tt_face_init): Use it to test FT_FACE_FLAG_SCALABLE. + +2011-07-02 Werner Lemberg + + * docs/CHANGES: Updated. + +2011-07-02 David Bevan + + [ftstroke] Major revision. + + The main problems + ----------------- + + o If FT_STROKER_LINEJOIN_BEVEL was specified, unlimited miter + joins (not bevel joins) were generated. Indeed, the meanings of + `miter' and `bevel' were incorrectly reversed (consistently) in + both the code and comments. + + o The way bevel joins were constructed (whether specified + explicitly, or created as a result of exceeding the miter limit) + did not match what is required for stroked text in PostScript or + PDF. + + The main fixes + -------------- + + o The behaviour of FT_STROKER_LINEJOIN_BEVEL has been corrected. + + o A new line join style, FT_STROKER_LINEJOIN_MITER_FIXED, has been + introduced to support PostScript and PDF miter joins. + + o FT_STROKER_LINEJOIN_MITER_VARIABLE has been introduced as an + alias for FT_STROKER_LINEJOIN_MITER. + + Additionally, a variety of stroking errors have been fixed. These + would cause various artifacts (including points `at infinity'), + especially when stroking poor quality fonts. + + See + + http://lists.gnu.org/archive/html/freetype-devel/2011-07/msg00001.html + + for example documents. The FreeType stroker now produces results + very similar to that produced by GhostScript and Distiller for these + fonts. + + Other problems + -------------- + + The following problems have been resolved: + + o Inside corners could be generated incorrectly. Intersecting the + inside corner could cause a missing triangular area and other + effects. + + The intersection point can only be used if the join is between + two lines and both lines are long enough. The `optimization' + condition in `ft_stroker_inside' has been corrected; this + requires the line length to be passed into various functions and + stored in `FT_StrokerRec'. + + o Incorrect cubic curves could be generated. The angle + calculations in `FT_Stroker_CubicTo' have been corrected to + handle the case of the curve crossing the +/-PI direction. + + o If the border radius was greater than the radius of curvature of + a curve, then the negative sector would end up outside (not + inside) the border. This situation is now recognized and the + negative sector is circumnavigated in the opposite direction. + (If round line joins are being used, this code is disabled + because the line join will always cover the negative sector.) + + o When a curve is split, the arcs may not join smoothly (especially + if the curve turns sharply back on itself). Changes in + direction between adjacent arcs were not handled. A round + corner is now added if the deviation from one arc to the next is + greater than a suitable threshold. + + o The current direction wasn't retained if a the outline contained + a zero length lineto or a curve that was determined to be + `basically a point'. This could cause a spurious join to be + added. + + o Cubics with close control points could be mishandled. All eight + cases are now distinguished correctly. + + Other improvements + ------------------ + + o Borders for cubic curves could be too `flat'. + FT_SMALL_CUBIC_THRESHOLD has been reduced a little to prevent + this. + + o The handling and use of movable points has been simplified a + little. + + o Various values are now computed only if the results are actually + needed. + + o The directions of the outer and inner borders have been swapped, + as recommended by Graham Asher. + + * src/base/ftstroke.c: Revised. + * include/freetype/ftstroke.h: Updated. + +2011-06-30 Ä°smail Dönmez + + * builds/toplevel.mk: We use git, not CVS, thus skip `.gitignore'. + +2011-06-29 Werner Lemberg + + [bdf] Fix Savannah bug #33663. + + * src/bdf/bdflib.c (_bdf_parse_glyphs): Handle negative values for + ENCODING correctly. + + * docs/CHANGES: Document it. + +2011-06-24 Werner Lemberg + + * Version 2.4.5 released. + ========================= + + + Tag sources with `VER-2-4-5'. + + * docs/CHANGES: Updated. + + * docs/VERSION.DLL: Update documentation and bump version number to + 2.4.5 + + * README, Jamfile (RefDoc), + builds/win32/vc2005/freetype.vcproj, builds/win32/vc2005/index.html, + builds/win32/vc2008/freetype.vcproj, builds/win32/vc2008/index.html, + builds/win32/vc2010/freetype.vcxproj, builds/win32/vc2010/index.html, + builds/win32/visualc/freetype.dsp, + builds/win32/visualc/freetype.vcproj, + builds/win32/visualc/index.html, builds/win32/visualce/freetype.dsp, + builds/win32/visualce/freetype.vcproj, + builds/win32/visualce/index.html, + builds/wince/vc2005-ce/freetype.vcproj, + builds/wince/vc2005-ce/index.html, + builds/wince/vc2008-ce/freetype.vcproj, + builds/wince/vc2008-ce/index.html: s/2.4.4/2.4.5/, s/244/245/. + + * include/freetype/freetype.h (FREETYPE_PATCH): Set to 5. + + * builds/unix/configure.raw (version_info): Set to 13:0:7. + +2011-06-20 Werner Lemberg + + * src/autofit/aflatin.c (af_latin_metrics_scale_dim): Fix change + from 2011-05-04. + +2011-06-19 suzuki toshiya + + [gxvalid] make the `prop' validation tracing verbose. + + * src/gxvalid/gxvprop.c: Add tracing messages for errors. + +2011-06-19 suzuki toshiya + + [autogen.sh] Reflect environment variable LIBTOOLIZE. + +2011-06-18 Werner Lemberg + + Update license documentation. + + * docs/GPL.TXT: Renamed to... + * docs/GPLv2.TXT: This. + + * docs/LICENSE.TXT: Updated. + +2011-06-14 suzuki toshiya + + Fix g++4.6 compiler warnings in module drivers. + + The background is same with previous commit. + + * src/truetype/ttgxvar.c (ft_var_readpackedpoints): + Init `points'. (TT_Vary_Get_Glyph_Deltas): Init + `delta_xy'. (TT_Get_MM_Var): Init `mmvar'. + * src/type1/t1load.c (T1_Get_MM_Var): Ditto. + * src/cff/cffdrivr.c (cff_ps_get_font_info): Init + `font_info'. + * src/cff/cffload.c (cff_index_get_pointers): Init `t'. + (cff_font_load): Init `sub'. + * src/cff/cffobjs.c (cff_size_init): Init `internal'. + (cff_face_init): Init `cff'. + * src/pfr/pfrload.c (pfr_extra_item_load_stem_snaps): + Init `snaps'. + * src/pcf/pcfread.c (pcf_get_properties): Init `properties'. + (pcf_get_bitmaps): Init `offsets'. (pcf_get_encodings): + Init `tmpEncoding'. + * src/sfnt/ttload.c (tt_face_load_gasp): Init `gaspranges'. + * src/sfnt/ttsbit.c (Load_SBit_Image): Init `components'. + * src/cache/ftcmru.c (FTC_MruList_New): Init `node'. + * src/gzip/ftgzip.c (FT_Stream_OpenGzip): Init `zip' and + `zip_buff'. + * src/lzw/ftlzw.c (FT_Stream_OpenLZW): Init `zip'. + * src/bzip2/ftbzip2.c (FT_Stream_OpenBzip2): Init `zip'. + +2011-06-14 suzuki toshiya + + [base] Fix g++4.6 compiler warnings in src/base/*.c. + + Passing uninitialized pointer to FT_NEW() families is + not problematic theoretically (as far as the returned + pointer is checked before writing), but g++4.6 dislikes + it and warns by -Wuninitialized. Initialize them by NULL. + + * src/base/ftobjs.c (FT_Stream_New): Init `stream'. + (new_memory_stream): Ditto. + (FT_New_GlyphSlot): Init `slot'. + (FT_CMap_New): Init `cmap'. + (open_face_PS_from_sfnt_stream): Init `sfnt_ps'. + (Mac_Read_POST_Resource): Init `pfb_data'. + (Mac_Read_sfnt_Resource): Init `sfnt_data'. + * src/base/ftrfork.c (FT_Raccess_Get_DataOffsets): + Init `offsets_internal' and `ref'. + (raccess_guess_darwin_hfsplus): Init `newpath'. + (raccess_guess_darwin_newvfs): Ditto. + * src/base/ftbitmap.c (ft_bitmap_assure_buffer): + Init `buffer'. + * src/base/ftstroke.c (FT_Stroker_New): Init `stroker'. + +2011-06-14 suzuki toshiya + + [gxvalid] Cleanup. + + Some invalid, overrunning, unrecommended non-zero values + are cared in paranoid validation mode only. There are + many lines looking like: + + if ( valid->root->level >= FT_VALIDATE_PARANOID ) + FT_INVALID_xxx; + + To simplify them, GXV_SET_ERR_IF_PARANOID( err ) is + introduced for more paranoid validation in future. + + * src/gxvalid/gxvcommn.h (IS_PARANOID_VALIDATION): + New macro to assure valid->root->level is more or + equal to FT_VALIDATE_PARANOID. (GXV_SET_ERR_IF_PARANOID): + New macro to raise an error if in paranoid validation. + * src/gxvalid/gxvcommn.c: Use GXV_SET_ERR_IF_PARANOID(). + * src/gxvalid/gxvfeat.c: Ditto. + * src/gxvalid/gxvjust.c: Ditto. + * src/gxvalid/gxvkern.c: Ditto. + * src/gxvalid/gxvmort.c: Ditto. + * src/gxvalid/gxvmort0.c: Ditto. + * src/gxvalid/gxvmort1.c: Ditto. + * src/gxvalid/gxvmort2.c: Ditto. + * src/gxvalid/gxvmorx1.c: Ditto. + * src/gxvalid/gxvmorx2.c: Ditto. + +2011-06-14 suzuki toshiya + + [gxvalid] Fix gcc4.6 compiler warnings in gxvtrak.c. + + * src/gxvalid/gxvtrak.c (gxv_trak_trackTable_validate): + Check different entries pointing same traking value. + (gxv_trak_validate): Remove unused variable `table_size'. + +2011-06-14 suzuki toshiya + + [gxvalid] Fix gcc4.6 compiler warnings in gxvmorx*.c. + + * src/gxvalid/gxvmorx.c (gxv_morx_subtables_validate): + Conditionalize unvalidated variable `subFeatureFlags'. + (gxv_morx_chain_validate): Conditionalize unvalidated + variable `defaultFlags'. + + * src/gxvalid/gxmorx0.c + (gxv_morx_subtable_type0_entry_validate): + Conditionalize unvalidated variables; `markFirst', + `dontAdvance', `markLast', `verb'. + + * src/gxvalid/gxmorx1.c + (gxv_morx_subtable_type1_entry_validate): Conditionalize + unvalidated variables; `setMark', `dontAdvance'. + + * src/gxvalid/gxvmorx2.c + (gxv_morx_subtable_type2_ligActionOffset_validate): + Conditionalize unvalidated variables; `last', `store'. + Checking for overrunning offset is added. + (gxv_morx_subtable_type2_entry_validate): + Conditionalize unvalidated variables; `setComponent', + `dontAdvance', `performAction'. + (gxv_morx_subtable_type2_ligatureTable_validate): + Check if the GID for ligature does not exceed the + max GID in `maxp' table. + + * src/gxvalid/gxvmort5.c + (gxv_morx_subtable_type5_InsertList_validate): + Conditionalize unvalidated loading of `insert_glyphID' + array. (gxv_morx_subtable_type5_entry_validate): + Conditionalize unvalidated variables; `setMark', + `dontAdvance', `currentIsKashidaLike', + `markedIsKashidaLike', `currentInsertBefore', + `markedInsertBefore'. + +2011-06-14 suzuki toshiya + + [gxvalid] Fix gcc4.6 compiler warnings in gxvmort*.c. + + * src/gxvalid/gxvmort.c (gxv_mort_subtables_validate): + Conditionalize unvalidated variable `subFeatureFlags'. + (gxv_mort_chain_validate): Conditionalize unvalidated + variable `defaultFlags'. + + * src/gxvalid/gxmort0.c + (gxv_mort_subtable_type0_entry_validate): Check the + conflict of the marks for the glyphs. + + * src/gxvalid/gxmort1.c + (gxv_mort_subtable_type1_offset_to_subst_validate): + Local variables `min_gid', `max_gid' are replaced by + variables in the validator. + (gxv_mort_subtable_type1_entry_validate): Conditionalize + unvalidated variables; `setMark', `dontAdvance'. + (gxv_mort_subtable_type1_substTable_validate): + Validate the GID by the min/max GIDs in the validator. + + * src/gxvalid/gxvmort2.c + (gxv_mort_subtable_type2_ligActionOffset_validate): + Conditionalize unvalidated variables; `last', `store'. + Checking for overrunning offset is added. + (gxv_mort_subtable_type2_entry_validate): + Conditionalize unvalidated variables; `setComponent', + `dontAdvance'. + (gxv_mort_subtable_type2_ligatureTable_validate): + Check if the GID for ligature does not exceed the + max GID in `maxp' table. + + * src/gxvalid/gxvmort5.c + (gxv_mort_subtable_type5_InsertList_validate): + Conditionalize unvalidated loading of `insert_glyphID' + array. (gxv_mort_subtable_type5_entry_validate): + Conditionalize unvalidated variables; `setMark', + `dontAdvance', `currentIsKashidaLike', + `markedIsKashidaLike', `currentInsertBefore', + `markedInsertBefore'. + +2011-06-14 suzuki toshiya + + [gxvalid] Fix gcc4.6 compiler warnings in gxvkern.c. + + * src/gxvalid/gxvkern.c + (gxv_kern_subtable_fmt0_pairs_validate): Conditionalize + unvalidated variable `kernValue'. + (gxv_kern_subtable_fmt1_entry_validate): Conditionalize + unvalidated variables; `push', `dontAdvance', `kernAction', + `kernValue'. + (gxv_kern_coverage_new_apple_validate): Conditionalize + trace-only variables; `kernVertical', `kernCrossStream', + `kernVariation'. + (gxv_kern_coverage_classic_apple_validate): Conditionalize + trace-only variables; `horizontal', `cross_stream'. + (gxv_kern_coverage_classic_microsoft_validate): + Conditionalize trace-only variables; `horizontal', + `minimum', `cross_stream', `override'. + (gxv_kern_subtable_validate): Conditionalize trace-only + variables; `version', `tupleIndex'. + +2011-06-14 suzuki toshiya + + [gxvalid] Fix gcc4.6 compiler warnings in gxvjust.c. + + * src/gxvalid/gxvjust.c (gxv_just_check_max_gid): + New function to unify the checks of too large GID. + (gxv_just_wdp_entry_validate): Conditionalize unvalidated + variables; `beforeGrowLimit', `beforeShrinkGrowLimit', + `afterGrowLimit', `afterShrinkGrowLimit', `growFlags', + `shrinkFlags'. Additional check for non-zero values in + unused storage `justClass' is added. + (gxv_just_actSubrecord_type0_validate): Conditionalize + unvalidated variable `order'. GID is checked by + gxv_just_check_max_gid(). Additional check for upside-down + relationship between `lowerLimit' and `upperLimit' is added. + (gxv_just_actSubrecord_type1_validate): GID is checked by + gxv_just_check_max_gid(). + (gxv_just_actSubrecord_type2_validate): Conditionalize + unvalidated variable `substThreshhold'. GID is checked by + gxv_just_check_max_gid(). + (gxv_just_actSubrecord_type5_validate): GID is checked by + gxv_just_check_max_gid(). + (gxv_just_classTable_entry_validate): Conditionalize + unvalidated variables; `setMark', `dontAdvance', + `markClass', `currentClass'. + +2011-06-14 suzuki toshiya + + [gxvalid] Preparation to fix gcc4.6 compiler warnings. + + * src/gxvalid/gxvcommn.h (GXV_LOAD_TRACE_VARS): New macro to + conditionalize the variable which is only used for trace messages. + Automatically set by FT_DEBUG_LEVEL_TRACE. + (GXV_LOAD_UNUSED_VARS): New macro to conditionalize the loading of + unvalidated variables. Undefined by default to calm gcc4.6 warning. + (GXV_ValidatorRec.{min_gid,max_gid}): New variables to hold defined + GID ranges, for the comparison of GID ranges in different subtables. + +2011-06-08 Werner Lemberg + + [autofit] Remove unused structure member. + + * src/autofit/afhints.h (AF_SegmentRec): Remove `contour'. + * src/autofit/aflatin.c (af_latin_hints_compute_segments), + src/autofit/aflatin2.c (af_latin2_hints_compute_segments): Updated. + +2011-05-30 Werner Lemberg + + Fix g++ 4.6 compilation. + + * src/autofit/afhints.c (af_glyph_hints_dump_segments, + af_glyph_hints_dump_edges): Use cast. + +2011-05-30 Werner Lemberg + + Fix gcc 4.6 compiler warnings. + + * src/autofit/afcjk.c (af_cjk_metrics_init_blues): Use casts and + remove unused variables. + * src/autofit/aflatin.c (af_latin_hints_compute_edges): Comment out + `up_dir'. + * src/smooth/ftsmooth.c (ft_smooth_render_generic): Use `height_org' + and `width_org' conditionalized. + +2011-05-28 suzuki toshiya + + [mac] Conditionalize the inclusion of `AvailabilityMacros.h'. + + The native SDK on earliest Mac OS X (10.0-10.1) did not have + `AvailabilityMacros.h'. To prevent the inclusion of missing + header file, ECANCELED (introduced in 10.2) in POSIX header + file is checked to detect the system version. + + * include/freetype/config/ftconfig.h: Conditionalize the + inclusion of `AvailabilityMacros.h'. + * builds/unix/ftconfig.in: Ditto. + * builds/vms/ftconfig.h: Ditto. + +2011-05-27 Werner Lemberg + + [autofit] Improve tracing of hinting process. + + * src/autofit/aflatin.c (af_latin_hint_edges): Add tracing message + `ADJUST'. + +2011-05-26 Werner Lemberg + + [autofit] Fix trace message. + + * src/autofit/aflatin.c (af_latin_hint_edges): Show correct value in + tracing message. + +2011-05-24 Daniel Zimmermann + + Reduce warnings for MS Visual Studio 2010. + + * src/autofit/afhints.c (af_glyph_hints_get_num_segments, + af_glyph_hints_get_segment_offset) [!FT_DEBUG_AUTOFIT]: Provide + return value. + * src/cff/cffgload.c (cff_slot_load): Add cast. + * src/truetype/ttobjs.c (tt_check_trickyness_sfnt_ids): Use proper + loop variable type. + +2011-05-16 suzuki toshiya + + Automake component `builds/unix/install-sh' is removed. + + * builds/unix/install-sh: Removed. It is not needed to + include repository, because autogen.sh installs it. + * builds/unix/.gitignore: Register install-sh. + +2011-05-12 suzuki toshiya + + [autofit] Make trace message for CJK bluezone more verbose. + +2011-05-08 Just Fill Bugs + suzuki toshiya + + [autofit] Add bluezones for CJK Ideographs. + + To remove extremas of vertical strokes of CJK Ideographs at + low resolution and make the top and bottom horizontal stems + aligned, bluezones for CJK Ideographs are calculated from + sample glyphs. At present, vertical bluezones (bluezones + to align vertical stems) are disabled by default. For detail, see + http://lists.gnu.org/archive/html/freetype-devel/2011-04/msg00070.html + http://lists.gnu.org/archive/html/freetype-devel/2011-04/msg00092.html + http://lists.gnu.org/archive/html/freetype-devel/2011-05/msg00001.html + + * include/freetype/internal/fttrace.h: New trace component `afcjk'. + * src/autofit/afcjk.h (AF_CJK{Blue,Axis,Metric}Rec): Add CJK version + for AF_Latin{Blue,Axis,Metric}Rec. + (af_cjk_metrics_check_digits): Ditto, shared with Indic module. + (af_cjk_metrics_init_widths): Ditto. + (af_cjk_metrics_init): Take AF_CJKMetric instead of AF_LatinMetric. + (af_cjk_metrics_scale): Ditto (declaration). + (af_cjk_hints_init): Ditto (declaration). + (af_cjk_hints_apply): Ditto (declaration). + * src/autofit/afcjk.c (af_cjk_metrics_scale): Ditto (body). + (af_cjk_hints_init): Ditto (body). + (af_cjk_hints_apply): Ditto (body). + (af_cjk_metrics_init_widths): Duplicate af_latin_metrics_init_widths. + (af_cjk_metrics_check_digits): Duplicate af_latin_metrics_check_digits. + (af_cjk_metrics_init): Call CJK bluezone initializer. + (af_cjk_metrics_scale_dim): Add code to scale bluezones. + (af_cjk_hints_compute_blue_edges): New function, CJK version of + af_latin_hints_compute_blue_edges. + (af_cjk_metrics_init_blues): New function, CJK version of + af_latin_metrics_init_blues. + (af_cjk_hints_edges): Add code to align the edge stems to blue zones. + + * src/autofit/afindic.c (af_indic_metrics_init): Take AF_CJKMetric + instead of AF_LatinMetric, and initialize as af_cjk_metrics_init. + However bluezones are not initialized. + (af_indic_metrics_scale): Take AF_CJKMetric instead of AF_LatinMetric. + (af_indic_hints_init): Ditto. + (af_indic_hints_apply): Ditto. + + * docs/CHANGES: Note about CJK bluezone support. + +2011-05-06 Werner Lemberg + + [autofit] Remove unused struct member. + + * src/autofit/aflatin.h (AF_LatinAxis): Remove `control_overshoot'. + +2011-05-04 Werner Lemberg + + * src/autofit/aflatin.c (af_latin_metrics_scale_dim): Simplify. + +2011-05-01 Just Fill Bugs + Werner Lemberg + + [autofit] Add more debugging functions. + + * src/autofit/afhints.c (af_glyph_hints_get_num_segments, + af_glyph_hints_get_segment_offset): New functions. + +2011-05-01 suzuki toshiya + + Add new option `--disable-mmap' to configure script. + + * builds/unix/configure.raw: New option `--disable-mmap' + is added. It is for the developers to simulate the systems + without mmap() (like 4.3BSD, minix etc) on POSIX systems. + +2011-04-30 suzuki toshiya + + [truetype] Always recalculate the sfnt table checksum. + + * src/truetype/ttobjs.c (tt_get_sfnt_checksum): Recalculate + the sfnt table checksum even if non-zero value is written in + the TrueType font header. Some bad PDF generators write + wrong values. For details see examples and benchmark tests + of the latency by recalculation: + http://lists.gnu.org/archive/html/freetype-devel/2011-04/msg00091.html + http://lists.gnu.org/archive/html/freetype-devel/2011-04/msg00096.html + +2011-04-30 suzuki toshiya + + [truetype] Register a set of tricky fonts, NEC FA family. + + * src/truetype/ttobjs.c (tt_check_trickyness_sfnt_ids): + Add 8 checksum sets for NEC FA family. For the tricky fonts + without some tables (e.g. NEC FA fonts lack cvt table), + extra check is added to assure that a zero-length table in the + registry is not included in the font. + +2011-04-29 suzuki toshiya + + [truetype] Fix a bug in the sfnt table checksum getter. + + * src/truetype/ttobjs.c (tt_get_sfnt_checksum): Check the + return value of face->goto_table() correctly. + +2011-04-28 Werner Lemberg + + [autofit] Improve tracing messages. + + * src/autofit/aflatin.c (af_latin_metrics_init_blues, + af_latin_align_linked_edge, af_latin_hint_edges): Do it. + +2011-04-25 Kan-Ru Chen + + [truetype] Always check the checksum to identify tricky fonts. + + Because some PDF generators mangle the family name badly, + the trickyness check by the checksum should be invoked always. + For sample PDF, see + http://lists.gnu.org/archive/html/freetype-devel/2011-04/msg00073.html + + * src/truetype/ttobjs.c (tt_check_trickyness): Even when + tt_check_trickyness_family() finds no trickyness, + tt_check_trickyness_sfnt_ids() is invoked. + +2011-04-22 suzuki toshiya + + [autofit] Add more Indic scripts with hanging baseline. + + * src/autofit/afindic.c (af_indic_uniranges): Tibetan, Limbu, + Sundanese, Meetei Mayak, Syloti Nagri and Sharada scripts are + added. + +2011-04-21 Behdad Esfahbod + + Always ignore global advance. + + This makes FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH redundant, + deprecated, and ignored. The new behavior is what every major user + of FreeType has been requesting. Global advance is broken in many + CJK fonts. Just ignoring it by default makes most sense. + + * src/truetype/ttdriver.c (tt_get_advances), + src/truetype/ttgload.c (TT_Get_HMetrics, TT_Get_VMetrics, + tt_get_metrics, compute_glyph_metrics, TT_Load_Glyph), + src/truetype/ttgload.h: Implement it. + + * docs/CHANGES: Updated. + +2011-04-21 rainy6144 + + [autofit] Blur CJK stems if too many to preserve their gaps. + + When there are too many stems to preserve their gaps in the + rasterization of CJK Ideographs at a low resolution, blur the + stems instead of showing clumped stems. See + http://lists.gnu.org/archive/html/freetype-devel/2011-02/msg00011.html + http://lists.gnu.org/archive/html/freetype-devel/2011-04/msg00046.html + for details. + + * src/autofit/afcjk.c (af_cjk_hint_edges): Store the position of + the previous stem by `has_last_stem' and `last_stem_pos', and skip + a stem if the current and previous stem are too near to preserve + the gap. + +2011-04-18 Werner Lemberg + + Integrate autofitter debugging stuff. + + * devel/ftoption.h, include/freetype/config/ftoption.h + (FT_DEBUG_AUTOFIT): New macro. + + * include/freetype/internal/fttrace.h: Add trace components for + autofitter. + + * src/autofit/aftypes.h (AF_LOG): Removed. + (_af_debug): Removed. + + * src/autofit/*: s/AF_DEBUG/FT_DEBUG_AUTOFIT/. + s/AF_LOG/FT_TRACE5/. + Define FT_COMPONENT where necessary. + +2011-04-18 Werner Lemberg + + Synchronize config files. + + * builds/unix/ftconfig.in: Copy missing assembler routines from + include/freetype/config/ftconfig.h. + +2011-04-13 Werner Lemberg + + [psaux] Fix Savannah bug #33047. + + Patch submitted by anonymous reporter. + + * src/psaux/psobjs.c (ps_table_add): Use FT_PtrDist for pointer + difference. + +2011-04-11 Kan-Ru Chen + + Fix reading of signed integers from files on 64bit platforms. + + Previously, signed integers were converted to unsigned integers, but + this can fail because of sign extension. For example, 0xa344a1eb + becomes 0xffffffffa344a1eb. + + We now do the reverse which is always correct because the integer + size is the same during the cast from unsigned to signed. + + * include/freetype/internal/ftstream.h, src/base/ftstream.c + (FT_Stream_Get*): Replace with... + (FT_Stream_GetU*): Functions which read unsigned integers. + Update all macros accordingly. + + * src/gzip/ftgzip.c (ft_gzip_get_uncompressed_size): Updated. + +2011-04-07 Werner Lemberg + + Update Unicode ranges for CJK autofitter; in particular, add Hangul. + + * src/autofit/afcjk.c (af_cjk_uniranges): Update to Unicode 6.0. + +2011-04-04 Werner Lemberg + + Fix formatting of autofit debug dumps. + + * src/autofit/afhints.c (af_glyph_hints_dump_points, + af_glyph_hints_dump_segments, af_glyph_hints_dump_edges): Adjust + column widths. + +2011-03-30 Werner Lemberg + + * src/autofit/aftypes.h (AF_OutlineRec): Removed, unused. + +2011-03-24 Werner Lemberg + + * src/cff/cfftypes.h (CFF_MAX_CID_FONTS): Increase to 256. + This limit is given on p. 37 of Adobe Technical Note #5014. + +2011-03-23 Werner Lemberg + + * src/truetype/ttpload.c (tt_face_load_loca): Fix mismatch warning. + +2011-03-20 Werner Lemberg + + * src/sfnt/sfobjs.c (sfnt_open_font): Check number of TTC subfonts. + +2011-03-19 Werner Lemberg + + More C++ compilation fixes. + + * src/autofit/afhints.c (af_glyph_hints_dump_points, + af_glyph_hints_dump_segments, af_glyph_hints_dump_edges) + [__cplusplus]: Protect with `extern "C"'. + +2011-03-18 Werner Lemberg + + C++ compilation fixes. + + * src/autofit/aflatin.c (af_latin_hints_apply), src/autofit/afcjk.c + (af_cjk_hints_apply): Use cast for `dim'. + +2011-03-17 Alexei Podtelezhnikov + + A better fix for Savannah bug #32671. + + * src/smooth/ftgrays.c (gray_render_conic): Clean up code and + replace WHILE loop with a more natural DO-WHILE construct. + +2011-03-16 Werner Lemberg . + + * src/base/ftstroke.c (FT_StrokerRec): Remove unused `valid' field. + Suggested by Graham Asher. + +2011-03-09 Werner Lemberg + + Make FT_Sfnt_Table_Info return the number of SFNT tables. + + * src/sfnt/sfdriver.c (sfnt_table_info): Implement it. + * include/freetype/tttables.h: Update documentation. + * docs/CHANGES: Updated. + +2011-03-07 Bram Tassyns + + [cff] Fix Savannah bug #27988. + + * src/cff/cffobjs.c (remove_style): New function. + (cff_face_init): Use it to strip off the style part of the family + name. + +2011-03-07 Werner Lemberg + + * docs/CHANGES: Updated. + +2011-03-07 Alexei Podtelezhnikov + + Quick fix for Savannah bug #32671. + + This isn't the optimal solution yet, but it restores the previous + rendering quality (more or less). + + * src/smooth/ftgrays.c (gray_render_conic): Do more splitting. + +2011-03-06 Werner Lemberg + + Fix autohinting fallback. + + * src/base/ftobjs.c (FT_Load_Glyph): Assure that we only check TTFs, + ignoring CFF-based OTFs. + +2011-02-27 Werner Lemberg + + Add AF_CONFIG_OPTION_USE_WARPER to control the autofit warper. + + * devel/ftoption.h, include/freetype/config/ftoption.h + (AF_CONFIG_OPTION_USE_WARPER): New macro. + * src/autofit/aftypes.h (AF_USE_WARPER): Remove. + + * src/autofit/*: s/AF_USE_WARPER/AF_CONFIG_OPTION_USE_WARPER/. + + * src/autofit/afwarp.c [!AF_CONFIG_OPTION_USE_WARPER]: Replace dummy + variable assignment with a typedef. + +2011-02-26 Werner Lemberg + + [autofit] Slight simplifications. + + * src/autofit/aflatin.c (af_latin_hints_link_segments): Remove + test which always returns false. + (af_latin_hints_compute_blue_edges): Remove redundant assignment. + +2011-02-24 Werner Lemberg + + * docs/PROBLEMS: Mention rendering differences on different + platforms. + Suggested and worded by Jason Owen . + +2011-02-24 Werner Lemberg + + [autofit] Comment out unused code. + + * src/autofit/aflatin.c, src/autofit/aflatin2.c + (af_latin_hints_compute_edges): Do it. + +2011-02-24 Werner Lemberg + + * src/autofit/afhints.h (AF_GlyphHints): Remove unused field. + +2011-02-20 suzuki toshiya + + [cache] Fix an off-by-one bug in `FTC_Manager_RemoveFaceID'. + Found by , see detail in + + http://lists.gnu.org/archive/html/freetype/2011-01/msg00023.html + + * src/cache/ftccache.c (FTC_Cache_RemoveFaceID): Check the node + buckets[cache->p + cache->mask] too. + +2011-02-19 Kevin Kofler + + Fall back to autohinting if a TTF/OTF doesn't contain any bytecode. + This is Savannah patch #7471. + + * src/base/ftobjs.c (FT_Load_Glyph): Implement it. + +2011-02-19 John Tytgat + + [cff] Fix subset prefix removal. + This is Savannah patch #7465. + + * src/cff/cffobjs.c (remove_subset_prefix): Update length after + subset prefix removal. + +2011-02-13 Bradley Grainger + + Add inline assembly version of FT_MulFix for MSVC. + + * include/freetype/config/ftconfig.h: Ported the FT_MulFix_i386 + function from GNU inline assembly syntax (see #ifdef __GNUC__ block + above) to MASM syntax for Microsoft Visual C++. + +2011-02-13 Bradley Grainger + + Add project and solution files in Visual Studio 2010 format. + + * builds/win32/.gitignore: Ignore user-specific cache files. + * builds/win32/vc2010/: Add VS2010 project & solution files, created + by upgrading builds/win32/vc2008/freetype.vcproj. + * objs/.gitignore: Ignore Visual Studio output files. + +2011-02-01 Werner Lemberg + + * src/autofit/afdummy.c: Include `aferrors.h'. + Problem reported by Chris Liddell . + +2011-02-01 Werner Lemberg + + [cff] Ignore unknown operators in charstrings. + Patch suggested by Miles.Lau . + + * src/cff/cffgload.c (cff_decoder_parse_charstrings): Emit tracing + message for unknown operators and continue instead of exiting with a + syntax error. + +2011-02-01 Werner Lemberg + + [truetype] FT_LOAD_PEDANTIC now affects `prep' and `fpgm' also. + + * src/truetype/ttgload.c (tt_loader_init): Handle + `FT_LOAD_PEDANTIC'. + * src/truetype/ttobjs.c (tt_size_run_fpgm, tt_size_run_prep, + tt_size_init_bytecode, tt_size_ready_bytecode): New argument to + handle pedantic mode. + * src/truetype/ttobjs.h: Updated. + +2011-01-31 Werner Lemberg + + [truetype] Protect jump instructions against endless loops. + + * src/truetype/interp.c (DO_JROT, DO_JMPR, DO_JROF): Exit with error + if offset is zero. + +2011-01-31 Werner Lemberg + + [truetype] Improve handling of invalid references. + + * src/truetype/interp.c: Set even more TT_Err_Invalid_Reference + error codes only if pedantic hinting is active. At the same time, + try to provide sane values which hopefully allow useful + continuation. Exception to this is CALL and LOOPCALL – due to + possible stack corruption it is necessary to bail out. + +2011-01-31 Werner Lemberg + + [truetype] Improve handling of stack underflow. + + * src/truetype/ttinterp.c (TT_RunIns, Ins_FLIPPT, Ins_DELTAP, + Ins_DELTAC): Exit with error only if `pedantic_hinting' is set. + Otherwise, try to do something sane. + +2011-01-30 Werner Lemberg + + * src/sfnt/ttmtx.c (tt_face_load_hmtx): Fix tracing message. + +2011-01-30 LIU Sun-Liang + + [truetype]: Fix behaviour of MIAP for invalid arguments. + + * src/truetype/ttinterp.c (Ins_MIAP): Set reference points even in + case of error. + +2011-01-18 Werner Lemberg + + [truetype] Fix handling of MIRP instruction. + + Thanks to Greg Hitchcock who explained the issue. + + * src/truetype/ttinterp.c (Ins_MIRP): Replace a `>=' operator with + `>' since the description in the specification is incorrect. + This fixes, for example, glyph `two' in font `Helvetica Neue LT Com + 65 medium' at 15ppem. + +2011-01-15 suzuki toshiya + + Fix ARM assembly code in include/freetype/config/ftconfig.h. + + * include/freetype/config/ftconfig.h (FT_MulFix_arm): + Copy the maintained code from builds/unix/ftconfig.in. + Old GNU binutils could not accept the reduced syntax + `orr %0, %2, lsl #16'. Un-omitted syntax like RVCT, + `orr %0, %0, %2, lsl #16' is better. Reported by + Johnson Y. Yan. The bug report by Qt developers is + considered too. + + http://bugreports.qt.nokia.com/browse/QTBUG-6521 + +2011-01-15 Werner Lemberg + + [raster] Make bbox handling the same as with Microsoft's rasterizer. + + Right before B/W rasterizing, the bbox gets simply rounded to + integers. This fixes, for example, glyph `three' in font `Helvetica + Neue LT Com 65 Medium' at 11ppem. + + Thanks to Greg Hitchcock who explained this behaviour. + + * src/raster/ftrend1.c (ft_raster1_render): Implement it. + +2011-01-15 suzuki toshiya + + Copy -mcpu=* & -march=* options from CFLAGS to LDFLAGS. + + * builds/unix/configure.raw: Consider recent gcc-standard + flags to specify architecture in CFLAGS & LDFLAGS + harmonization. Requested by Savannah bug #32114, to + support multilib feature of BuildRoot SDK correctly. + +2011-01-15 suzuki toshiya + + Fix off-by-one bug in CFLAGS & LDFLAGS harmonizer. + + * builds/unix/configure.raw: Some important options that + included in CFLAGS but not in LDFLAGS are copied to + LDFLAGS, but the last option in CFLAGS was not checked. + +2011-01-13 Werner Lemberg + + [raster] Add undocumented drop-out rule to the other bbox side also. + + * src/raster/ftraster.c (Vertical_Sweep_Drop, + Horizontal_Sweep_Drop): Implement it. + +2011-01-13 Werner Lemberg + + [raster] Reduce jitter value. + + This catches a rendering problem with glyph `x' from Tahoma at + 10ppem. It seems that the increase of the precision in the change + from 2009-06-11 makes a larger jitter value unnecessary. + + * src/raster/ftraster.c (Set_High_Precision): Implement it. + +2011-01-13 Werner Lemberg + + [raster] Handle drop-outs at glyph borders according to Microsoft. + + If a drop-out rule would switch on a pixel outside of the glyph's + bounding box, use the right (or top) pixel instead. This is an + undocumented feature, but some fonts like `Helvetica Neue LT Com 65 + Medium' heavily rely on it. + + Thanks to Greg Hitchcock who explained this behaviour. + + * src/raster/ftraster.c (Vertical_Sweep_Drop, + Horizontal_Sweep_Drop): Implement it. + +2011-01-09 suzuki toshiya + + [cache] Fix Savannah bug #31923, patch drafted by Harsha. + + When a node comparator changes the cached nodes during the + search of a node matching with queried properties, the + pointers obtained before the function should be updated to + prevent the dereference to freed or reallocated nodes. + To minimize the rescan of the linked list, the update is + executed when the comparator notifies the change of cached + nodes. This change depends previous change: + 38b272ffbbdaae276d636aec4ef84af407d16181 + + * src/cache/ftccache.h (FTC_CACHE_LOOKUP_CMP): Rescan the + top node if the cached nodes are changed. + * src/cache/ftccache.c (FTC_Cache_Lookup): Ditto. + +2011-01-09 suzuki toshiya + + [cache] Notice if a cache query induced the node list change. + + Some node comparators (comparing the cache node contents and the + properties specified by the query) can flush the cache node to + prevent the cache inflation. The change may invalidate the pointers + to the node obtained before the node comparison, so it should be + noticed to the caller. The problem caused by the cache node + changing is reported by Harsha, see Savannah bug #31923. + + * src/cache/ftccache.h (FTC_Node_CompareFunc): Add new argument + `FT_Bool* list_changed' to indicate the change of the cached nodes + to the caller. + (FTC_CACHE_LOOKUP_CMP): Watch the change of the cached nodes by + `_list_changed'. + (FTC_CACHE_TRYLOOP_END): Take new macro argument `_list_changed' + and update it when `FTC_Manager_FlushN' flushes any nodes. + + * src/cache/ftccback.h (ftc_snode_compare): Updated to fit with new + FTC_Node_CompareFunc type. + (ftc_gnode_compare): Ditto. + + * src/cache/ftcbasic.c: Include FT_INTERNAL_OBJECTS_H to use + TRUE/FALSE macros. + (ftc_basic_gnode_compare_faceid): New argument `FT_Bool* + list_changed' to indicate the change of the cache nodes (anyway, it + is always FALSE). + + * src/cache/ftccmap.c: Include FT_INTERNAL_OBJECTS_H to use + TRUE/FALSE macros. + (ftc_cmap_node_compare): New argument `FT_Bool* list_changed' to + indicate the change of the cache nodes (anyway, it is always FALSE). + (ftc_cmap_node_remove_faceid): Ditto. + + * src/cache/ftccache.c (FTC_Cache_NewNode): Pass a NULL pointer to + `FTC_CACHE_TRYLOOP_END', because the result is not needed. + (FTC_Cache_Lookup): Watch the change of the cache nodes by + `list_changed'. + (FTC_Cache_RemoveFaceID): Ditto. + + * src/cache/ftcglyph.c: Include FT_INTERNAL_OBJECTS_H to use + TRUE/FALSE macros. + (ftc_gnode_compare): New argument `FT_Bool* list_changed' to + indicate the change of the cache nodes (anyway, it is always FALSE). + (FTC_GNode_Compare): New argument `FT_Bool* list_changed' to be + passed to `ftc_gnode_compare'. + * src/cache/ftcglyph.h (FTC_GNode_Compare): Ditto. + + * src/cache/ftcsbits.c (ftc_snode_compare): New argument `FT_Bool* + list_changed' to indicate the change of the cache nodes, anyway. It + is updated by `FTC_CACHE_TRYLOOP'. + (FTC_SNode_Compare): New argument `FT_Bool* list_changed' to be + passed to `ftc_snode_compare'. + * src/cache/ftcsbits.h (FTC_SNode_Compare): Ditto. + +2011-01-09 suzuki toshiya + + [cache] Fit `FTC_GNode_Compare' to `FTC_Node_CompareFunc'. + + * src/cache/ftcglyph.h (FTC_GNode_Compare): Add the 3rd + argument `FTC_Cache cache' to fit FTC_Node_CompareFunc + prototype. + * src/cache/ftcglyph.c (FTC_GNode_Compare): Ditto. Anyway, + `cache' is not used by its child `ftc_gnode_compare'. + +2011-01-09 suzuki toshiya + + [cache] Deduplicate the code to get the top node by a hash. + + There are several duplicated code fragments getting the top node + from a cache by a given hash, like: + + idx = hash & cache->mask; + if ( idx < cache->p ) + idx = hash & ( cache->mask * 2 + 1 ); + pnode = cache->buckets + idx; + + To remove duplication, a cpp-macro to do same work + `FTC_NODE__TOP_FOR_HASH' is introduced. For non-inlined + configuration, non-`ftc_get_top_node_for_hash' is also introduced. + + * src/cache/ftccache.h (FTC_NODE__TOP_FOR_HASH): Declare + and implement inlined version. + (FTC_CACHE_LOOKUP_CMP): Use `FTC_NODE__TOP_FOR_HASH'. + * src/cache/ftccache.c (ftc_get_top_node_for_hash): Non-inlined + version. + (ftc_node_hash_unlink): Use `FTC_NODE__TOP_FOR_HASH'. + (ftc_node_hash_link): Ditto. + (FTC_Cache_Lookup): Ditto. + +2011-01-09 suzuki toshiya + + [cache] inline-specific functions are conditionalized. + + * src/cache/ftcglyph.c (FTC_GNode_Compare): Conditionalized for + inlined configuration. This function is a thin wrapper of + `ftc_gnode_compare' for inlined `FTC_CACHE_LOOKUP_CMP' (see + `nodecmp' argument). Under non-inlined configuration, + `ftc_gnode_compare' is invoked by `FTC_Cache_Lookup', via + `FTC_Cache->clazz.node_compare'. + + * src/cache/ftcglyph.h (FTC_GNode_Compare): Ditto. + * src/cache/ftcsbits.c (FTC_SNode_Compare): Ditto, for + `ftc_snode_compare'. + * src/cache/ftcsbits.h (FTC_SNode_Compare): Ditto. + +2011-01-09 suzuki toshiya + + [cache] Correct a type mismatch under non-inlined config. + + * src/cache/ftcglyph.h (FTC_GCACHE_LOOKUP_CMP): `FTC_GCache_Lookup' + takes the node via a pointer `FTC_Node*', differently from cpp-macro + `FTC_CACHE_LOOKUP_CMP'. + +2011-01-06 suzuki toshiya + + Update Jamfile to include Bzip2 support. + + * Jamfile: Include src/bzip2 to project. + Comments for lzw, gzip, bzip2 are changed to clarify that + they are for compressed PCF fonts, not others. + (e.g. compressed BDF fonts are not supported yet) + +2011-01-05 suzuki toshiya + + Update Symbian project files to include Bzip2 support. + + Currently, it provides `FT_Stream_OpenBzip2' that returns + unimplemented error always, to prevent unresolved symbol + error for the applications designed for Unix systems. + + * builds/symbian/bld.inf: Include ftbzip2.h. + * builds/symbian/freetype.mmp: Include ftbzip2.c. + +2011-01-05 suzuki toshiya + + Update classic MacOS makefiles to include Bzip2 support. + + Currently, it provides `FT_Stream_OpenBzip2' that returns + unimplemented error always, to prevent unresolved symbol + error for the applications designed for Unix systems. + + * builds/mac/FreeType.m68k_cfm.make.txt: Include ftbzip2.c.o. + * builds/mac/FreeType.m68k_far.make.txt: Ditto. + * builds/mac/FreeType.ppc_carbon.make.txt: Include ftbzip2.c.x. + * builds/mac/FreeType.ppc_classic.make.txt: Ditto. + +2011-01-05 suzuki toshiya + + Update Amiga makefiles to include Bzip2 support. + + Currently, it provides `FT_Stream_OpenBzip2' that returns + unimplemented error always, to prevent unresolved symbol + error for the applications designed for Unix systems. + + * builds/amiga/makefile: Include bzip2.ppc.o built from ftbzip2.c. + * builds/amiga/makefile.os4: Include bzip2.o built from ftbzip2.c. + * builds/amiga/smakefile: Ditto. + +2011-01-05 suzuki toshiya + + Update pkg-config tools to reflect Bzip2 support. + + * builds/unix/freetype-config.in: Include `-lbz2' to + --libs output, if built with Bzip2 support. + * builds/unix/freetype2.in: Ditto. + +2011-01-05 suzuki toshiya + + * builds/unix/configure.raw: Remove `SYSTEM_BZ2LIB' macro. + + SYSTEM_ZLIB is used to switch the builtin zlib source + or system zlib source out of FreeType2. But ftbzip2 + module has no builtin bzip2 library and always requires + system bzip2 library. Thus SYSTEM_BZ2LIB is always yes, + it is not used. + +2011-01-03 Werner Lemberg + + */rules.mk: Handle `*pic.c' files. + +2010-12-31 Werner Lemberg + + * src/cff/cfftypes.h (CFF_MAX_CID_FONTS): Increase to 64. + Problem reported by Tom Bishop . + +2010-12-31 Werner Lemberg + + Improve bzip2 support. + + * include/freetype/ftmoderr.h: Add bzip2. + + * docs/INSTALL.ANY, docs/CHANGES: Updated. + + * src/pcf/README: Updated. + * include/freetype/internal/pcftypes.h: Obsolete, removed. + +2010-12-31 Joel Klinghed + + Add bzip2 compression support to handle *.pcf.bz2 files. + + * builds/unix/configure.raw: Test for libbz2 library. + + * devel/ftoption.h, include/freetype/config/ftoption.h + (FT_CONFIG_OPTION_USE_BZIP2): Define. + * include/freetype/config/ftheader.h (FT_BZIP2_H): Define. + + * include/freetype/ftbzip2.h: New file. + + * src/bzip2/*: New files. + + * src/pcf/pcf.h: s/gzip_/comp_/. + * src/pcf/pcfdrvr.c: Include FT_BZIP2_H. + s/gzip_/comp_/. + (PCF_Face_Init): Handle bzip2 compressed files. + + * docs/formats.txt, modules.cfg: Updated. + +2010-12-25 Harsha + + Apply Savannah patch #7422. + + If we encounter a space in a string then the sbit buffer is NULL, + height and width are 0s. So the check in ftc_snode_compare will + always pass for spaces (comparision with 255). Here the comments + above the condition are proper but the implementation is not. When + we create an snode I think it is the proper way to initialize the + width to 255 and then put a check for being equal to 255 in snode + compare function. + + * src/cache/ftcsbits.c (FTC_SNode_New): Initialize sbit widths with + value 255. + (ftc_snode_compare): Fix condition. + +2010-12-13 Werner Lemberg + + Fix parameter handling of `FT_Set_Renderer'. + Reported by Kirill Tishin . + + * src/base/ftobjs.c (FT_Set_Renderer): Increment `parameters'. + +2010-12-09 Werner Lemberg + + [cff] Allow `hlineto' and `vlineto' without arguments. + + We simply ignore such instructions. This is invalid, but it doesn't + harm; and indeed, there exist such subsetted fonts in PDFs. + + Reported by Albert Astals Cid . + + * src/cff/cffgload.c (cff_decoder_parse_charstrings) + [cff_op_hlineto]: Ignore instruction if there aren't any arguments + on the stack. + +2010-11-28 Werner Lemberg + + * Version 2.4.4 released. + ========================= + + + Tag sources with `VER-2-4-4'. + + * docs/CHANGES: Updated. + + * docs/VERSION.DLL: Update documentation and bump version number to + 2.4.4 + + * README, Jamfile (RefDoc), + builds/win32/vc2005/freetype.vcproj, builds/win32/vc2005/index.html, + builds/win32/vc2008/freetype.vcproj, builds/win32/vc2008/index.html, + builds/win32/visualc/freetype.dsp, + builds/win32/visualc/freetype.vcproj, + builds/win32/visualc/index.html, builds/win32/visualce/freetype.dsp, + builds/win32/visualce/freetype.vcproj, + builds/win32/visualce/index.html, + builds/wince/vc2005-ce/freetype.vcproj, + builds/wince/vc2005-ce/index.html, + builds/wince/vc2008-ce/freetype.vcproj, + builds/wince/vc2008-ce/index.html: s/2.4.3/2.4.4/, s/243/244/. + + * include/freetype/freetype.h (FREETYPE_PATCH): Set to 4. + + * builds/unix/configure.raw (version_info): Set to 12:2:6. + +2010-11-28 Alexei Podtelezhnikov + + [ftsmooth]: Minor code simplification. + + * src/smooth/ftgrays (gray_render_cubic): Do only one comparison + instead of two. + +2010-11-26 Johnson Y. Yan + + [truetype] Better multi-threading support. + + * src/truetype/ttinterp.c (TT_Load_Context): Reset glyph zone + references. + +2010-11-23 John Tytgat + + * src/psaux/t1decode.c (t1_decoder_parse_charstring): Expand + start_point, check_points, add_point, add_point1, close_contour + macros. + Remove add_contour macro. + Return error code from t1_builder_start_point and + t1_builder_check_points when there was one (instead of returning 0). + +2010-11-22 suzuki toshiya + + [truetype] Identify the tricky fonts by cvt/fpgm/prep checksums. + Some Latin TrueType fonts are still expected to be unhinted. + Fix Savannah bug #31645. + + * src/truetype/ttobjs.c (tt_check_trickyness): Divided to... + (tt_check_trickyness_family): this checking family name, and + (tt_check_trickyness_sfnt_ids): this checking cvt/fpgm/prep. + (tt_get_sfnt_checksum): Function to retrieve the sfnt checksum + for specified subtable even if cleared by lazy PDF generators. + (tt_synth_sfnt_checksum): Function to calculate the checksum. + +2010-11-18 Werner Lemberg + + [truetype] Fix `loca' handling for inconsistent number of glyphs. + Reported by Johnson Y. Yan . + + * src/truetype/ttpload.c (tt_face_load_loca): While sanitizing, + handle case where `loca' is the last table in the font. + +2010-11-18 Werner Lemberg + + [sfnt] Ignore all errors while loading `OS/2' table. + Suggested by Johnson Y. Yan . + + * src/sfnt/sfobjs.c (sfnt_load_face): Do it. + +2010-11-18 Johnson Y. Yan + + [type1] Fix matrix normalization. + + * src/type1/t1load.c (parse_font_matrix): Handle sign of scaling + factor. + +2010-11-18 Werner Lemberg + + [type1] Improve guard against malformed data. + Based on a patch submitted by Johnson Y. Yan + + + * src/type1/t1load.c (read_binary_data): Check `size'. + +2010-11-17 Werner Lemberg + + [sfnt] While tracing, output table checksums also. + + * src/sfnt/ttload.c (tt_face_load_font_dir): Do it. + +2010-11-04 suzuki toshiya + + [UVS] Fix `find_variant_selector_charmap', Savannah bug #31545. + + Since 2010-07-04, `find_variant_selector_charmap' returns + the first cmap subtable always under rogue-compatible + configuration, it causes NULL pointer dereference and + make UVS-related functions crashed. + + * src/base/ftobjs.c (Fix find_variant_selector_charmap): + Returns UVS cmap correctly. + +2010-11-01 Alexei Podtelezhnikov + + [ftsmooth] Improve rendering. + + * src/smooth/ftsmooth.c (gray_render_conic): Since version 2.4.3, + cubic deviations have been estimated _after_ UPSCALE, whereas + conic ones have been evaluated _before_ UPSCALE, which produces + inferior rendering results. Fix this. + Partially undo change from 2010-10-15 by using ONE_PIXEL/4; this has + been tested with demo images sent to the mailing list. See + + http://lists.gnu.org/archive/html/freetype-devel/2010-10/msg00055.html + + and later mails in this thread. + +2010-10-28 Werner Lemberg + + [ftraster] Minor fixes. + + Reported by Tom Bishop . + + * src/raster/ftraster.c (ULong): Remove unused typedef. + (TWorker): Remove unused variable `precision_mask'. + +2010-10-28 Werner Lemberg + + [ftraster] Fix rendering. + + Problem reported by Tom Bishop ; see + thread starting with + + http://lists.gnu.org/archive/html/freetype/2010-10/msg00049.html + + * src/raster/ftraster.c (Line_Up): Replace FMulDiv with SMulDiv + since the involved multiplication exceeds 32 bits. + +2010-10-25 suzuki toshiya + + Revert a change of `_idx' type in `FTC_CACHE_LOOKUP_CMP'. + + * src/cache/ftccache.h (FTC_CACHE_LOOKUP_CMP): Revert + the type of `_idx' from FT_PtrDist (by previous change) + to original FT_UFast, to match with FT_CacheRec. + +2010-10-24 suzuki toshiya + + [cache] Change the hash types to FT_PtrDist. + + On LLP64 platforms (e.g. Win64), FT_ULong (32-bit) + variables are inappropriate to calculate hash values + from the memory address (64-bit). The hash variables + are extended from FT_ULong to FT_PtrDist and new + hashing macro functions are introduced. The hash + values on 16-bit memory platforms are changed, but + ILP32 and LP64 are not changed. The hash value in + the cache subsystem is not reverted to the memory + address, so using signed type FT_PtrDist is safe. + + * src/cache/ftccache.h (_FTC_FACE_ID_HASH): New hash + function to replace `FTC_FACE_ID_HASH' for portability. + * src/cache/ftcmanag.h (FTC_SCALER_HASH): Replace + `FTC_FACE_ID_HASH' by `_FTC_FACE_ID_HASH'. + * src/cache/ftccmap.c (FTC_CMAP_HASH): Ditto. + + * src/cache/ftccache.h (FTC_NodeRec): The type of the + member `hash' is changed from FT_UInt32 to FT_PtrDist. + + * src/cache/ftccache.h (FTC_Cache_Lookup): The type of the + argument `hash' is changed from FT_UInt32 to FT_PtrDist. + (FTC_Cache_NewNode): Ditto. + * src/cache/ftccache.c (ftc_cache_add): Ditto. + (FTC_Cache_Lookup): Ditto. (FTC_Cache_NewNode): Ditto. + * src/cache/ftcglyph.h (FTC_GCache_Lookup): Ditto. + * src/cache/ftcglyph.c (FTC_GCache_Lookup): Ditto. + + * src/cache/ftcbasic.c (FTC_ImageCache_Lookup): The type + of the internal variable `hash' is changed to FT_PtrDist + from FT_UInt32. (FTC_ImageCache_LookupScaler): Ditto. + (FTC_SBitCache_Lookup): Ditto. + (FTC_SBitCache_LookupScaler): Ditto. + * src/cache/ftccmap.c (FTC_CMapCache_Lookup): Ditto. + * src/cache/ftccache.h (FTC_CACHE_LOOKUP_CMP): Ditto. + Also the type of the internal variable `_idx' is changed to + FT_PtrDist from FT_UFast for better pointer calculation. + +2010-10-24 suzuki toshiya + + [cache] Hide internal macros incompatible with LLP64. + + `FT_POINTER_TO_ULONG', `FTC_FACE_ID_HASH', and + `FTC_IMAGE_TYPE_HASH' are enclosed by + FT_CONFIG_OPTION_OLD_INTERNALS and hidden from + normal clients. + + For the history of these macros, see the investigation: + http://lists.gnu.org/archive/html/freetype/2010-10/msg00022.html + +2010-10-24 suzuki toshiya + + Change the type of `FT_MEM_VAL' from FT_ULong to FT_PtrDist. + + On LLP64 platforms (e.g. Win64), unsigned long (32-bit) + cannot cover the memory address (64-bit). `FT_MEM_VAL' is + used for hashing only and not dereferred, so using signed + type FT_PtrDist is safe. + + * src/base/ftdbgmem.c (FT_MEM_VAL): Change the type of the + return value from FT_ULong to FT_PtrDist. + (ft_mem_table_resize): The type of hash is changed to + FT_PtrDist. (ft_mem_table_get_nodep): Ditto. + +2010-10-24 suzuki toshiya + + Replace "%lx" for memory address by "%p", LLP64 platforms. + + On LLP64 platforms (e.g. Win64), long (32-bit) cannot cover + the memory address (64-bit). Also the casts from the pointer + type to long int should be removed to preserve the address + correctly. + + * src/raster/ftraster.c (New_Profile): Replace "%lx" by "%p". + (End_Profile) Ditto. + * src/truetype/ttinterp.c (Init_Context): Ditto. + +2010-10-15 Alexei Podtelezhnikov + + Fix thinko in spline flattening. + + FT_MAX_CURVE_DEVIATION is dependent on the value of ONE_PIXEL. + + * src/smooth/ftgrays.c (FT_MAX_CURVE_DEVIATION): Remove it and + replace it everywhere with ONE_PIXEL/8. + +2010-10-13 suzuki toshiya + + [raccess] Skip unrequired resource access rules by Darwin VFS. + + When a resource fork access rule by Darwin VFS could open the + resource fork but no font is found in it, the rest of rules + by Darwin VFS are skipped. It reduces the warnings of the + deprecated resource fork access method by recent Darwin kernel. + Fix MacPorts ticket #18859: + http://trac.macports.org/ticket/18859 + + * src/base/ftobjs.c (load_face_in_embedded_rfork): + When `FT_Stream_New' returns FT_Err_Cannot_Open_Stream, it + means that the file is possible to be `fopen'-ed but zero-sized. + Also there is a case that the resource fork is not zero-sized, + but no supported font exists in it. If a rule by Darwin VFS + falls into such cases, there is no need to try other Darwin VFS + rules anymore. Such cases are marked by vfs_rfork_has_no_font. + If it is TRUE, the Darwin VFS rules are skipped. + +2010-10-13 suzuki toshiya + + [raccess] Grouping resource access rules based on Darwin VFS. + + MacOS X/Darwin kernel supports a few tricky methods to access + a resource fork via ANSI C or POSIX interface. Current resource + fork accessor tries all possible methods to support all kernels. + But if a method could open a resource fork but no font is found, + there is no need to try other methods older than tested method. + To determine whether the rule index is for Darwin VFS, a local + function `ftrfork.c::raccess_rule_by_darwin_vfs' is introduced. + To use this function in ftobjs.c etc but it should be inlined, + it is exposed by ftbase.h. + + * src/base/ftrfork.c (FT_RFork_Rule): New enum type to identify + the rules to access the resource fork. + (raccess_guess_rec): New structure to bind the rule function and + rule enum type. + (FT_Raccess_Guess): The list of the rule functions is replaced by + (raccess_guess_table): This. This is exposed to be used by other + intra module functions. + (raccess_rule_by_darwin_vfs): A function to return a boolean + if the rule specified by the rule index is based on Darwin VFS. + +2010-10-13 suzuki toshiya + + Prevent to open a FT_Stream for zero-sized file on non-Unix. + + builds/unix/ftsystem.c prevents to open an useless stream from + zero-sized file and returns FT_Err_Cannot_Open_Stream, but the + stream drivers for ANSI C, Amiga and VMS return useless streams. + For cross-platform consistency, all stream drivers should act + same. + + * src/base/ftsystem.c (FT_Stream_Open): If the size of the opened + file is zero, FT_Err_Cannot_Open_Stream is returned. + * builds/amiga/src/base/ftsystem.c (FT_Stream_Open): Ditto. + * src/vms/ftsystem.c (FT_Stream_Open): Ditto. + +2010-10-12 Werner Lemberg + + [truetype] Fix Savannah bug #31310. + + * src/truetype/ttgxvar.c (ft_var_readpackedpoints): Protect against + invalid `runcnt' values. + +2010-10-08 Chris Liddell + + [sfnt] Fix Savannah bug #31275. + + * src/sfnt/ttpost.c: Include FT_INTERNAL_DEBUG_H. + +2010-10-06 Werner Lemberg + + [truetype] Improve error handling of `SHZ' bytecode instruction. + Problem reported by Chris Evans . + + * src/truetype/ttinterp.c (Ins_SHZ): Check `last_point'. + +2010-10-05 Werner Lemberg + + Fix Savannah bug #31253. + Patch submitted by an anonymous reporter. + + * configure: Use `awk' instead of `sed' to manipulate output of `ls + -id'. + +2010-10-03 Werner Lemberg + + * Version 2.4.3 released. + ========================= + + + Tag sources with `VER-2-4-3'. + + * docs/CHANGES: Updated. + + * docs/VERSION.DLL: Update documentation and bump version number to + 2.4.3 + + * README, Jamfile (RefDoc), + builds/win32/vc2005/freetype.vcproj, builds/win32/vc2005/index.html, + builds/win32/vc2008/freetype.vcproj, builds/win32/vc2008/index.html, + builds/win32/visualc/freetype.dsp, + builds/win32/visualc/freetype.vcproj, + builds/win32/visualc/index.html, builds/win32/visualce/freetype.dsp, + builds/win32/visualce/freetype.vcproj, + builds/win32/visualce/index.html, + builds/wince/vc2005-ce/freetype.vcproj, + builds/wince/vc2005-ce/index.html, + builds/wince/vc2008-ce/freetype.vcproj, + builds/wince/vc2008-ce/index.html: s/2.4.2/2.4.3/, s/242/243/. + + * include/freetype/freetype.h (FREETYPE_PATCH): Set to 3. + + * builds/unix/configure.raw (version_info): Set to 12:1:6. + +2010-10-03 Werner Lemberg + + Avoid `configure' issues with symbolic links. + Based on a patch from Alexander Stohr . + + * configure: Compare directories using `ls -id'. + Check existence of `reference' subdirectory before creating it. + +2010-10-02 Werner Lemberg + + [sfnt] Fix Savannah bug #31088 (sort of). + + * src/sfnt/ttload.c (tt_face_load_maxp): Always allocate at least 64 + function entries. + +2010-10-02 Werner Lemberg + + [smooth] Fix splitting of cubics for negative values. + + Reported by Róbert Márki ; see + http://lists.gnu.org/archive/html/freetype/2010-09/msg00019.html. + + * src/smooth/ftgrays.c (gray_render_cubic): Fix thinko. + +2010-10-01 suzuki toshiya + + [truetype] Fix Savannah bug #31040. + + * src/truetype/ttinterp.c (free_buffer_in_size): Remove. + (TT_RunIns): Updated. + +2010-09-20 suzuki toshiya + + [sfnt] Make error message filling NULL names less verbose. + + * src/sfnt/ttpost.c (load_format_20): Showing 1 summary message + when we fill `post' names by NULL, instead of per-entry message. + +2010-09-20 Graham Asher + David Bevan + + [smooth] Fix and improve spline flattening. + + This fixes the flattening of cubic, S-shaped curves and speeds up + the handling of both the conic and cubic arcs. + + See the discussions on the freetype-devel mailing list in late + August and September 2010 for details. + + * src/smooth/ftgrays.c (FT_MAX_CURVE_DEVIATION): New macro. + (TWorker): Remove `conic_level' and `cubic_level' elements. + (gray_render_conic): Simplify algorithm. + (gray_render_cubic): New algorithm; details are given in the code + comments. + (gray_convert_glyph): Remove heuristics. + +2010-09-19 Werner Lemberg + + Minor fixes. + + * src/cff/cffload.c (cff_charset_compute_cids): `charset->sids[i]' + is `FT_UShort'. + (cff_index_access_element): Don't use additions in comparison. + * src/sfnt/ttpost.c (load_format_20): Make `post_limit' of type + `FT_Long'. + Don't use additions in comparison. + Improve tracing messages. + (load_format_25, load_post_names): Make `post_limit' of type + `FT_Long'. + +2010-09-19 suzuki toshiya + + [cff] Truncate the element length at the end of the stream. + See Savannah bug #30975. + + * src/cff/cffload.c (cff_index_access_element): `off2', the offset + to the next element is truncated at the end of the stream to prevent + invalid I/O. As `off1', the offset to the requested element has + been checked by `FT_STREAM_SEEK', `off2' should be checked + similarly. + +2010-09-19 suzuki toshiya + + [cff] Ignore CID > 0xFFFFU. + See Savannah bug #30975. + + * src/cff/cffload.c (cff_charset_compute_cids): Ignore CID if + greater than 0xFFFFU. CFF font spec does not mention maximum CID in + the font, but PostScript and PDF spec define that maximum CID is + 0xFFFFU. + +2010-09-19 suzuki toshiya + + [cff] Make trace message in` cff_charset_load' verbose. + See Savannah bug #30975. + + * src/cff/cffload.c (cff_charset_load): Report the original `nleft' + and truncated `nleft'. + +2010-09-19 suzuki toshiya + + [cff] Correct `max_cid' from CID array length to max CID. + See Savannah bug #30975. + + * src/cff/cffload.c (cff_charset_compute_cids): Don't increment + max_cid after detecting max CID. The array CFF_Charset->cids is + allocated by max_cid + 1. + (cff_charset_cid_to_gindex): Permit CID is less than or equal to + CFF_Charset->max_cid. + * src/cff/cffobjs.c (cff_face_init): FT_Face->num_glyphs is + calculated as CFF_Charset->max_cid + 1. + +2010-09-19 suzuki toshiya + + [truetype] Sanitize the broken offsets in `loca'. + See Savannah bug #31040. + + * src/truetype/ttpload.c (tt_face_get_location): If `pos1', the + offset to the requested entry in `glyf' exceeds the end of the + table, return offset=0, length=0. If `pos2', the offset to the next + entry in `glyf' exceeds the end of the table, truncate the entry + length at the end of `glyf' table. + +2010-09-19 suzuki toshiya + + [sfnt] Prevent overrunning in `post' table parser. + See Savannah bug #31040. + + * src/sfnt/ttpost.c (load_post_names): Get the length of `post' + table and pass the limit of `post' table to `load_format_20' and + `load_format_25'. + (load_format_20): Stop the parsing when we reached at the limit of + `post' table. If more glyph names are required, they are filled by + NULL names. + +2010-09-17 suzuki toshiya + + [truetype] Don't duplicate size->twilight structure to be freed. + See Savannah bug #31040 for detail. + + * src/truetype/ttinterp.c (free_buffer_in_size): Don't duplicate + FT_GlyphZoneRec size->twilight to be freed. If duplicated, + `FT_FREE' erases the duplicated pointers only and leave original + pointers. They can cause the double-free crash when the burst + errors occur in TrueType interpreter and `free_buffer_in_size' is + invoked repeatedly. + +2010-09-15 Werner Lemberg + + Make bytecode debugging with FontForge work again. + + * src/truetype/ttinterp.c (TT_RunIns): Don't call + `free_buffer_in_size' in case of error if a debugger is active. + +2010-09-14 Werner Lemberg + + Improve tracing messages. + + * src/truetype/ttinterp.c (TT_RunIns): Improve wording of tracing + message. + * src/truetype/ttobjs.c (tt_size_run_fpgm, tt_size_run_prep): Add + tracing message. + * src/truetype/ttgload.c (tt_loader_init): Add tracing message. + * src/cache/ftcsbits.c (ftc_snode_load): Emit tracing message if + glyph doesn't fit into a small bitmap container. + +2010-09-13 Werner Lemberg + + Fix minor issues reported by . + + * src/autofit/aflatin.c (af_latin_compute_stem_width): Remove + redundant conditional check. + * src/base/ftsynth.c (FT_GlyphSlot_Embolden): Ditto. + * src/cff/cffload.c (cff_encoding_load): Remove conditional check + which always evaluates to `true'. + * src/pshinter/pshalgo.c (ps_glyph_interpolate_strong_points): + Ditto. + * src/truetype/ttinterp.c (Ins_IUP): Ditto. + * src/cid/cidgload.c (cid_slot_load_glyph): Don't check for NULL if + value is already dereferenced. + * src/winfonts/winfnt.c (FNT_Load_Glyph): Fix check of `face'. + +2010-08-31 suzuki toshiya + + Ignore the environmental setting of LIBTOOL. + Patch is suggested by Adrian Bunk, to prevent unexpected + reflection of environmental LIBTOOL. See: + http://savannah.nongnu.org/patch/?7290 + + * builds/unix/unix-cc.in: LIBTOOL is unconditionally set to + $(FT_LIBTOOL_DIR)/libtool. FT_LIBTOOL_DIR is set to $(BUILD_DIR) + by default. + * configure: When configured for the building out of source tee, + FT_LIBTOOL_DIR is set to $(OBJ_DIR). + +2010-08-31 suzuki toshiya + + [truetype] Decrease the trace level catching the interpreter error. + + * src/truetype/ttinterp.c (TT_RunIns): Decrease the trace level + showing the error when the interpreter returns with an error, + from` FT_TRACE7' to `FT_TRACE1'. + +2010-08-30 suzuki toshiya + + [truetype] Prevent bytecode reuse after the interpretation error. + + * src/truetype/ttinterp.c (free_buffer_in_size): New function to + free the buffer allocated during the interpretation of this glyph. + (TT_RunIns): Unset FT_Face->size->{cvt_ready,bytecode_ready} if + an error occurs in the bytecode interpretation. The interpretation + of invalid bytecode may break the function definitions and referring + them in later interpretation is danger. By unsetting these flags, + `fpgm' and `prep' tables are executed again in next interpretation. + + This fixes Savannah bug #30798, reported by Robert Święcki. + +2010-08-29 Werner Lemberg + + [ftraster] Pacify compiler. + + * src/raster/ftraster.c (ft_black_new) [_STANDALONE_]: `memory' is + not used. + +2010-08-29 Werner Lemberg + + [cff] Allow SIDs >= 65000. + + * src/cff/cffload.c (cff_charset_load): Fix change from 2009-03-20: + The threshold for SIDs is not applicable here. I misinterpreted the + `SID values 65000 and above are available for implementation use' + sentence in the CFF specification. + + Problem reported by Ivan Ninčić . + +2010-08-28 suzuki toshiya + + Force hinting when the font lacks its familyname. + + In Type42 or Type11 font embedded in PostScript & PDF, TrueType sfnt + stream may lack `name' table because they are not required. Hinting + for nameless fonts is safer for PDFs including embedded Chinese + fonts. Written by David Bevan, see: + + http://lists.gnu.org/archive/html/freetype-devel/2010-08/msg00021.html + http://lists.freedesktop.org/archives/poppler/2010-August/006310.html + + * src/truetype/ttobjs.c (tt_check_trickyness): If a NULL pointer by + nameless font is given, TRUE is returned to enable hinting. + +2010-08-28 suzuki toshiya + + Register yet another tricky TrueType font. + + * src/truetype/ttobjs.c (tt_check_trickyness): Add `HuaTianKaiTi?', + a Kaishu typeface paired with `HuaTianSongTi?' by Huatian + Information Industry. + +2010-08-17 Teijo Kinnunen + + [cache] Fix Savannah bug #30788. + + * src/cache/ftccache.c (FTC_Cache_Clear): Check `cache->buckets' for + NULL too. + +2010-08-10 Werner Lemberg + + Try to fix Savannah bug #30717 (and probably #30719 too). + + * src/smooth/ftsmooth.c (ft_smooth_render_generic): Add another + overflow test for `width' and `height'. + +2010-08-06 Werner Lemberg + + * Version 2.4.2 released. + ========================= + + + Tag sources with `VER-2-4-2'. + + * docs/CHANGES: Updated. + + * docs/VERSION.DLL: Update documentation and bump version number to + 2.4.2 + + * README, Jamfile (RefDoc), + builds/win32/vc2005/freetype.vcproj, builds/win32/vc2005/index.html, + builds/win32/vc2008/freetype.vcproj, builds/win32/vc2008/index.html, + builds/win32/visualc/freetype.dsp, + builds/win32/visualc/freetype.vcproj, + builds/win32/visualc/index.html, builds/win32/visualce/freetype.dsp, + builds/win32/visualce/freetype.vcproj, + builds/win32/visualce/index.html, + builds/wince/vc2005-ce/freetype.vcproj, + builds/wince/vc2005-ce/index.html, + builds/wince/vc2008-ce/freetype.vcproj, + builds/wince/vc2008-ce/index.html: s/2.4.1/2.4.2/, s/241/242/. + + * include/freetype/freetype.h (FREETYPE_PATCH): Set to 2. + + * builds/unix/configure.raw (version_info): Set to 12:0:6. + +2010-08-06 suzuki toshiya + + Fix Savannah bug #30648. + + * src/base/ftobjs.c (FT_Done_Library): Specify the order of font + drivers during the face closing process. Type42 faces should be + closed before TrueType faces, because a Type42 face refers to + another internal TrueType face which is created from sfnt[] array on + the memory. + +2010-08-06 Yuriy Kaminskiy + + [raster] Fix valgrind warning. + + * src/raster/ftraster.c (Decompose_Curve) : Access point[0] + only if we don't hit `limit'. + +2010-08-06 suzuki toshiya + + Fix Savannah bug #30658. + + * src/base/ftobjs.c (Mac_Read_POST_Resource): Check that the total + length of collected POST segments does not overrun the allocated + buffer. + +2010-08-06 Yuriy Kaminskiy + + Fix conditional usage of FT_MulFix_i386. + With -ansi flag, gcc does not define `i386', only `__i386__'. + + * include/freetype/config/ftconfig.h, builds/unix/ftconfig.in: + s/i386/__i386__/. + +2010-08-05 Werner Lemberg + + [truetype] Fix Savannah bug #30657. + + * src/truetype/ttinterp.c (BOUNDSL): New macro. + Change `BOUNDS' to `BOUNDSL' where appropriate. + + * src/truetype/ttinterp.h (TT_ExecContextRec): Fix type of + `cvtSize'. + +2010-08-05 Werner Lemberg + + [type42] Fix Savannah bug #30656. + + * src/type42/t42parse.c (t42_parse_sfnts): Protect against negative + string_size. + Fix comparison. + +2010-08-05 suzuki toshiya + + [cff] Don't use any values in decoder after parsing error. + + * src/cff/cffgload.c (cff_slot_load): Skip the evaluations + of the values in decoder, if `cff_decoder_parse_charstrings' + returns any error. + +2010-08-04 Werner Lemberg + + Fix Savannah bug #30644. + + * src/base/ftstream.c (FT_Stream_EnterFrame): Fix comparison. + +2010-08-04 Werner Lemberg + + `make devel' fails if FT_CONFIG_OPTION_OLD_INTERNALS is set. + + * devel/ftoption.h: Synchronize with + include/freetype/config/ftoption.h. + +2010-08-04 suzuki toshiya + + [cff] Improve stack overflow test. + + * src/cff/cffgload.c (cff_decoder_parse_charstrings): Check stack + after execution of operations too. + +2010-07-18 Werner Lemberg + + Add reference counters and to FT_Library and FT_Face objects. + + * include/freetype/freetype.h (FT_Reference_Face): New function. + * include/freetype/ftmodapi.h (FT_Rererence_Library): New function. + + * include/freetype/internal/ftobjs.h (FT_Face_InternalRec, + FT_LibraryRec): New field `refcount'. + + * src/base/ftobjs.c (FT_Open_Face, FT_New_Library): Handle + `refcount'. + (FT_Reference_Face, FT_Reference_Library): Implement new functions. + (FT_Done_Face, FT_Done_Library): Handle `refcount'. + + * docs/CHANGES: Updated. + +2010-07-18 Werner Lemberg + + * Version 2.4.1 released. + ========================= + + + Tag sources with `VER-2-4-1'. + + * docs/CHANGES: Updated. + + * docs/VERSION.DLL: Update documentation and bump version number to + 2.4.1. + + * README, Jamfile (RefDoc), + builds/win32/vc2005/freetype.vcproj, builds/win32/vc2005/index.html, + builds/win32/vc2008/freetype.vcproj, builds/win32/vc2008/index.html, + builds/win32/visualc/freetype.dsp, + builds/win32/visualc/freetype.vcproj, + builds/win32/visualc/index.html, builds/win32/visualce/freetype.dsp, + builds/win32/visualce/freetype.vcproj, + builds/win32/visualce/index.html, + builds/wince/vc2005-ce/freetype.vcproj, + builds/wince/vc2005-ce/index.html, + builds/wince/vc2008-ce/freetype.vcproj, + builds/wince/vc2008-ce/index.html: s/2.4.0/2.4.1/, s/240/241/. + + * include/freetype/freetype.h (FREETYPE_PATCH): Set to 1. + + * builds/unix/configure.raw (version_info): Set to 11:1:5. + +2010-07-17 Werner Lemberg + + [cff] Final try to fix `hintmask' and `cntrmask' limit check. + + Problem reported by Tobias Wolf . + + * src/cff/cffgload.c (cff_decoder_parse_charstrings) + : Sigh. I'm apparently too silly to fix this + correctly in less than three tries. + +2010-07-12 Werner Lemberg + + * Version 2.4.0 released. + ========================= + + + Tag sources with `VER-2-4-0'. + + * docs/CHANGES: Updated. + + * docs/VERSION.DLL: Update documentation and bump version number to + 2.4.0. + + * README, Jamfile (RefDoc), + builds/win32/vc2005/freetype.vcproj, builds/win32/vc2005/index.html, + builds/win32/vc2008/freetype.vcproj, builds/win32/vc2008/index.html, + builds/win32/visualc/freetype.dsp, + builds/win32/visualc/freetype.vcproj, + builds/win32/visualc/index.html, builds/win32/visualce/freetype.dsp, + builds/win32/visualce/freetype.vcproj, + builds/win32/visualce/index.html, + builds/wince/vc2005-ce/freetype.vcproj, + builds/wince/vc2005-ce/index.html, + builds/wince/vc2008-ce/freetype.vcproj, + builds/wince/vc2008-ce/index.html: s/2.3.12/2.4.0/, s/2312/240/. + + * include/freetype/freetype.h (FREETYPE_MINOR): Set to 4. + (FREETYPE_PATCH): Set to 0. + + * builds/unix/configure.raw (version_info): Set to 11:0:5. + +2010-07-12 Werner Lemberg + + Remove C++ warnings. + + */*: Initialize pointers where necessary to make g++ happy. + +2010-07-12 malc + Richard Henderson + + Fix type-punning issues with C++. + + * include/freetype/internal/ftmemory.h (FT_ASSIGNP) [__cplusplus]: + Emulate a `typeof' operator with an inline template which uses + `static_cast'. + +2010-07-11 Werner Lemberg + + Fix C++ compilation issue. + + * src/tools/apinames.c (names_dump) : Fix + type of `dot' variable. + +2010-07-10 suzuki toshiya + + Fix another case reported in Savannah bug #30373. + Permit a face for Type1, Type42 and CFF without charmap, + patch by Tor Andersson. + + * src/type1/t1objs.c (T1_Face_Init): Reset the error if it + is FT_Err_No_Unicode_Glyph_Name. + * src/type42/t42objs.c (T42_Face_Init): Ditto. + * src/cff/cffobjs.c (cff_face_init): Ditto. + +2010-07-09 suzuki toshiya + + Use defined macros to set {platform,encoding}_id. + + * src/bdf/bdfdrivr.c: Include ttnameid.h and use macros to + set charmap.{platfom,encoding}_id. + * src/pcf/pcfdrivr.c: Ditto. + * src/winfonts/winfnt.c: Ditto. + * src/type1/t1objs.c: Ditto. + * src/type42/t42objs.c: Ditto. + * src/cff/cffobjs.c: Ditto. + * src/pfr/pfrobjs.c: Ditto. + +2010-07-09 suzuki toshiya + + Fix Savannah bug #30373. + Too serious check of errors by `FT_CMap_New' since 2010-07-04 + is fixed. Reported by Tor Andersson. + + * include/freetype/fterrdef.h + (PSnames_Err_No_Unicode_Glyph_Name): New error code to + indicate the Unicode charmap synthesis failed because + no Unicode glyph name is found. + + * src/psnames/psmodule.c (ps_unicodes_init): Return + PSnames_Err_No_Unicode_Glyph_Name when no Unicode glyph name + is found in the font. + * src/cff/cffcmap.c (cff_cmap_unicode_init): Return + CFF_Err_No_Unicode_Glyph_Name when no SID is available. + + * src/type1/t1objs.c (T1_Face_Init): Proceed if `FT_CMap_New' + is failed by the lack of Unicode glyph name. + * src/type42/t42objs.c (T42_Face_Init): Ditto. + * src/cff/cffobjs.c (cff_face_init): Ditto. + +2010-07-09 Ken Sharp + + Make ftraster.c compile in stand-alone mode with MSVC compiler. + + * src/raster/ftmisc.h (FT_Int64) [_WIN32, _WIN64]: Fix typedef + since there is no `inttypes.h' for MSVC. + +2010-07-08 Werner Lemberg + + [truetype] Fix Savannah bug #30361. + + * src/truetype/ttinterp.c (Ins_IUP): Fix bounds check. + +2010-07-06 Werner Lemberg + + Pacify compiler. + + * src/cff/cffload.c (cff_index_get_pointers): Initialize + `new_bytes'. + +2010-07-05 Eugene A. Shatokhin + + Fix Savannah bug #27648. + + * src/base/ftobjs.c (ft_remove_renderer, FT_Add_Module): Call + `raster_done' only if we have an outline glyph format. + +2010-07-05 Werner Lemberg + + Fix Savannah bug #30030. + + * builds/win32/*/freetype.vcproj: Add ftxf86.c. + +2010-07-05 Werner Lemberg + + [cff] Next try to fix `hintmask' and `cntrmask' limit check. + + Problem reported by malc . + + * src/cff/cffgload.c (cff_decoder_parse_charstrings) + : It is possible that there is just a single byte + after the `hintmask' or `cntrmask', e.g., a `return' instruction. + +2010-07-04 suzuki toshiya + + Restrict the number of the charmaps in a rogue-compatible mode. + Fix for Savannah bug #30059. + + * src/cache/ftccmap.c (FTC_CMapCache_Lookup): Replace `16' the + minimum character code passed by a legacy rogue client by... + * include/freetype/config/ftoption.h (FT_MAX_CHARMAP_CACHEABLE): + This. It is undefined when FT_CONFIG_OPTION_OLD_INTERNALS is + undefined (thus the rogue client compatibility is not required). + + * src/cff/cffobjs.c (cff_face_init): Abort the automatic + selection or synthesis of Unicode cmap subtable when the charmap + index exceeds FT_MAX_CHARMAP_CACHEABLE. + * src/sfnt/ttcmap.c (tt_face_build_cmaps): Issue error message + when the charmap index exceeds FT_MAX_CHARMAP_CACHEABLE. + + * src/base/ftobjs.c (find_unicode_charmap): When Unicode charmap + is found after FT_MAX_CHARMAP_CACHEABLE, ignore it and search + earlier one. + (find_variant_selector_charmap): When UVS charmap is found after + FT_MAX_CHARMAP_CACHEABLE, ignore it and search earlier one. + (FT_Select_Charmap): When a charmap matching with requested + encoding but after FT_MAX_CHARMAP_CACHEABLE, ignore and search + earlier one. + (FT_Set_Charmap): When a charmap matching with requested + charmap but after FT_MAX_CHARMAP_CACHEABLE, ignore and search + earlier one. + (FT_Get_Charmap_Index): When a requested charmap is found + after FT_MAX_CHARMAP_CACHEABLE, return the inverted charmap + index. + +2010-07-04 Werner Lemberg + + TrueType hinting is no longer patented. + + * include/freetype/config/ftoption.h, devel/ftoption.h + (TT_CONFIG_OPTION_BYTECODE_INTERPRETER): Define. + (TT_CONFIG_OPTION_UNPATENTED_HINTING): Undefine. + + * docs/CHANGES, docs/INSTALL, include/freetype/freetype.h: Updated. + * docs/TRUETYPE, docs/PATENTS: Removed. + +2010-07-04 suzuki toshiya + + Check error value by `FT_CMap_New'. + + * src/cff/cffobjs.c (cff_face_init): Check error value by + `FT_CMap_New'. + * src/pfr/pfrobjs.c (pfr_face_init): Ditto. + * src/type1/t1jobjs.c (T1_Face_Init): Ditto. + * src/type42/t42jobjs.c (T42_Face_Init): Ditto. + +2010-07-03 Werner Lemberg + + Make ftgrays.c compile stand-alone again. + + * src/smooth/ftgrays.c [_STANDALONE_]: Include `stddef.h'. + (FT_INT_MAX, FT_PtrDist)[_STANDALONE_]: Define. + +2010-07-02 suzuki toshiya + + Additional fix for Savannah bug #30306. + + * src/base/ftobjs.c (Mac_Read_POST_Resource): If the type of the + POST fragment is 0, the segment is completely ignored. The declared + length of the segment is not cared at all. According to Adobe + Technical Note 5040, type 0 segment is a comment only and should not + be loaded for the interpreter. Reported by Robert Święcki. + +2010-07-01 Werner Lemberg + + [truetype] Protect against code range underflow. + + * src/truetype/ttinterp.c (DO_JROT, DO_JMPR, DO_JROF): Don't allow + negative IP values. + +2010-07-01 Werner Lemberg + + [truetype] Add rudimentary tracing for bytecode instructions. + + * src/truetype/ttinterp.c (opcode_name) [FT_DEBUG_LEVEL_TRACE]: New + array. + (TT_RunIns): Trace opcodes. + +2010-06-30 Werner Lemberg + + [smooth] Fix Savannah bug #30263. + + * src/smooth/ftgrays.c (gray_render_span): Use cast to `unsigned + int' to avoid integer overflow. + + * src/smooth/ftsmooth.c (ft_smooth_render_generic): Use smaller + threshold values for `width' and `height'. This is not directly + related to the bug fix but makes sense anyway. + +2010-07-01 suzuki toshiya + + Initial fix for Savannah bug #30306. + + * src/base/ftobjs.c (Mac_Read_POST_Resource): Check `rlen', the + length of fragment declared in the POST fragment header, and prevent + an underflow in length calculation. Some fonts set the length to + zero in spite of the existence of a following 16bit `type'. + Reported by Robert Święcki. + +2010-07-01 suzuki toshiya + + Additional fix for Savannah bug #30248 and #30249. + + * src/base/ftobjs.c (Mac_Read_POST_Resource): Check the buffer size + during gathering PFB fragments embedded in LaserWriter PS font for + Macintosh. Reported by Robert Święcki. + +2010-06-30 Alexei Podtelezhnikov + + Minor optimizations by avoiding divisions. + + * src/sfnt/ttkern.c (tt_face_load_kern, tt_face_get_kerning): + Replace divisions with multiplication in comparisons. + +2010-06-29 Werner Lemberg + + Fix minor tracing issues. + + * src/cff/cffgload.c, src/truetype/ttgload.c: Adjust tracing levels. + +2010-06-27 Werner Lemberg + + [cff] Really fix `hintmask' and `cntrmask' limit check. + + * src/cff/cffgload.c (cff_decoder_parse_charstrings) + : Fix thinko and handle tracing also. + +2010-06-27 Werner Lemberg + + Fix valgrind warning. + + * src/base/ftoutln.c (FT_Outline_Get_Orientation): Initialize + `result' array. + +2010-06-27 Werner Lemberg + + [cff] Fix memory leak. + + * src/cff/cffgload.c (cff_operator_seac): Free charstrings even in + case of errors. + +2010-06-27 Werner Lemberg + + [cff] Protect against invalid `hintmask' and `cntrmask' operators. + + * src/cff/cffgload.c (cff_decoder_parse_charstrings) + : Ensure that we don't exceed `limit' while parsing + the bit masks of the `hintmask' and `cntrmask' operators. + +2010-06-26 Werner Lemberg + + Fix PFR change 2010-06-24. + + * src/pfr/pfrgload.c (pfr_glyph_load_simple): Really protect against + invalid indices. + +2010-06-26 Werner Lemberg + + Improve PFR tracing messages. + + * src/pfr/pfrgload.c (pfr_glyph_load_rec): Emit tracing messages for + simple and compound glyph offsets. + +2010-06-26 Werner Lemberg + + Fix last PFR change. + + * src/pfr/pfrobjs.c (pfr_face_init): Fix rejection logic. + +2010-06-26 Werner Lemberg + + [sfnt] Fix Savannah bug #30262. + + * src/sfnt/ttload.c (tt_face_load_maxp): Limit `maxComponentDepth' + arbitrarily to 100 to avoid stack exhaustion. + +2010-06-26 Werner Lemberg + + Add some memory checks (mainly for debugging). + + * src/base/ftstream.c (FT_Stream_EnterFrame): Exit with error + if the frame size is larger than the stream size. + + * src/base/ftsystem.c (ft_ansi_stream_io): Exit with error if + seeking a position larger than the stream size. + +2010-06-25 Werner Lemberg + + [pfr] Fix Savannah bug #30261. + + * src/pfr/pfrobjs.c (pfr_face_init): Reject fonts which contain + neither outline nor bitmap glyphs. + +2010-06-25 Werner Lemberg + + [cff] Fix Savannah bug #30254. + + * src/cff/cffload.c (cff_index_get_pointers): Do sanity check for + first offset also. + +2010-06-25 suzuki toshiya + + Initial fix for Savannah bug #30248 and #30249. + + * src/base/ftobjs.c (Mac_Read_POST_Resource): Check the error during + reading a PFB fragment embedded in LaserWriter PS font for Macintosh. + Reported by Robert Święcki. + +2010-06-24 Werner Lemberg + + [pcf] Fix Savannah bug #30247. + + * src/pcf/pcfread.c (pcf_get_metrics): Disallow (invalid) fonts with + zero metrics. + +2010-06-24 Graham Asher + + * src/smooth/ftgrays.c (gray_render_cubic): Fix algorithm. + The previous version was too aggressive, as demonstrated in + http://lists.gnu.org/archive/html/freetype-devel/2010-06/msg00020.html. + +2010-06-24 Werner Lemberg + + */*: Use module specific error names where appropriate. + +2010-06-24 Werner Lemberg + + [sfnt] Fix Savannah bug #30236. + + * src/sfnt/ttcmap.c (tt_face_build_cmaps): Improve check for pointer + to `cmap_table'. + +2010-06-24 Werner Lemberg + + [pfr] Fix Savannah bug #30235. + + * src/pfr/pfrgload.c (pfr_glyph_load_simple): Protect against + invalid indices if there aren't any coordinates for indexing. + +2010-06-24 Werner Lemberg + + [bdf]: Font properties are optional. + + * src/bdf/bdflib.c (_bdf_readstream): Use special error code to + indicate a redo operation. + (_bdf_parse_start): Handle `CHARS' keyword here too and pass current + input line to `_bdf_parse_glyph'. + +2010-06-23 Werner Lemberg + + [bdf] Fix Savannah bug #30220. + + * include/freetype/fterrdef.h + (BDF_Err_Missing_Fontboundingbox_Field): New error code. + + * src/bdf/bdflib.c (_bdf_parse_start): Check for missing + `FONTBOUNDINGBOX' field. + Avoid memory leak if there are multiple `FONT' lines (which is + invalid but doesn't hurt). + +2010-06-21 Werner Lemberg + + [pfr] Fix Savannah bug #30168. + + * src/pfr/pfrgload.c (pfr_glyph_load_compound): Limit the number of + subglyphs to avoid endless recursion. + +2010-06-20 Werner Lemberg + + [psaux] Fix Savannah bug #30145. + + * src/psaux/psobjs.c (t1_builder_add_contour): Protect against + `outline == NULL' which might happen in invalid fonts. + +2010-06-19 Werner Lemberg + + [bdf] Fix Savannah bug #30135. + + * src/bdf/bdflib.c (_bdf_list_join): Don't modify value in static + string `empty'. + (_bdf_parse_glyph): Avoid memory leak in case of error. + +2010-06-15 Werner Lemberg + + [autofit] Fix Savannah bug #30108. + + * src/autofit/afglobal.c (af_face_globals_compute_script_coverage): + Properly mask AF_DIGIT bit in comparison. + +2010-06-11 Werner Lemberg + + [pshinter] Fix Savannah bug #30106. + + Point numbers for FreeType's implementation of hinting masks are + collected before the final number of points of a glyph has been + determined; in particular, the code for handling the `endchar' + opcode can reduce the number of points. + + * src/pshinter/pshalgo.c (psh_glyph_find_strong_points): Assure that + `end_point' is not larger than `glyph->num_points'. + +2010-06-11 Werner Lemberg + + [cff]: Improve debugging output. + + * src/cff/cffgload.c (cff_decoder_parse_charstrings) + : Implement it. + +2010-06-10 Graham Asher + + ftgrays: Speed up rendering of small cubic splines. + + * src/smooth/ftgrays.c (gray_render_cubic): Implement new, + simplified algorithm to find out whether the spline can be replaced + with two straight lines. See this thread for more: + + http://lists.gnu.org/archive/html/freetype-devel/2010-06/msg00000.html + +2010-06-09 Werner Lemberg + + [cff] Fix Savannah bug #30082. + + * src/cff/cffgload.c (cff_decoder_parse_charstrings) + : Protect against stack underflow. + +2010-06-08 Werner Lemberg + + [cff] Fix Savannah bug #30053. + + * src/cff/cffparse.c (cff_parse_real): Handle border case where + `fraction_length' has value 10. + +2010-06-07 Werner Lemberg + + Fix Savannah bug #30052. + This bug has been introduced with commit 2415cbf3. + + * src/base/ftobjs.c (FT_Get_First_Char, FT_Get_Next_Char): Protect + against endless loop in case of corrupted font header data. + +2010-05-26 Werner Lemberg + + Remove unused variable. + Found by Graham. + + * src/autofit/afhints.c (af_glyph_hints_reload): Remove unused + variable `first' in first block. + +2010-05-22 Werner Lemberg + + Fix various memory problems found by linuxtesting.org. + + * src/base/ftgxval.c (FT_TrueTypeGX_Free, FT_ClassicKern_Free), + src/base/ftotval.c (FT_OpenType_Free), src/base/ftpfr.c + (ft_pfr_check): Check `face'. + + * src/base/ftobjs.c (FT_Get_Charmap_Index): Check `charmap' and + `charmap->face'. + (FT_Render_Glyph): Check `slot->face'. + (FT_Get_SubGlyph_Info): Check `glyph->subglyphs'. + +2010-05-22 Werner Lemberg + + autofit: Remove dead code. + Suggested by Graham. + + * src/autofit/afhints.c (af_glyph_hints_compute_inflections): + Removed. + (af_glyph_hints_reload): Remove third argument. + Update all callers. + +2010-05-21 Bram Tassyns + + [cff] Fix Savannah bug #27987. + + * src/cff/cffobjs.c (remove_subset_prefix): New function. + (cff_face_init): Use it to adjust `cffface->family_name'. + +2010-05-20 Werner Lemberg + + TrueType: Make FreeType ignore maxSizeOfInstructions in `maxp'. + + Acroread does the same. + + * src/truetype/ttgload.c (TT_Process_Composite_Glyph): Call + `Update_Max' to adjust size of instructions array if necessary and + add a rough safety check. + + (load_truetype_glyph): Save `loader->byte_len' before recursive + call. + + * src/truetype/ttinterp.h, src/truetype/ttinterp.c (Update_Max): + Declare it as FT_LOCAL. + +2010-05-18 Hongbo Ni + + Apply Savannah patch #7196. + + * src/cff/cffgload.c (cff_slot_load): Prevent crash if CFF subfont + index is out of range. + +2010-05-11 Werner Lemberg + + * docs/formats.txt: Give pointer to PCF documentation. + Information provided by Alan Coopersmith + . + +2010-05-10 Ken Sharp + + [psaux] Fix Savannah bug #29846. + + Previously we discovered fonts which used `setcurrentpoint' to set + the initial point of a contour to 0,0. This caused FreeType to + raise an error, because the `setcurrentpoint' operator is only + supposed to be used with the results from an OtherSubr subroutine. + + This was fixed by simply ignoring the error and carrying on. + + Now we have found a font which uses setcurrentpoint to actually + establish a non-zero point for a contour during the course of a + glyph program. FWIW, these files may be produced by an application + called `Intaglio' on the Mac, when converting TrueType fonts to + Type 1. + + The fix allows the new invalid behaviour, the old invalid behaviour + and real proper usage of the operator to work the same way as Adobe + interpreters apparently do. + + * src/psaux/t1decode.c (t1_decoder_parse_charstrings): Make + `setcurrentpoint' use the top two elements of the stack to establish + unconditionally the current x and y coordinates. + + Make the `flex' subroutine handling (OtherSubr 0) put the current + x,y coordinates onto the stack, instead of two dummy uninitialised + values. + +2010-04-14 Ken Sharp + + [psaux] Fix Savannah bug #29444. + + * src/psaux/psobjs.c (t1_builder_start_point): Accept (invalid) + `lineto' immediately after `hsbw', in accordance with Acrobat, GS, + and others. + +2010-04-14 Michał Cichoń + + [psaux] Fix Savannah bug #27999. + + * src/cache/ftcmanag.c (FTC_Manager_RemoveFaceID): Only remove + selected entry, not all. + +2010-04-06 Jonathan Kew + + [truetype] Add overflow check to `fvar' table. + + * src/truetype/ttgxvar.c (TT_Get_MM_Var): Check axis and instance + count. + +2010-04-05 Ken Sharp + + [raster] Fix Savannah bug #29335. + + * src/raster/ftraster.c (Line_Up): Use slow multiplication to + prevent overflow. This shouldn't have any serious impact on speed, + however. + +2010-04-05 Werner Lemberg + + Add new function `FT_Library_SetLcdFilterWeights'. + + This is based on code written by Lifter + . It fixes + FreeDesktop bug #27386. + + * src/base/ftlcdfil.c (FT_Library_SetLcdFilterWeights): New + function. + + * include/freetype/ftlcdfil.h: Updated. + + * docs/CHANGES: Updated. + +2010-04-01 John Tytgat + + [truetype] Fix Savannah bug #29404. + + * src/truetype/ttgload.c: Revert change 2752bd1a (check on bit 1 + of `head' table of TrueType fonts). + +2010-03-14 suzuki toshiya + + Fix `multi build' for Tytgat's CFF driver improvement. + + * src/base/cffload.h (cff_index_get_name): Added. + +2010-03-12 suzuki toshiya + + Remove duplicated inclusion of `FT_OUTLINE_H' in ftobjs.c. + + * src/base/ftobjs.c: Remove 2nd inclusion of `FT_OUTLINE_H'. + +2010-03-11 Chris Liddell + + [raster] Fix Savannah bug #27442. + + * src/raster/ftraster.c (ft_black_reset): Fix `buffer_size'. + +2010-03-09 Werner Lemberg + + [cff] Remove unused variable. + Reported by Graham. + + * src/cff/cffparse.c (cff_parse_real): Remove `rest'. + +2010-03-02 John Tytgat + + [cff] Improve CFF string (especially glyphname) lookup performance. + + We do this by avoiding memory allocation and file I/O. This is + Savannah patch #7104. + + * src/cff/cfftypes.h: Include PS cmaps service and + FT_INTERNAL_POSTSCRIPT_HINTS_H. + (CFF_SubFontRec): Remove `num_local_subrs'. + (CFF_FontRec): Add `num_strings', `strings', and `string_pool' + fields. + Remove `string_index' and `num_global_subrs' fields. + Use real types instead of `void' for `pshinter' and `psnames' fields. + + * src/cff/cffload.c: Don't include PS cmaps service. + (cff_index_get_pointers): Add `pool' parameter which allows to + insert an extra NUL character for each String INDEX entry. + (cff_index_get_name): Make it a local function. + (cff_index_get_string): New function. + (cff_subfont_load): Updated. + (cff_font_load): Initialize `num_strings', `strings', and + `string_pool' fields in the `CFF_FontRec' structure. + (cff_index_get_sid_string): Use `cff_index_get_string' instead of + `cff_index_get_name'. + (cff_font_done): Updated. + + * src/cff/cffload.h: Don't include PS cmaps service. + (cff_index_get_string): Added. + (cff_index_get_sid_string): Updated. + + * src/cff/cffobjs.c: Don't include PS cmaps service and + FT_INTERNAL_POSTSCRIPT_HINTS_H. + (cff_size_get_globals_funcs, cff_slot_init): Updated. + (cff_face_init): Follow `cff_index_get_name', + `cff_index_get_string', and `cff_index_get_sid_string' changes. + + * src/cff/cffcmap.c (cff_sid_free_glyph_name): Removed. + (cff_sid_to_glyph_name): Use `cff_index_get_cid_string'. + (cff_cmap_unicode_init): Updated. + + * src/cff/cffdrivr.c: Don't include PS cmap service. + (cff_get_glyph_name): Avoid unnecessary lookup for POSTSCRIPT_CMAPS + service. + (cff_get_glyph_name, cff_ps_get_font_info, cff_get_ros): Follow API + `cff_index_get_sid_string' change. + (cff_get_name_index): Use `cff_index_get_string' instead of + `cff_index_get_name'. + + * src/cff/cffgload.c: Don't include FT_INTERNAL_POSTSCRIPT_HINTS_H. + (cff_decoder_init, cff_decoder_prepare): Updated. + +2010-02-27 Werner Lemberg + + Simplify code. + Suggested by Behdad. + + * src/base/ftobjs.c (FT_Get_First_Char): Don't use a loop since we + call FT_Get_Next_Char anyway if necessary. + +2010-02-26 Behdad Esfahbod + + Improve handling of invalid glyph indices in char->index functions. + + * src/base/ftobjs.c (FT_Get_First_Char, FT_Get_Next_Char): Use a + loop. + +2010-02-18 Chris Liddell + + [truetype] Fix Savannah bug #28905. + + Initialize phantom points before calling the incremental interface + to update glyph metrics. + + * src/truetype/ttgload.c (tt_get_metrics_incr_overrides) + [FT_CONFIG_OPTION_INCREMENTAL]: New function, split off from... + (tt_get_metrics): This. + Updated. + (load_truetype_glyph): Use tt_get_metrics_incr_overrides. + +---------------------------------------------------------------------------- + +Copyright 2010-2013 by +David Turner, Robert Wilhelm, and Werner Lemberg. + +This file is part of the FreeType project, and may only be used, modified, +and distributed under the terms of the FreeType project license, +LICENSE.TXT. By continuing to use, modify, or distribute this file you +indicate that you have read the license and understand and accept it +fully. + + +Local Variables: +version-control: never +coding: utf-8 +End: diff --git a/Jamfile b/Jamfile index 313bda6..16e097e 100644 --- a/Jamfile +++ b/Jamfile @@ -1,6 +1,6 @@ # FreeType 2 top Jamfile. # -# Copyright 2001-2011 by +# Copyright 2001-2014 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -140,9 +140,9 @@ DEFINES += FT2_BUILD_LIBRARY ; # FT2_MULTI = true ; -# The file is used to define macros that are -# later used in #include statements. It needs to be parsed in order to -# record these definitions. +# The file is used to define macros that are later used +# in #include statements. It needs to be parsed in order to record these +# definitions. # HDRMACRO [ FT2_SubDir include freetype config ftheader.h ] ; HDRMACRO [ FT2_SubDir include freetype internal internal.h ] ; @@ -177,7 +177,7 @@ actions GenExportSymbols1 bind APINAMES $(APINAMES) $(2) > $(1) } -GenExportSymbols ftexport.sym : include/freetype include/freetype/cache ; +GenExportSymbols ftexport.sym : include include/cache ; # Test files (hinter debugging). Only used by FreeType developers. # @@ -195,7 +195,7 @@ rule RefDoc actions RefDoc { - python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.4.9 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h + python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.5.5 --output=$(DOC_DIR) $(FT2_INCLUDE)/*.h $(FT2_INCLUDE)/config/*.h } RefDoc refdoc ; diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..bbaba33 --- /dev/null +++ b/LICENSE @@ -0,0 +1,169 @@ + The FreeType Project LICENSE + ---------------------------- + + 2006-Jan-27 + + Copyright 1996-2002, 2006 by + David Turner, Robert Wilhelm, and Werner Lemberg + + + +Introduction +============ + + The FreeType Project is distributed in several archive packages; + some of them may contain, in addition to the FreeType font engine, + various tools and contributions which rely on, or relate to, the + FreeType Project. + + This license applies to all files found in such packages, and + which do not fall under their own explicit license. The license + affects thus the FreeType font engine, the test programs, + documentation and makefiles, at the very least. + + This license was inspired by the BSD, Artistic, and IJG + (Independent JPEG Group) licenses, which all encourage inclusion + and use of free software in commercial and freeware products + alike. As a consequence, its main points are that: + + o We don't promise that this software works. However, we will be + interested in any kind of bug reports. (`as is' distribution) + + o You can use this software for whatever you want, in parts or + full form, without having to pay us. (`royalty-free' usage) + + o You may not pretend that you wrote this software. If you use + it, or only parts of it, in a program, you must acknowledge + somewhere in your documentation that you have used the + FreeType code. (`credits') + + We specifically permit and encourage the inclusion of this + software, with or without modifications, in commercial products. + We disclaim all warranties covering The FreeType Project and + assume no liability related to The FreeType Project. + + + Finally, many people asked us for a preferred form for a + credit/disclaimer to use in compliance with this license. We thus + encourage you to use the following text: + + """ + Portions of this software are copyright © The FreeType + Project (www.freetype.org). All rights reserved. + """ + + Please replace with the value from the FreeType version you + actually use. + + +Legal Terms +=========== + +0. Definitions +-------------- + + Throughout this license, the terms `package', `FreeType Project', + and `FreeType archive' refer to the set of files originally + distributed by the authors (David Turner, Robert Wilhelm, and + Werner Lemberg) as the `FreeType Project', be they named as alpha, + beta or final release. + + `You' refers to the licensee, or person using the project, where + `using' is a generic term including compiling the project's source + code as well as linking it to form a `program' or `executable'. + This program is referred to as `a program using the FreeType + engine'. + + This license applies to all files distributed in the original + FreeType Project, including all source code, binaries and + documentation, unless otherwise stated in the file in its + original, unmodified form as distributed in the original archive. + If you are unsure whether or not a particular file is covered by + this license, you must contact us to verify this. + + The FreeType Project is copyright (C) 1996-2000 by David Turner, + Robert Wilhelm, and Werner Lemberg. All rights reserved except as + specified below. + +1. No Warranty +-------------- + + THE FREETYPE PROJECT IS PROVIDED `AS IS' WITHOUT WARRANTY OF ANY + KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE. IN NO EVENT WILL ANY OF THE AUTHORS OR COPYRIGHT HOLDERS + BE LIABLE FOR ANY DAMAGES CAUSED BY THE USE OR THE INABILITY TO + USE, OF THE FREETYPE PROJECT. + +2. Redistribution +----------------- + + This license grants a worldwide, royalty-free, perpetual and + irrevocable right and license to use, execute, perform, compile, + display, copy, create derivative works of, distribute and + sublicense the FreeType Project (in both source and object code + forms) and derivative works thereof for any purpose; and to + authorize others to exercise some or all of the rights granted + herein, subject to the following conditions: + + o Redistribution of source code must retain this license file + (`FTL.TXT') unaltered; any additions, deletions or changes to + the original files must be clearly indicated in accompanying + documentation. The copyright notices of the unaltered, + original files must be preserved in all copies of source + files. + + o Redistribution in binary form must provide a disclaimer that + states that the software is based in part of the work of the + FreeType Team, in the distribution documentation. We also + encourage you to put an URL to the FreeType web page in your + documentation, though this isn't mandatory. + + These conditions apply to any software derived from or based on + the FreeType Project, not just the unmodified files. If you use + our work, you must acknowledge us. However, no fee need be paid + to us. + +3. Advertising +-------------- + + Neither the FreeType authors and contributors nor you shall use + the name of the other for commercial, advertising, or promotional + purposes without specific prior written permission. + + We suggest, but do not require, that you use one or more of the + following phrases to refer to this software in your documentation + or advertising materials: `FreeType Project', `FreeType Engine', + `FreeType library', or `FreeType Distribution'. + + As you have not signed this license, you are not required to + accept it. However, as the FreeType Project is copyrighted + material, only this license, or another one contracted with the + authors, grants you the right to use, distribute, and modify it. + Therefore, by using, distributing, or modifying the FreeType + Project, you indicate that you understand and accept all the terms + of this license. + +4. Contacts +----------- + + There are two mailing lists related to FreeType: + + o freetype@nongnu.org + + Discusses general use and applications of FreeType, as well as + future and wanted additions to the library and distribution. + If you are looking for support, start in this list if you + haven't found anything to help you in the documentation. + + o freetype-devel@nongnu.org + + Discusses bugs, as well as engine internals, design issues, + specific licenses, porting, etc. + + Our home page can be found at + + http://www.freetype.org + + +--- end of FTL.TXT --- diff --git a/LICENSE.GPL-2.0 b/LICENSE.GPL-2.0 new file mode 100644 index 0000000..b2fe7b6 --- /dev/null +++ b/LICENSE.GPL-2.0 @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/README b/README index 84b1c44..f00a1ab 100644 --- a/README +++ b/README @@ -1,17 +1,22 @@ - FreeType 2.4.9 + FreeType 2.5.5 ============== + Homepage: http://www.freetype.org + + FreeType is a freely available software library to render fonts. + + It is written in C, designed to be small, efficient, highly + customizable, and portable while capable of producing high-quality + output (glyph images) of most vector and bitmap font formats. + Please read the docs/CHANGES file, it contains IMPORTANT INFORMATION. - Read the files `docs/INSTALL' for installation instructions. - - See the file `docs/LICENSE.TXT' for the available licenses. Note - that we use ranges (`2008-2010') for copyright years also instead of - listing individual years (`2008, 2009, 2010'). + Read the files `docs/INSTALL*' for installation instructions; see + the file `docs/LICENSE.TXT' for the available licenses. The FreeType 2 API reference is located in `docs/reference'; use the - file `ft2-doc.html' as the top entry point. Additional + file `ft2-toc.html' as the top entry point. Additional documentation is available as a separate package from our sites. Go to @@ -19,23 +24,44 @@ and download one of the following files. - freetype-doc-2.4.9.tar.bz2 - freetype-doc-2.4.9.tar.gz - ftdoc249.zip + freetype-doc-2.5.5.tar.bz2 + freetype-doc-2.5.5.tar.gz + ftdoc255.zip + + To view the documentation online, go to + + http://www.freetype.org/freetype2/documentation.html + + + Mailing Lists + ============= + + The preferred way of communication with the FreeType team is using + e-mail lists. + + general use and discussion: freetype@nongnu.org + engine internals, porting, etc.: freetype-devel@nongnu.org + announcements: freetype-announce@nongnu.org + + The lists are moderated; see + + http://www.freetype.org/contact.html + + how to subscribe. Bugs ==== - Please report bugs by e-mail to `freetype-devel@nongnu.org'. Don't - forget to send a detailed explanation of the problem -- there is - nothing worse than receiving a terse message that only says `it - doesn't work'. - - Alternatively, you may submit a bug report at + Please submit bug reports at https://savannah.nongnu.org/bugs/?group=freetype + Alternatively, you might report bugs by e-mail to + `freetype-devel@nongnu.org'. Don't forget to send a detailed + explanation of the problem -- there is nothing worse than receiving + a terse message that only says `it doesn't work'. + Enjoy! @@ -44,7 +70,7 @@ ---------------------------------------------------------------------- -Copyright 2006-2011 by +Copyright 2006-2014 by David Turner, Robert Wilhelm, and Werner Lemberg. This file is part of the FreeType project, and may only be used, diff --git a/README.git b/README.git index 47cb242..021c121 100644 --- a/README.git +++ b/README.git @@ -31,9 +31,13 @@ configure script is necessary at all; saying should work on all platforms which have GNU make (or makepp). +Similarly, a build with `cmake' can be done directly from the git +repository. + + ---------------------------------------------------------------------- -Copyright 2005, 2006, 2007, 2008, 2009, 2010 by +Copyright 2005-2010, 2013 by David Turner, Robert Wilhelm, and Werner Lemberg. This file is part of the FreeType project, and may only be used, diff --git a/TC/_export_env.sh b/TC/_export_env.sh deleted file mode 100755 index 06b6671..0000000 --- a/TC/_export_env.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -. ./config -export TET_INSTALL_PATH=$TET_INSTALL_HOST_PATH # tetware root path -export TET_TARGET_PATH=$TET_INSTALL_PATH/tetware-target # tetware target path -export PATH=$TET_TARGET_PATH/bin:$PATH -export LD_LIBRARY_PATH=$TET_TARGET_PATH/lib/tet3:$LD_LIBRARY_PATH -export TET_ROOT=$TET_TARGET_PATH -export FT2_TC_ROOT_PATH=/mnt/nfs/DTS/freetype/ft2demos diff --git a/TC/_export_target_env.sh b/TC/_export_target_env.sh deleted file mode 100755 index 5ddaa53..0000000 --- a/TC/_export_target_env.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -. ./config -export TET_INSTALL_PATH=$TET_INSTALL_TARGET_PATH # path to path -export TET_TARGET_PATH=$TET_INSTALL_PATH/tetware-target -export PATH=$TET_TARGET_PATH/bin:$PATH -export LD_LIBRARY_PATH=$TET_TARGET_PATH/lib/tet3:$LD_LIBRARY_PATH -export TET_ROOT=$TET_TARGET_PATH diff --git a/TC/build.sh b/TC/build.sh deleted file mode 100755 index 72aad6c..0000000 --- a/TC/build.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -. ./_export_env.sh # setting environment variables - -export TET_SUITE_ROOT=`pwd` -FILE_NAME_EXTENSION=`date +%s` - -RESULT_DIR=results -HTML_RESULT=$RESULT_DIR/build-tar-result-$FILE_NAME_EXTENSION.html -JOURNAL_RESULT=$RESULT_DIR/build-tar-result-$FILE_NAME_EXTENSION.journal - -mkdir -p $RESULT_DIR - -tcc -c -p ./ -tcc -b -j $JOURNAL_RESULT -p ./ -grw -c 7 -f chtml -o $HTML_RESULT $JOURNAL_RESULT diff --git a/TC/clean.sh b/TC/clean.sh deleted file mode 100755 index 29743e0..0000000 --- a/TC/clean.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -. ./_export_env.sh # setting environment variables - -export TET_SUITE_ROOT=`pwd` -RESULT_DIR=results - -tcc -c -p ./ # executing tcc, with clean option (-c) -rm -r $RESULT_DIR -rm -r tet_tmp_dir -rm testcase/tet_captured diff --git a/TC/config b/TC/config deleted file mode 100755 index e8c668e..0000000 --- a/TC/config +++ /dev/null @@ -1,2 +0,0 @@ -TET_INSTALL_HOST_PATH=/view/DTS/TETware -TET_INSTALL_TARGET_PATH=/mnt/nfs/DTS/TETware diff --git a/TC/execute.sh b/TC/execute.sh deleted file mode 100755 index a4f6095..0000000 --- a/TC/execute.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -. ./_export_target_env.sh # setting environment variables - -export TET_SUITE_ROOT=`pwd` -FILE_NAME_EXTENSION=`date +%s` - -RESULT_DIR=results -HTML_RESULT=$RESULT_DIR/exec-tar-result-$FILE_NAME_EXTENSION.html -JOURNAL_RESULT=$RESULT_DIR/exec-tar-result-$FILE_NAME_EXTENSION.journal - -mkdir -p $RESULT_DIR - -tcc -e -j $JOURNAL_RESULT -p ./ -grw -c 3 -f chtml -o $HTML_RESULT $JOURNAL_RESULT diff --git a/TC/testcase/Makefile b/TC/testcase/Makefile deleted file mode 100755 index 7ed8eb3..0000000 --- a/TC/testcase/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -CC ?= gcc - -C_FILES = $(shell ls *.c) - -PKGS = freetype2 capi-base-common dlog gthread-2.0 - -LDFLAGS = `pkg-config --libs $(PKGS)` -LDFLAGS += $(TET_ROOT)/lib/tet3/tcm_s.o -LDFLAGS += -L$(TET_ROOT)/lib/tet3 -ltcm_s -LDFLAGS += -L$(TET_ROOT)/lib/tet3 -lapi_s - -CFLAGS = -I. `pkg-config --cflags $(PKGS)` -CFLAGS += -I$(TET_ROOT)/inc/tet3 -CFLAGS += -Wall - -TCS := $(shell ls -1 *.c | cut -d. -f1) - -all: $(TCS) - -%: %.c - $(CC) -o $@ $< $(CFLAGS) $(LDFLAGS) - -clean: - rm -f $(TCS) diff --git a/TC/testcase/tslist b/TC/testcase/tslist deleted file mode 100755 index 7f1d607..0000000 --- a/TC/testcase/tslist +++ /dev/null @@ -1,9 +0,0 @@ -/testcase/utc_ft_bench -/testcase/utc_ft_diff -/testcase/utc_ft_dump -/testcase/utc_ft_gamma -/testcase/utc_ft_grid -/testcase/utc_ft_lint -/testcase/utc_ft_multi -/testcase/utc_ft_string -/testcase/utc_ft_view diff --git a/TC/testcase/utc_ft_bench.c b/TC/testcase/utc_ft_bench.c deleted file mode 100755 index 557375a..0000000 --- a/TC/testcase/utc_ft_bench.c +++ /dev/null @@ -1,36 +0,0 @@ -#include - -static void startup(void); -static void cleanup(void); - -void (*tet_startup)(void) = startup; -void (*tet_cleanup)(void) = cleanup; - -static void utc_ft_bench(void); - -struct tet_testlist tet_testlist[] = { - { utc_ft_bench, 1 }, - { NULL, 0 }, -}; - -static void startup(void) -{ - /* start of TC */ -} - -static void cleanup(void) -{ - /* end of TC */ -} - -static void utc_ft_bench(void) -{ - char buf[128]; - int ret; - sprintf(buf, "cd %s && ./ftbench /usr/share/fonts/HelveticaNeueRegular.ttf ", getenv("FT2_TC_ROOT_PATH")); - ret = system(buf); - if(WEXITSTATUS(ret) == 0) - dts_pass("utc_ft_bench"); - else - dts_fail("utc_ft_bench"); -} diff --git a/TC/testcase/utc_ft_diff.c b/TC/testcase/utc_ft_diff.c deleted file mode 100755 index 9599fc7..0000000 --- a/TC/testcase/utc_ft_diff.c +++ /dev/null @@ -1,36 +0,0 @@ -#include - -static void startup(void); -static void cleanup(void); - -void (*tet_startup)(void) = startup; -void (*tet_cleanup)(void) = cleanup; - -static void utc_ft_diff(void); - -struct tet_testlist tet_testlist[] = { - { utc_ft_diff, 1 }, - { NULL, 0 }, -}; - -static void startup(void) -{ - /* start of TC */ -} - -static void cleanup(void) -{ - /* end of TC */ -} - -static void utc_ft_diff(void) -{ - char buf[128]; - int ret; - sprintf(buf, "cd %s && ./ftdiff /usr/share/fonts/HelveticaNeueRegular.ttf ", getenv("FT2_TC_ROOT_PATH")); - ret = system(buf); - if(WEXITSTATUS(ret) == 0) - dts_pass("utc_ft_diff"); - else - dts_fail("utc_ft_diff"); -} diff --git a/TC/testcase/utc_ft_dump.c b/TC/testcase/utc_ft_dump.c deleted file mode 100755 index a0b6a2c..0000000 --- a/TC/testcase/utc_ft_dump.c +++ /dev/null @@ -1,36 +0,0 @@ -#include - -static void startup(void); -static void cleanup(void); - -void (*tet_startup)(void) = startup; -void (*tet_cleanup)(void) = cleanup; - -static void utc_ft_dump(void); - -struct tet_testlist tet_testlist[] = { - { utc_ft_dump, 1 }, - { NULL, 0 }, -}; - -static void startup(void) -{ - /* start of TC */ -} - -static void cleanup(void) -{ - /* end of TC */ -} - -static void utc_ft_dump(void) -{ - char buf[128]; - int ret; - sprintf(buf, "cd %s && ./ftdump /usr/share/fonts/HelveticaNeueRegular.ttf ", getenv("FT2_TC_ROOT_PATH")); - ret = system(buf); - if(WEXITSTATUS(ret) == 0) - dts_pass("utc_ft_dump"); - else - dts_fail("utc_ft_dump"); -} diff --git a/TC/testcase/utc_ft_gamma.c b/TC/testcase/utc_ft_gamma.c deleted file mode 100755 index 6e42a43..0000000 --- a/TC/testcase/utc_ft_gamma.c +++ /dev/null @@ -1,36 +0,0 @@ -#include - -static void startup(void); -static void cleanup(void); - -void (*tet_startup)(void) = startup; -void (*tet_cleanup)(void) = cleanup; - -static void utc_ft_gamma(void); - -struct tet_testlist tet_testlist[] = { - { utc_ft_gamma, 1 }, - { NULL, 0 }, -}; - -static void startup(void) -{ - /* start of TC */ -} - -static void cleanup(void) -{ - /* end of TC */ -} - -static void utc_ft_gamma(void) -{ - char buf[128]; - int ret; - sprintf(buf, "cd %s && ./ftgamma", getenv("FT2_TC_ROOT_PATH")); - ret = system(buf); - if(WEXITSTATUS(ret) == 0) - dts_pass("utc_ft_gamma"); - else - dts_fail("utc_ft_gamma"); -} diff --git a/TC/testcase/utc_ft_grid.c b/TC/testcase/utc_ft_grid.c deleted file mode 100755 index bf40ec8..0000000 --- a/TC/testcase/utc_ft_grid.c +++ /dev/null @@ -1,36 +0,0 @@ -#include - -static void startup(void); -static void cleanup(void); - -void (*tet_startup)(void) = startup; -void (*tet_cleanup)(void) = cleanup; - -static void utc_ft_grid(void); - -struct tet_testlist tet_testlist[] = { - { utc_ft_grid, 1 }, - { NULL, 0 }, -}; - -static void startup(void) -{ - /* start of TC */ -} - -static void cleanup(void) -{ - /* end of TC */ -} - -static void utc_ft_grid(void) -{ - char buf[128]; - int ret; - sprintf(buf, "cd %s && ./ftgrid 10pt /usr/share/fonts/HelveticaNeueRegular.ttf ", getenv("FT2_TC_ROOT_PATH")); - ret = system(buf); - if(WEXITSTATUS(ret) == 0) - dts_pass("utc_ft_grid"); - else - dts_fail("utc_ft_grid"); -} diff --git a/TC/testcase/utc_ft_lint.c b/TC/testcase/utc_ft_lint.c deleted file mode 100755 index 3ce186f..0000000 --- a/TC/testcase/utc_ft_lint.c +++ /dev/null @@ -1,36 +0,0 @@ -#include - -static void startup(void); -static void cleanup(void); - -void (*tet_startup)(void) = startup; -void (*tet_cleanup)(void) = cleanup; - -static void utc_ft_lint(void); - -struct tet_testlist tet_testlist[] = { - { utc_ft_lint, 1 }, - { NULL, 0 }, -}; - -static void startup(void) -{ - /* start of TC */ -} - -static void cleanup(void) -{ - /* end of TC */ -} - -static void utc_ft_lint(void) -{ - char buf[128]; - int ret; - sprintf(buf, "cd %s && ./ftlint 10ppem /usr/share/fonts/HelveticaNeueRegular.ttf ", getenv("FT2_TC_ROOT_PATH")); - ret = system(buf); - if(WEXITSTATUS(ret) == 0) - dts_pass("utc_ft_lint"); - else - dts_fail("utc_ft_lint"); -} diff --git a/TC/testcase/utc_ft_multi.c b/TC/testcase/utc_ft_multi.c deleted file mode 100755 index e005ceb..0000000 --- a/TC/testcase/utc_ft_multi.c +++ /dev/null @@ -1,36 +0,0 @@ -#include - -static void startup(void); -static void cleanup(void); - -void (*tet_startup)(void) = startup; -void (*tet_cleanup)(void) = cleanup; - -static void utc_ft_multi(void); - -struct tet_testlist tet_testlist[] = { - { utc_ft_multi, 1 }, - { NULL, 0 }, -}; - -static void startup(void) -{ - /* start of TC */ -} - -static void cleanup(void) -{ - /* end of TC */ -} - -static void utc_ft_multi(void) -{ - char buf[128]; - int ret; - sprintf(buf, "cd %s && ./ftmulti 10ppem /usr/share/fonts/HelveticaNeueRegular.ttf ", getenv("FT2_TC_ROOT_PATH")); - ret = system(buf); - if(WEXITSTATUS(ret) == 0) - dts_pass("utc_ft_multi"); - else - dts_fail("utc_ft_multi"); -} diff --git a/TC/testcase/utc_ft_string.c b/TC/testcase/utc_ft_string.c deleted file mode 100755 index de17b48..0000000 --- a/TC/testcase/utc_ft_string.c +++ /dev/null @@ -1,36 +0,0 @@ -#include - -static void startup(void); -static void cleanup(void); - -void (*tet_startup)(void) = startup; -void (*tet_cleanup)(void) = cleanup; - -static void utc_ft_string(void); - -struct tet_testlist tet_testlist[] = { - { utc_ft_string, 1 }, - { NULL, 0 }, -}; - -static void startup(void) -{ - /* start of TC */ -} - -static void cleanup(void) -{ - /* end of TC */ -} - -static void utc_ft_string(void) -{ - char buf[128]; - int ret; - sprintf(buf, "cd %s && ./ftstring 10pt /usr/share/fonts/HelveticaNeueRegular.ttf ", getenv("FT2_TC_ROOT_PATH")); - ret = system(buf); - if(WEXITSTATUS(ret) == 0) - dts_pass("utc_ft_string"); - else - dts_fail("utc_ft_string"); -} diff --git a/TC/testcase/utc_ft_view.c b/TC/testcase/utc_ft_view.c deleted file mode 100755 index 33f3c5f..0000000 --- a/TC/testcase/utc_ft_view.c +++ /dev/null @@ -1,36 +0,0 @@ -#include - -static void startup(void); -static void cleanup(void); - -void (*tet_startup)(void) = startup; -void (*tet_cleanup)(void) = cleanup; - -static void utc_ft_view(void); - -struct tet_testlist tet_testlist[] = { - { utc_ft_view, 1 }, - { NULL, 0 }, -}; - -static void startup(void) -{ - /* start of TC */ -} - -static void cleanup(void) -{ - /* end of TC */ -} - -static void utc_ft_view(void) -{ - char buf[128]; - int ret; - sprintf(buf, "cd %s && ./ftview 10pt /usr/share/fonts/HelveticaNeueRegular.ttf ", getenv("FT2_TC_ROOT_PATH")); - ret = system(buf); - if(WEXITSTATUS(ret) == 0) - dts_pass("utc_ft_view"); - else - dts_fail("utc_ft_view"); -} diff --git a/TC/tet_scen b/TC/tet_scen deleted file mode 100755 index 03f029a..0000000 --- a/TC/tet_scen +++ /dev/null @@ -1,7 +0,0 @@ -all - ^TEST -##### Scenarios for TEST ##### - -# Test scenario -TEST - :include:/testcase/tslist diff --git a/TC/tetbuild.cfg b/TC/tetbuild.cfg deleted file mode 100755 index f7eda55..0000000 --- a/TC/tetbuild.cfg +++ /dev/null @@ -1,5 +0,0 @@ -TET_OUTPUT_CAPTURE=True # capture option for build operation checking -TET_BUILD_TOOL=make # build with using make command -TET_BUILD_FILE=-f Makefile # execution file (Makefile) for build -TET_API_COMPLIANT=True # use TET API in Test Case ? -TET_PASS_TC_NAME=True # report passed TC name in Journal file? diff --git a/TC/tetclean.cfg b/TC/tetclean.cfg deleted file mode 100755 index 02d7030..0000000 --- a/TC/tetclean.cfg +++ /dev/null @@ -1,5 +0,0 @@ -TET_OUTPUT_CAPTURE=True # capture option -TET_CLEAN_TOOL= make clean # clean tool -TET_CLEAN_FILE= Makefile # file for clean -TET_API_COMPLIANT=True # TET API useage -TET_PASS_TC_NAME=True # showing name , passed TC diff --git a/TC/tetexec.cfg b/TC/tetexec.cfg deleted file mode 100755 index ef3e452..0000000 --- a/TC/tetexec.cfg +++ /dev/null @@ -1,5 +0,0 @@ -TET_OUTPUT_CAPTURE=True # capturing execution or not -TET_EXEC_TOOL= # ex) exec : execution tool set up/ Optional -TET_EXEC_FILE= # ex) exectool : execution file/ Optional -TET_API_COMPLIANT=True # Test case or Tool usesTET API? -TET_PASS_TC_NAME=True # showing Passed TC name ? diff --git a/autogen.sh b/autogen.sh old mode 100644 new mode 100755 index 9f2fb6a..cc0e661 --- a/autogen.sh +++ b/autogen.sh @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005, 2006, 2007, 2008, 2009, 2010 by +# Copyright 2005-2010, 2013 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -55,7 +55,7 @@ compare_to_minimum_version () if test $MAJOR1 -lt $MAJOR2; then echo 0 return - else + else if test $MAJOR1 -gt $MAJOR2; then echo 1 return @@ -67,7 +67,7 @@ compare_to_minimum_version () if test $MINOR1 -lt $MINOR2; then echo 0 return - else + else if test $MINOR1 -gt $MINOR2; then echo 1 return @@ -139,7 +139,7 @@ check_tool_version $LIBTOOLIZE libtoolize LIBTOOLIZE 2.2.4 check_tool_version $AUTOCONF autoconf AUTOCONF 2.62 # This sets freetype_major, freetype_minor, and freetype_patch. -eval `sed -nf version.sed include/freetype/freetype.h` +eval `sed -nf version.sed include/freetype.h` # We set freetype-patch to an empty value if it is zero. if test "$freetype_patch" = ".0"; then diff --git a/builds/amiga/README b/builds/amiga/README index 2b8f8e8..85fcc43 100644 --- a/builds/amiga/README +++ b/builds/amiga/README @@ -1,7 +1,7 @@ README for the builds/amiga subdirectory. -Copyright 2005 by +Copyright 2005, 2013 by Werner Lemberg and Detlef Würkner. This file is part of the FreeType project, and may only be used, modified, @@ -51,8 +51,8 @@ directory. The results are: - ftdebug.o, an object module containing the standard version of the debugging code which uses vprintf() and exit() (not pure). - Debugging can be turned on in FT:include/freetype/config/ftoption.h - and with FT_SetTraceLevel(). + Debugging can be turned on in FT:include/config/ftoption.h and with + FT_SetTraceLevel(). - ftdebugpure.o, an object module containing the pure version of the debugging code which uses KVPrintf() from lib:debug.lib and no @@ -64,15 +64,14 @@ directory. The results are: ftsystem.o would force ALL FreeType2 modules to be linked to your program, I decided to use a different scheme: You must #include FT:src/base/ftinit.c in your sourcecode and specify with #define - statements which modules you need. See - include/freetype/config/ftmodule.h. + statements which modules you need. See include/config/ftmodule.h. To use in your own programs: - Insert the #define and #include statements from top of - include/freetype/config/ftmodule.h in your source code and uncomment - the #define statements for the FreeType2 modules you need. + include/config/ftmodule.h in your source code and uncomment the + #define statements for the FreeType2 modules you need. - You can use either PARAMETERS=REGISTER or PARAMETERS=STACK for calling the FreeType2 functions, because the link library and the diff --git a/builds/amiga/include/freetype/config/ftconfig.h b/builds/amiga/include/config/ftconfig.h similarity index 90% rename from builds/amiga/include/freetype/config/ftconfig.h rename to builds/amiga/include/config/ftconfig.h index c2c2ac8..a73ace6 100644 --- a/builds/amiga/include/freetype/config/ftconfig.h +++ b/builds/amiga/include/config/ftconfig.h @@ -4,7 +4,7 @@ /* */ /* Amiga-specific configuration file (specification only). */ /* */ -/* Copyright 2005, 2006, 2007 by */ +/* Copyright 2005-2007, 2013 by */ /* Werner Lemberg and Detlef Würkner. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -34,9 +34,9 @@ /* Now include the original file */ #ifndef __MORPHOS__ #ifdef __SASC -#include "FT:include/freetype/config/ftconfig.h" +#include "FT:include/config/ftconfig.h" #else -#include "/FT/include/freetype/config/ftconfig.h" +#include "/FT/include/config/ftconfig.h" #endif #else /* We must define that, it seems that @@ -45,7 +45,7 @@ * binaries from http://www.morphos.de) */ #define _LIBC_LIMITS_H_ -#include "/FT/include/freetype/config/ftconfig.h" +#include "/FT/include/config/ftconfig.h" #endif /* diff --git a/builds/amiga/include/freetype/config/ftmodule.h b/builds/amiga/include/config/ftmodule.h similarity index 100% rename from builds/amiga/include/freetype/config/ftmodule.h rename to builds/amiga/include/config/ftmodule.h diff --git a/builds/amiga/makefile b/builds/amiga/makefile index 379883d..8a1e4c6 100644 --- a/builds/amiga/makefile +++ b/builds/amiga/makefile @@ -5,7 +5,7 @@ # -# Copyright 2005, 2006, 2007, 2009 by +# Copyright 2005-2007, 2009, 2013 by # Werner Lemberg and Detlef Würkner. # # This file is part of the FreeType project, and may only be used, modified, @@ -43,7 +43,7 @@ # # link your programs with libft2_ppc.a and either ftsystem.ppc.o or ftsystempure.ppc.o # (and either ftdebug.ppc.o or ftdebugpure.ppc.o if you enabled FT_DEBUG_LEVEL_ERROR or -# FT_DEBUG_LEVEL_TRACE in include/freetype/config/ftoption.h). +# FT_DEBUG_LEVEL_TRACE in include/config/ftoption.h). all: libft2_ppc.a ftsystem.ppc.o ftsystempure.ppc.o diff --git a/builds/amiga/makefile.os4 b/builds/amiga/makefile.os4 index 13758bc..a2e6ffc 100644 --- a/builds/amiga/makefile.os4 +++ b/builds/amiga/makefile.os4 @@ -4,7 +4,7 @@ # -# Copyright 2005, 2006, 2007, 2009 by +# Copyright 2005-2007, 2009, 2013 by # Werner Lemberg and Detlef Würkner. # # This file is part of the FreeType project, and may only be used, modified, @@ -40,7 +40,7 @@ # # link your programs with libft2_ppc.a and either ftsystem.ppc.o or ftsystempure.ppc.o # (and either ftdebug.ppc.o or ftdebugpure.ppc.o if you enabled FT_DEBUG_LEVEL_ERROR or -# FT_DEBUG_LEVEL_TRACE in include/freetype/config/ftoption.h). +# FT_DEBUG_LEVEL_TRACE in include/config/ftoption.h). all: assign libft2_ppc.a ftsystem.ppc.o ftsystempure.ppc.o diff --git a/builds/amiga/smakefile b/builds/amiga/smakefile index 097aec9..aee7fb9 100644 --- a/builds/amiga/smakefile +++ b/builds/amiga/smakefile @@ -3,7 +3,7 @@ # -# Copyright 2005,2006, 2007, 2009 by +# Copyright 2005-2007, 2009, 2013 by # Werner Lemberg and Detlef Würkner. # # This file is part of the FreeType project, and may only be used, modified, @@ -40,7 +40,7 @@ # # link your programs with ft2_680x0.lib and either ftsystem.o or ftsystempure.o # (and either ftdebug.o or ftdebugpure.o if you enabled FT_DEBUG_LEVEL_ERROR or -# FT_DEBUG_LEVEL_TRACE in include/freetype/config/ftoption.h). +# FT_DEBUG_LEVEL_TRACE in include/config/ftoption.h). OBJBASE = ftbase.o ftbbox.o ftbdf.o ftbitmap.o ftcid.o ftfstype.o ftgasp.o \ ftglyph.o ftgxval.o ftlcdfil.o ftmm.o ftotval.o ftpatent.o ftpfr.o \ diff --git a/builds/amiga/src/base/ftdebug.c b/builds/amiga/src/base/ftdebug.c index 5284e69..39688af 100644 --- a/builds/amiga/src/base/ftdebug.c +++ b/builds/amiga/src/base/ftdebug.c @@ -2,9 +2,9 @@ /* */ /* ftdebug.c */ /* */ -/* Debugging and logging component (body). */ +/* Debugging and logging component for amiga (body). */ /* */ -/* Copyright 1996-2001, 2002, 2004, 2005 by */ +/* Copyright 1996-2002, 2004, 2005, 2013 by */ /* David Turner, Robert Wilhelm, Werner Lemberg and Detlef Würkner. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -41,12 +41,12 @@ /*************************************************************************/ -/* - * Based on the default ftdebug.c, - * replaced vprintf() with KVPrintF(), - * commented out exit(), - * replaced getenv() with GetVar(). - */ + /* + * Based on the default ftdebug.c, + * replaced vprintf() with KVPrintF(), + * commented out exit(), + * replaced getenv() with GetVar(). + */ #include #include @@ -59,9 +59,9 @@ #include #ifndef __amigaos4__ -extern struct Library *DOSBase; + extern struct Library *DOSBase; #else -extern struct DOSIFace *IDOS; + extern struct DOSIFace *IDOS; #endif @@ -75,13 +75,13 @@ extern struct DOSIFace *IDOS; /* documentation is in ftdebug.h */ FT_BASE_DEF( void ) - FT_Message( const char* fmt, ... ) + FT_Message( const char* fmt, + ... ) { va_list ap; va_start( ap, fmt ); -/* vprintf( fmt, ap ); */ KVPrintF( fmt, ap ); va_end( ap ); } @@ -90,19 +90,34 @@ extern struct DOSIFace *IDOS; /* documentation is in ftdebug.h */ FT_BASE_DEF( void ) - FT_Panic( const char* fmt, ... ) + FT_Panic( const char* fmt, + ... ) { va_list ap; va_start( ap, fmt ); -/* vprintf( fmt, ap ); */ KVPrintF( fmt, ap ); va_end( ap ); /* exit( EXIT_FAILURE ); */ } + + /* documentation is in ftdebug.h */ + + FT_BASE_DEF( int ) + FT_Throw( FT_Error error, + int line, + const char* file ) + { + FT_UNUSED( error ); + FT_UNUSED( line ); + FT_UNUSED( file ); + + return 0; + } + #endif /* FT_DEBUG_LEVEL_ERROR */ @@ -161,7 +176,7 @@ extern struct DOSIFace *IDOS; /* the memory and stream components which are set to 7 and 5, */ /* respectively. */ /* */ - /* See the file for details of the */ + /* See the file for details of the */ /* available toggle names. */ /* */ /* The level must be between 0 and 7; 0 means quiet (except for serious */ @@ -193,6 +208,9 @@ extern struct DOSIFace *IDOS; while ( *p && *p != ':' ) p++; + if ( !*p ) + break; + if ( *p == ':' && p > q ) { FT_Int n, i, len = (FT_Int)( p - q ); @@ -221,7 +239,7 @@ extern struct DOSIFace *IDOS; p++; if ( *p ) { - level = *p++ - '0'; + level = *p - '0'; if ( level < 0 || level > 7 ) level = -1; } diff --git a/builds/amiga/src/base/ftsystem.c b/builds/amiga/src/base/ftsystem.c index 6f9eac1..42a552d 100644 --- a/builds/amiga/src/base/ftsystem.c +++ b/builds/amiga/src/base/ftsystem.c @@ -4,7 +4,7 @@ /* */ /* Amiga-specific FreeType low-level system interface (body). */ /* */ -/* Copyright 1996-2001, 2002, 2005, 2006, 2007, 2010 by */ +/* Copyright 1996-2002, 2005-2007, 2010, 2013 by */ /* David Turner, Robert Wilhelm, Werner Lemberg and Detlef Würkner. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -386,7 +386,7 @@ Free_VecPooled( APTR poolHeader, if ( !stream ) - return FT_Err_Invalid_Stream_Handle; + return FT_THROW( Invalid_Stream_Handle ); #ifdef __amigaos4__ sysfile = AllocMem ( sizeof (struct SysFile ), MEMF_SHARED ); @@ -398,7 +398,7 @@ Free_VecPooled( APTR poolHeader, FT_ERROR(( "FT_Stream_Open:" )); FT_ERROR(( " could not open `%s'\n", filepathname )); - return FT_Err_Cannot_Open_Resource; + return FT_THROW( Cannot_Open_Resource ); } sysfile->file = Open( (STRPTR)filepathname, MODE_OLDFILE ); if ( !sysfile->file ) @@ -407,7 +407,7 @@ Free_VecPooled( APTR poolHeader, FT_ERROR(( "FT_Stream_Open:" )); FT_ERROR(( " could not open `%s'\n", filepathname )); - return FT_Err_Cannot_Open_Resource; + return FT_THROW( Cannot_Open_Resource ); } fib = AllocDosObject( DOS_FIB, NULL ); @@ -418,7 +418,7 @@ Free_VecPooled( APTR poolHeader, FT_ERROR(( "FT_Stream_Open:" )); FT_ERROR(( " could not open `%s'\n", filepathname )); - return FT_Err_Cannot_Open_Resource; + return FT_THROW( Cannot_Open_Resource ); } if ( !( ExamineFH( sysfile->file, fib ) ) ) { @@ -428,7 +428,7 @@ Free_VecPooled( APTR poolHeader, FT_ERROR(( "FT_Stream_Open:" )); FT_ERROR(( " could not open `%s'\n", filepathname )); - return FT_Err_Cannot_Open_Resource; + return FT_THROW( Cannot_Open_Resource ); } stream->size = fib->fib_Size; FreeDosObject( DOS_FIB, fib ); @@ -447,7 +447,7 @@ Free_VecPooled( APTR poolHeader, ft_amiga_stream_close( stream ); FT_ERROR(( "FT_Stream_Open:" )); FT_ERROR(( " opened `%s' but zero-sized\n", filepathname )); - return FT_Err_Cannot_Open_Stream;; + return FT_THROW( Cannot_Open_Stream ); } FT_TRACE1(( "FT_Stream_Open:" )); diff --git a/builds/atari/deflinejoiner.awk b/builds/atari/deflinejoiner.awk index c872a70..16d9e6d 100644 --- a/builds/atari/deflinejoiner.awk +++ b/builds/atari/deflinejoiner.awk @@ -15,7 +15,7 @@ function shift( array, \ function init_cpp_src_line() { logical_line = "" - delete break_pos + delete break_pos } @@ -110,8 +110,8 @@ function shrink_spaces_to_linebreak( pos, \ { for ( i = 0; i < asorti( break_pos, junk ) && break_pos[i] < pos ; i++ ) ; - - if ( break_pos[i] < 1 ) + + if ( break_pos[i] < 1 ) return; part_str = substr( logical_line, pos, break_pos[i] - pos + 1 ) diff --git a/builds/cmake/iOS.cmake b/builds/cmake/iOS.cmake new file mode 100644 index 0000000..a41a7ac --- /dev/null +++ b/builds/cmake/iOS.cmake @@ -0,0 +1,275 @@ +# iOS.cmake +# +# Copyright 2014 by +# David Turner, Robert Wilhelm, and Werner Lemberg. +# +# Written by David Wimsey +# +# This file is part of the FreeType project, and may only be used, modified, +# and distributed under the terms of the FreeType project license, +# LICENSE.TXT. By continuing to use, modify, or distribute this file you +# indicate that you have read the license and understand and accept it +# fully. +# +# +# This file is derived from the files `Platform/Darwin.cmake' and +# `Platform/UnixPaths.cmake', which are part of CMake 2.8.4. It has been +# altered for iOS development. + + +# Options +# ------- +# +# IOS_PLATFORM = OS | SIMULATOR +# +# This decides whether SDKS are selected from the `iPhoneOS.platform' or +# `iPhoneSimulator.platform' folders. +# +# OS - the default, used to build for iPhone and iPad physical devices, +# which have an ARM architecture. +# SIMULATOR - used to build for the Simulator platforms, which have an +# x86 architecture. +# +# CMAKE_IOS_DEVELOPER_ROOT = /path/to/platform/Developer folder +# +# By default, this location is automatically chosen based on the +# IOS_PLATFORM value above. If you manually set this variable, it +# overrides the default location and forces the use of a particular +# Developer Platform. +# +# CMAKE_IOS_SDK_ROOT = /path/to/platform/Developer/SDKs/SDK folder +# +# By default, this location is automatically chosen based on the +# CMAKE_IOS_DEVELOPER_ROOT value. In this case it is always the most +# up-to-date SDK found in the CMAKE_IOS_DEVELOPER_ROOT path. If you +# manually set this variable, it forces the use of a specific SDK +# version. +# +# +# Macros +# ------ +# +# set_xcode_property (TARGET XCODE_PROPERTY XCODE_VALUE) +# +# A convenience macro for setting Xcode specific properties on targets. +# +# Example: +# +# set_xcode_property(myioslib IPHONEOS_DEPLOYMENT_TARGET "3.1") +# +# find_host_package (PROGRAM ARGS) +# +# A macro to find executable programs on the host system, not within the +# iOS environment. Thanks to the `android-cmake' project for providing +# the command. + + +# standard settings +set(CMAKE_SYSTEM_NAME Darwin) +set(CMAKE_SYSTEM_VERSION 1) +set(UNIX True) +set(APPLE True) +set(IOS True) + +# required as of cmake 2.8.10 +set(CMAKE_OSX_DEPLOYMENT_TARGET "" + CACHE STRING "Force unset of the deployment target for iOS" FORCE +) + +# determine the cmake host system version so we know where to find the iOS +# SDKs +find_program(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin) +if (CMAKE_UNAME) + exec_program(uname ARGS -r OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION) + string(REGEX REPLACE "^([0-9]+)\\.([0-9]+).*$" "\\1" + DARWIN_MAJOR_VERSION "${CMAKE_HOST_SYSTEM_VERSION}") +endif (CMAKE_UNAME) + +# force the compilers to gcc for iOS +include(CMakeForceCompiler) +CMAKE_FORCE_C_COMPILER(gcc gcc) +CMAKE_FORCE_CXX_COMPILER(g++ g++) + +# skip the platform compiler checks for cross compiling +set(CMAKE_CXX_COMPILER_WORKS TRUE) +set(CMAKE_C_COMPILER_WORKS TRUE) + +# all iOS/Darwin specific settings - some may be redundant +set(CMAKE_SHARED_LIBRARY_PREFIX "lib") +set(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib") +set(CMAKE_SHARED_MODULE_PREFIX "lib") +set(CMAKE_SHARED_MODULE_SUFFIX ".so") +set(CMAKE_MODULE_EXISTS 1) +set(CMAKE_DL_LIBS "") + +set(CMAKE_C_OSX_COMPATIBILITY_VERSION_FLAG + "-compatibility_version ") +set(CMAKE_C_OSX_CURRENT_VERSION_FLAG + "-current_version ") +set(CMAKE_CXX_OSX_COMPATIBILITY_VERSION_FLAG + "${CMAKE_C_OSX_COMPATIBILITY_VERSION_FLAG}") +set(CMAKE_CXX_OSX_CURRENT_VERSION_FLAG + "${CMAKE_C_OSX_CURRENT_VERSION_FLAG}") + +# hidden visibility is required for cxx on iOS +set(CMAKE_C_FLAGS_INIT "") +set(CMAKE_CXX_FLAGS_INIT + "-headerpad_max_install_names -fvisibility=hidden -fvisibility-inlines-hidden") + +set(CMAKE_C_LINK_FLAGS + "-Wl,-search_paths_first ${CMAKE_C_LINK_FLAGS}") +set(CMAKE_CXX_LINK_FLAGS + "-Wl,-search_paths_first ${CMAKE_CXX_LINK_FLAGS}") + +set(CMAKE_PLATFORM_HAS_INSTALLNAME 1) +set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS + "-dynamiclib -headerpad_max_install_names") +set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS + "-bundle -headerpad_max_install_names") +set(CMAKE_SHARED_MODULE_LOADER_C_FLAG + "-Wl,-bundle_loader,") +set(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG + "-Wl,-bundle_loader,") +set(CMAKE_FIND_LIBRARY_SUFFIXES + ".dylib" ".so" ".a") + +# hack: If a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old +# build tree (where `install_name_tool' was hardcoded), and where +# CMAKE_INSTALL_NAME_TOOL isn't in the cache and still cmake didn't +# fail in `CMakeFindBinUtils.cmake' (because it isn't rerun), hardcode +# CMAKE_INSTALL_NAME_TOOL here to `install_name_tool' so it behaves as +# it did before. +if (NOT DEFINED CMAKE_INSTALL_NAME_TOOL) + find_program(CMAKE_INSTALL_NAME_TOOL install_name_tool) +endif (NOT DEFINED CMAKE_INSTALL_NAME_TOOL) + +# set up iOS platform unless specified manually with IOS_PLATFORM +if (NOT DEFINED IOS_PLATFORM) + set(IOS_PLATFORM "OS") +endif (NOT DEFINED IOS_PLATFORM) + +set(IOS_PLATFORM ${IOS_PLATFORM} CACHE STRING "Type of iOS Platform") + +# check the platform selection and setup for developer root +if (${IOS_PLATFORM} STREQUAL "OS") + set(IOS_PLATFORM_LOCATION "iPhoneOS.platform") + + # this causes the installers to properly locate the output libraries + set(CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphoneos") + +elseif (${IOS_PLATFORM} STREQUAL "SIMULATOR") + set(IOS_PLATFORM_LOCATION "iPhoneSimulator.platform") + + # this causes the installers to properly locate the output libraries + set(CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphonesimulator") + +else (${IOS_PLATFORM} STREQUAL "OS") + message(FATAL_ERROR + "Unsupported IOS_PLATFORM value selected. Please choose OS or SIMULATOR.") + +endif (${IOS_PLATFORM} STREQUAL "OS") + +# set up iOS developer location unless specified manually with +# CMAKE_IOS_DEVELOPER_ROOT -- +# note that Xcode 4.3 changed the installation location; choose the most +# recent one available +set(XCODE_POST_43_ROOT + "/Applications/Xcode.app/Contents/Developer/Platforms/${IOS_PLATFORM_LOCATION}/Developer") +set(XCODE_PRE_43_ROOT + "/Developer/Platforms/${IOS_PLATFORM_LOCATION}/Developer") + +if (NOT DEFINED CMAKE_IOS_DEVELOPER_ROOT) + if (EXISTS ${XCODE_POST_43_ROOT}) + set(CMAKE_IOS_DEVELOPER_ROOT ${XCODE_POST_43_ROOT}) + elseif (EXISTS ${XCODE_PRE_43_ROOT}) + set(CMAKE_IOS_DEVELOPER_ROOT ${XCODE_PRE_43_ROOT}) + endif (EXISTS ${XCODE_POST_43_ROOT}) +endif (NOT DEFINED CMAKE_IOS_DEVELOPER_ROOT) + +set(CMAKE_IOS_DEVELOPER_ROOT ${CMAKE_IOS_DEVELOPER_ROOT} + CACHE PATH "Location of iOS Platform" +) + +# find and use the most recent iOS SDK unless specified manually with +# CMAKE_IOS_SDK_ROOT +if (NOT DEFINED CMAKE_IOS_SDK_ROOT) + file(GLOB _CMAKE_IOS_SDKS "${CMAKE_IOS_DEVELOPER_ROOT}/SDKs/*") + if (_CMAKE_IOS_SDKS) + list(SORT _CMAKE_IOS_SDKS) + list(REVERSE _CMAKE_IOS_SDKS) + list(GET _CMAKE_IOS_SDKS 0 CMAKE_IOS_SDK_ROOT) + else (_CMAKE_IOS_SDKS) + message(FATAL_ERROR + "No iOS SDK's found in default search path ${CMAKE_IOS_DEVELOPER_ROOT}. Manually set CMAKE_IOS_SDK_ROOT or install the iOS SDK.") + endif (_CMAKE_IOS_SDKS) + + message(STATUS "Toolchain using default iOS SDK: ${CMAKE_IOS_SDK_ROOT}") +endif (NOT DEFINED CMAKE_IOS_SDK_ROOT) + +set(CMAKE_IOS_SDK_ROOT ${CMAKE_IOS_SDK_ROOT} + CACHE PATH "Location of the selected iOS SDK" +) + +# set the sysroot default to the most recent SDK +set(CMAKE_OSX_SYSROOT ${CMAKE_IOS_SDK_ROOT} + CACHE PATH "Sysroot used for iOS support" +) + +# set the architecture for iOS -- +# note that currently both ARCHS_STANDARD_32_BIT and +# ARCHS_UNIVERSAL_IPHONE_OS set armv7 only, so set both manually +if (${IOS_PLATFORM} STREQUAL "OS") + set(IOS_ARCH $(ARCHS_STANDARD_32_64_BIT)) +else (${IOS_PLATFORM} STREQUAL "OS") + set(IOS_ARCH i386) +endif (${IOS_PLATFORM} STREQUAL "OS") + +set(CMAKE_OSX_ARCHITECTURES ${IOS_ARCH} + CACHE string "Build architecture for iOS" +) + +# set the find root to the iOS developer roots and to user defined paths +set(CMAKE_FIND_ROOT_PATH + ${CMAKE_IOS_DEVELOPER_ROOT} + ${CMAKE_IOS_SDK_ROOT} + ${CMAKE_PREFIX_PATH} + CACHE string "iOS find search path root" +) + +# default to searching for frameworks first +set(CMAKE_FIND_FRAMEWORK FIRST) + +# set up the default search directories for frameworks +set(CMAKE_SYSTEM_FRAMEWORK_PATH + ${CMAKE_IOS_SDK_ROOT}/System/Library/Frameworks + ${CMAKE_IOS_SDK_ROOT}/System/Library/PrivateFrameworks + ${CMAKE_IOS_SDK_ROOT}/Developer/Library/Frameworks +) + +# only search the iOS SDKs, not the remainder of the host filesystem +set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) + +# this little macro lets you set any Xcode specific property +macro(set_xcode_property TARGET XCODE_PROPERTY XCODE_VALUE) + set_property(TARGET ${TARGET} + PROPERTY XCODE_ATTRIBUTE_${XCODE_PROPERTY} ${XCODE_VALUE}) +endmacro(set_xcode_property) + +# this macro lets you find executable programs on the host system +macro(find_host_package) + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) + set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY NEVER) + set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE NEVER) + set(IOS FALSE) + + find_package(${ARGN}) + + set(IOS TRUE) + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY) + set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) + set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +endmacro(find_host_package) + +# eof diff --git a/builds/compiler/bcc-dev.mk b/builds/compiler/bcc-dev.mk index 63a46ad..42a99b0 100644 --- a/builds/compiler/bcc-dev.mk +++ b/builds/compiler/bcc-dev.mk @@ -53,7 +53,7 @@ L := # Target flag -- no trailing space. # T := -o -TE := -e +TE := -e # C flags diff --git a/builds/detect.mk b/builds/detect.mk index 987ae51..ff4045d 100644 --- a/builds/detect.mk +++ b/builds/detect.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2000, 2001, 2002, 2003, 2006, 2008 by +# Copyright 1996-2003, 2006, 2008, 2013, 2014 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -17,8 +17,8 @@ # the following variables: # # BUILD_DIR The configuration and system-specific directory. Usually -# `freetype/builds/$(PLATFORM)' but can be different for -# custom builds of the library. +# `builds/$(PLATFORM)' but can be different for custom builds +# of the library. # # The following variables must be defined in system specific `detect.mk' # files: @@ -124,7 +124,7 @@ std_setup: @echo "\`$(CONFIG_MK)' from this directory then read the INSTALL file for help." @echo "" @echo "Otherwise, simply type \`$(MAKE)' again to build the library," - @echo "or \`$(MAKE) refdoc' to build the API reference (the latter needs python)." + @echo "or \`$(MAKE) refdoc' to build the API reference (this needs python >= 2.6)." @echo "" @$(COPY) $(CONFIG_RULES) $(CONFIG_MK) @@ -146,7 +146,7 @@ dos_setup: @echo '$(CONFIG_MK)' from this directory then read the INSTALL file for help. @type builds$(SEP)newline @echo Otherwise, simply type 'make' again to build the library. - @echo or 'make refdoc' to build the API reference (the latter needs python). + @echo or 'make refdoc' to build the API reference (this needs python >= 2.6). @type builds$(SEP)newline @$(COPY) $(subst /,$(SEP),$(CONFIG_RULES) $(CONFIG_MK)) > nul diff --git a/builds/dos/detect.mk b/builds/dos/detect.mk index 700a122..3e5e967 100644 --- a/builds/dos/detect.mk +++ b/builds/dos/detect.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2000, 2003, 2004, 2006 by +# Copyright 1996-2000, 2003, 2004, 2006, 2014 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -45,12 +45,12 @@ ifeq ($(PLATFORM),ansi) endif # We also try to recognize Dos 7.x without Windows 9X launched. - # See builds/win32/detect.mk for explanations about the logic. + # See builds/windows/detect.mk for explanations about the logic. # ifeq ($(is_dos),) ifdef winbootdir #ifneq ($(OS),Windows_NT) - # If win32 is available, do not trigger this test. + # If windows is available, do not trigger this test. ifndef windir is_dos := $(findstring Windows,$(strip $(shell ver))) endif @@ -124,7 +124,7 @@ ifeq ($(PLATFORM),dos) CAT := type # Setting COPY is a bit trickier. We can be running DJGPP on some - # Windows NT derivatives, like XP. See builds/win32/detect.mk for + # Windows NT derivatives, like XP. See builds/windows/detect.mk for # explanations why we need hacking here. # ifeq ($(OS),Windows_NT) diff --git a/builds/exports.mk b/builds/exports.mk index 52f2912..96b10db 100644 --- a/builds/exports.mk +++ b/builds/exports.mk @@ -51,7 +51,7 @@ ifneq ($(EXPORTS_LIST),) APINAMES_EXE := $(subst /,$(SEP),$(OBJ_DIR)/apinames$(E_BUILD)) $(APINAMES_EXE): $(APINAMES_SRC) - $(CCexe) $(TE)$@ $< + $(CCexe) $(CCexe_CFLAGS) $(TE)$@ $< $(CCexe_LDFLAGS) .PHONY: symbols_list diff --git a/builds/freetype.mk b/builds/freetype.mk index 7a89c8e..8b2e2ea 100644 --- a/builds/freetype.mk +++ b/builds/freetype.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008 by +# Copyright 1996-2006, 2008, 2013, 2014 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -97,7 +97,7 @@ BASE_DIR := $(SRC_DIR)/base # Other derived directories. # -PUBLIC_DIR := $(TOP_DIR)/include/freetype +PUBLIC_DIR := $(TOP_DIR)/include INTERNAL_DIR := $(PUBLIC_DIR)/internal SERVICES_DIR := $(INTERNAL_DIR)/services CONFIG_DIR := $(PUBLIC_DIR)/config @@ -116,8 +116,8 @@ PROJECT_LIBRARY := $(LIB_DIR)/$(LIBRARY).$A # IMPORTANT NOTE: The architecture-dependent directory must ALWAYS be placed # before the standard include list. Porters are then able to # put their own version of some of the FreeType components -# in the `freetype/builds/' directory, as these -# files will override the default sources. +# in the `builds/' directory, as these files will +# override the default sources. # INCLUDES := $(subst /,$(COMPILER_SEP),$(OBJ_DIR) \ $(DEVEL_DIR) \ @@ -126,6 +126,14 @@ INCLUDES := $(subst /,$(COMPILER_SEP),$(OBJ_DIR) \ INCLUDE_FLAGS := $(INCLUDES:%=$I%) +ifdef DEVEL_DIR + # We assume that all library dependencies for FreeType are fulfilled for a + # development build, so we directly access the necessary include directory + # information using `pkg-config'. + INCLUDE_FLAGS += $(shell pkg-config --cflags libpng \ + harfbuzz ) +endif + # C flags used for the compilation of an object file. This must include at # least the paths for the `base' and `builds/' directories; @@ -147,13 +155,14 @@ ifneq ($(wildcard $(OBJ_DIR)/ftoption.h),) FTOPTION_FLAG := $DFT_CONFIG_OPTIONS_H="" endif +# Note that a build with the `configure' script uses $(CFLAGS) only. +# FT_CFLAGS = $(CPPFLAGS) \ $(INCLUDE_FLAGS) \ $(CFLAGS) \ $DFT2_BUILD_LIBRARY \ $DFT_CONFIG_MODULES_H="" \ $(FTOPTION_FLAG) -FT_CC = $(CC) $(FT_CFLAGS) FT_COMPILE = $(CC) $(ANSIFLAGS) $(FT_CFLAGS) @@ -178,7 +187,7 @@ PUBLIC_H := $(wildcard $(PUBLIC_DIR)/*.h) INTERNAL_H := $(wildcard $(INTERNAL_DIR)/*.h) \ $(wildcard $(SERVICES_DIR)/*.h) CONFIG_H := $(wildcard $(CONFIG_DIR)/*.h) \ - $(wildcard $(BUILD_DIR)/freetype/config/*.h) \ + $(wildcard $(BUILD_DIR)/config/*.h) \ $(FTMODULE_H) \ $(FTOPTION_H) DEVEL_H := $(wildcard $(TOP_DIR)/devel/*.h) @@ -261,8 +270,6 @@ objects: $(OBJECTS_LIST) library: $(PROJECT_LIBRARY) -dll: $(PROJECT_LIBRARY) exported_symbols - .c.$O: $(FT_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<) @@ -290,19 +297,16 @@ ifneq ($(findstring refdoc,$(MAKECMDGOALS)),) version := $(major).$(minor).$(patch) endif -# We write-protect the docmaker directory to suppress generation -# of .pyc files. +# Option `-B' disables generation of .pyc files (available since python 2.6) # refdoc: - -chmod -w $(SRC_DIR)/tools/docmaker - python $(SRC_DIR)/tools/docmaker/docmaker.py \ - --prefix=ft2 \ - --title=FreeType-$(version) \ - --output=$(DOC_DIR) \ - $(PUBLIC_DIR)/*.h \ - $(PUBLIC_DIR)/config/*.h \ - $(PUBLIC_DIR)/cache/*.h - -chmod +w $(SRC_DIR)/tools/docmaker + python -B $(SRC_DIR)/tools/docmaker/docmaker.py \ + --prefix=ft2 \ + --title=FreeType-$(version) \ + --output=$(DOC_DIR) \ + $(PUBLIC_DIR)/*.h \ + $(PUBLIC_DIR)/config/*.h \ + $(PUBLIC_DIR)/cache/*.h .PHONY: clean_project_std distclean_project_std diff --git a/builds/mac/README b/builds/mac/README index bd3df8a..f58e47d 100644 --- a/builds/mac/README +++ b/builds/mac/README @@ -1,8 +1,8 @@ This folder contains - * Makefile skeltons for Apple MPW (Macintosh's Programmers Workshop) + * Makefile skeletons for Apple MPW (Macintosh's Programmer's Workshop) - * Python script to generate MPW makefile from skelton + * Python script to generate MPW makefile from skeleton * Metrowerks CodeWarrior 9.0 project file in XML format @@ -51,7 +51,7 @@ environment by Metrowerks. GCC for MPW and Symantec Also you can find documents how to update by MPW-PR. Python is required to restore MPW makefiles from the - skeltons. Python bundled to Mac OS X is enough. For + skeletons. Python bundled to Mac OS X is enough. For classic MacOS, MacPython is available: http://homepages.cwi.nl/~jack/macpython/ @@ -78,10 +78,10 @@ environment by Metrowerks. GCC for MPW and Symantec Detailed building procedure by Apple MPW is described in following. - 3-1-1. Generate MPW makefiles from the skeltons + 3-1-1. Generate MPW makefiles from the skeletons ------------------------------------------------ - Here are 4 skeltons for following targets are + Here are 4 skeletons for following targets are included. - FreeType.m68k_far.make.txt @@ -109,7 +109,7 @@ environment by Metrowerks. GCC for MPW and Symantec MPW makefile syntax uses 8bit characters. To keep from violating them during version control, here - we store skeltons in pure ASCII format. You must + we store skeletons in pure ASCII format. You must generate MPW makefile by Python script ascii2mpw.py. In Mac OS X terminal, you can convert as: @@ -118,10 +118,10 @@ environment by Metrowerks. GCC for MPW and Symantec < builds/mac/FreeType.m68k_far.make.txt \ > FreeType.m68k_far.make - The skeltons are designed to use in the top + The skeletons are designed to use in the top directory where there are builds, include, src etc. You must name the generated MPW makefile by removing - ".txt" from source skelton name. + ".txt" from source skeleton name. 3-1-2. Add resource forks to related files ------------------------------------------ @@ -392,12 +392,10 @@ ATSFontGetFileSpecification() | x | x | x | x | ATS font manager is not published in these versions. ------------------------------------------------------------ -Last update: 2009-Jul-25. +Last update: 2013-Nov-03. Currently maintained by suzuki toshiya, Originally prepared by Leonard Rosenthol, Just van Rossum, - -This directory is now actively maintained as part of the FreeType Project. diff --git a/builds/mac/freetype-Info.plist b/builds/mac/freetype-Info.plist new file mode 100644 index 0000000..b3d114d --- /dev/null +++ b/builds/mac/freetype-Info.plist @@ -0,0 +1,36 @@ + + + + + + + CFBundleDevelopmentRegion + English + + CFBundleExecutable + FreeType + + CFBundleGetInfoString + FreeType ${PROJECT_VERSION} + + CFBundleInfoDictionaryVersion + 6.0 + + CFBundleName + FreeType + + CFBundlePackageType + FMWK + + CFBundleShortVersionString + ${PROJECT_VERSION} + + CFBundleSignature + ???? + + CFBundleVersion + ${PROJECT_VERSION} + + + diff --git a/builds/mac/ftmac.c b/builds/mac/ftmac.c index 719dd0c..27b5511 100644 --- a/builds/mac/ftmac.c +++ b/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-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 by */ +/* Copyright 1996-2008, 2013, 2014 by */ /* Just van Rossum, David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -184,7 +184,7 @@ typedef short ResourceIndex; FT_UNUSED( pathSpec ); FT_UNUSED( face_index ); - return FT_Err_Unimplemented_Feature; + return FT_THROW( Unimplemented_Feature ); } #else @@ -204,6 +204,9 @@ typedef short ResourceIndex; FMFontFamily family = 0; + if ( !fontName || !face_index ) + return FT_THROW( Invalid_Argument ); + *face_index = 0; while ( status == 0 && !the_font ) { @@ -270,7 +273,7 @@ typedef short ResourceIndex; return FT_Err_Ok; } else - return FT_Err_Unknown_File_Format; + return FT_THROW( Unknown_File_Format ); } #endif /* HAVE_QUICKDRAW_CARBON */ @@ -323,10 +326,10 @@ typedef short ResourceIndex; CFRelease( cf_fontName ); if ( ats_font_id == 0 || ats_font_id == 0xFFFFFFFFUL ) - return FT_Err_Unknown_File_Format; + return FT_THROW( Unknown_File_Format ); if ( noErr != FT_ATSFontGetFileReference( ats_font_id, ats_font_ref ) ) - return FT_Err_Unknown_File_Format; + return FT_THROW( Unknown_File_Format ); /* face_index calculation by searching preceding fontIDs */ /* with same FSRef */ @@ -365,7 +368,7 @@ typedef short ResourceIndex; FT_UNUSED( maxPathSize ); FT_UNUSED( face_index ); - return FT_Err_Unimplemented_Feature; + return FT_THROW( Unimplemented_Feature ); } #else @@ -381,11 +384,11 @@ typedef short ResourceIndex; err = FT_GetFileRef_From_Mac_ATS_Name( fontName, &ref, face_index ); - if ( FT_Err_Ok != err ) + if ( err ) return err; if ( noErr != FSRefMakePath( &ref, path, maxPathSize ) ) - return FT_Err_Unknown_File_Format; + return FT_THROW( Unknown_File_Format ); return FT_Err_Ok; } @@ -404,7 +407,7 @@ typedef short ResourceIndex; FT_UNUSED( pathSpec ); FT_UNUSED( face_index ); - return FT_Err_Unimplemented_Feature; + return FT_THROW( Unimplemented_Feature ); } #else @@ -420,12 +423,12 @@ typedef short ResourceIndex; err = FT_GetFileRef_From_Mac_ATS_Name( fontName, &ref, face_index ); - if ( FT_Err_Ok != err ) + if ( err ) return err; if ( noErr != FSGetCatalogInfo( &ref, kFSCatInfoNone, NULL, NULL, pathSpec, NULL ) ) - return FT_Err_Unknown_File_Format; + return FT_THROW( Unknown_File_Format ); return FT_Err_Ok; } @@ -580,7 +583,7 @@ typedef short ResourceIndex; if ( noErr != FSPathMakeRef( pathname, &ref, FALSE ) ) - return FT_Err_Cannot_Open_Resource; + return FT_THROW( Cannot_Open_Resource ); /* at present, no support for dfont format */ err = FSOpenResourceFile( &ref, 0, NULL, fsRdPerm, res ); @@ -598,7 +601,7 @@ typedef short ResourceIndex; if ( noErr != FT_FSPathMakeSpec( pathname, &spec, FALSE ) ) - return FT_Err_Cannot_Open_Resource; + return FT_THROW( Cannot_Open_Resource ); /* at present, no support for dfont format without FSRef */ /* (see above), try original resource-fork font */ @@ -696,11 +699,9 @@ typedef short ResourceIndex; count_faces_scalable( char* fond_data ) { AsscEntry* assoc; - FamRec* fond; short i, face, face_all; - fond = (FamRec*)fond_data; face_all = EndianS16_BtoN( *( (short *)( fond_data + sizeof ( FamRec ) ) ) ) + 1; assoc = (AsscEntry*)( fond_data + sizeof ( FamRec ) + 2 ); @@ -847,17 +848,17 @@ typedef short ResourceIndex; /* We should not extract parent directory by string manipulation. */ if ( noErr != FSPathMakeRef( path_fond, &ref, FALSE ) ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); if ( noErr != FSGetCatalogInfo( &ref, kFSCatInfoNone, NULL, NULL, NULL, &par_ref ) ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); if ( noErr != FSRefMakePath( &par_ref, path_lwfn, path_size ) ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); if ( ft_strlen( (char *)path_lwfn ) + 1 + base_lwfn[0] > path_size ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); /* now we have absolute dirname in path_lwfn */ if ( path_lwfn[0] == '/' ) @@ -870,11 +871,11 @@ typedef short ResourceIndex; path_lwfn[dirname_len + base_lwfn[0]] = '\0'; if ( noErr != FSPathMakeRef( path_lwfn, &ref, FALSE ) ) - return FT_Err_Cannot_Open_Resource; + return FT_THROW( Cannot_Open_Resource ); if ( noErr != FSGetCatalogInfo( &ref, kFSCatInfoNone, NULL, NULL, NULL, NULL ) ) - return FT_Err_Cannot_Open_Resource; + return FT_THROW( Cannot_Open_Resource ); return FT_Err_Ok; @@ -886,7 +887,7 @@ typedef short ResourceIndex; /* pathname for FSSpec is always HFS format */ if ( ft_strlen( (char *)path_fond ) > path_size ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); ft_strcpy( (char *)path_lwfn, (char *)path_fond ); @@ -895,7 +896,7 @@ typedef short ResourceIndex; i--; if ( i + 1 + base_lwfn[0] > path_size ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); if ( ':' == path_lwfn[i] ) { @@ -909,7 +910,7 @@ typedef short ResourceIndex; } if ( noErr != FT_FSPathMakeSpec( path_lwfn, &spec, FALSE ) ) - return FT_Err_Cannot_Open_Resource; + return FT_THROW( Cannot_Open_Resource ); return FT_Err_Ok; @@ -1003,7 +1004,7 @@ typedef short ResourceIndex; /* detect integer overflows */ if ( total_size < old_total_size ) { - error = FT_Err_Array_Too_Large; + error = FT_ERR( Array_Too_Large ); goto Error; } @@ -1088,7 +1089,7 @@ typedef short ResourceIndex; if ( noErr != FT_FSPathMakeRes( pathname, &res ) ) - return FT_Err_Cannot_Open_Resource; + return FT_THROW( Cannot_Open_Resource ); pfb_data = NULL; pfb_size = 0; @@ -1123,7 +1124,7 @@ typedef short ResourceIndex; sfnt = GetResource( TTAG_sfnt, sfnt_id ); if ( sfnt == NULL ) - return FT_Err_Invalid_Handle; + return FT_THROW( Invalid_Handle ); sfnt_size = (FT_ULong)GetHandleSize( sfnt ); if ( FT_ALLOC( sfnt_data, (FT_Long)sfnt_size ) ) @@ -1182,23 +1183,26 @@ typedef short ResourceIndex; FT_Long face_index, FT_Face* aface ) { - FT_Error error = FT_Err_Cannot_Open_Resource; + FT_Error error = FT_ERR( Cannot_Open_Resource ); ResFileRefNum res_ref; ResourceIndex res_index; Handle fond; - short num_faces_in_res, num_faces_in_fond; + short num_faces_in_res; if ( noErr != FT_FSPathMakeRes( pathname, &res_ref ) ) - return FT_Err_Cannot_Open_Resource; + return FT_THROW( Cannot_Open_Resource ); UseResFile( res_ref ); if ( ResError() ) - return FT_Err_Cannot_Open_Resource; + return FT_THROW( Cannot_Open_Resource ); num_faces_in_res = 0; for ( res_index = 1; ; ++res_index ) { + short num_faces_in_fond; + + fond = Get1IndResource( TTAG_FOND, res_index ); if ( ResError() ) break; @@ -1237,9 +1241,12 @@ typedef short ResourceIndex; FT_Error error = FT_Err_Ok; + /* test for valid `aface' and `library' delayed to */ + /* `FT_New_Face_From_XXX' */ + GetResInfo( fond, &fond_id, &fond_type, fond_name ); if ( ResError() != noErr || fond_type != TTAG_FOND ) - return FT_Err_Invalid_File_Format; + return FT_THROW( Invalid_File_Format ); HLock( fond ); parse_fond( *fond, &have_sfnt, &sfnt_id, lwfn_file_name, face_index ); @@ -1322,7 +1329,7 @@ typedef short ResourceIndex; face_index, aface ); else - error = FT_Err_Unknown_File_Format; + error = FT_ERR( Unknown_File_Format ); found_no_lwfn_file: if ( have_sfnt && FT_Err_Ok != error ) @@ -1389,9 +1396,8 @@ typedef short ResourceIndex; /* test for valid `library' and `aface' delayed to FT_Open_Face() */ if ( !pathname ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); - error = FT_Err_Ok; *aface = NULL; /* try resourcefork based font: LWFN, FFIL */ @@ -1432,7 +1438,7 @@ typedef short ResourceIndex; FT_UNUSED( face_index ); FT_UNUSED( aface ); - return FT_Err_Unimplemented_Feature; + return FT_THROW( Unimplemented_Feature ); #else @@ -1442,12 +1448,14 @@ typedef short ResourceIndex; UInt8 pathname[PATH_MAX]; + /* test for valid `library' and `aface' delayed to `FT_Open_Face' */ + if ( !ref ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); err = FSRefMakePath( ref, pathname, sizeof ( pathname ) ); if ( err ) - error = FT_Err_Cannot_Open_Resource; + error = FT_ERR( Cannot_Open_Resource ); error = FT_New_Face_From_Resource( library, pathname, face_index, aface ); if ( error != 0 || *aface != NULL ) @@ -1487,7 +1495,7 @@ typedef short ResourceIndex; if ( !spec || FSpMakeFSRef( spec, &ref ) != noErr ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); else return FT_New_Face_From_FSRef( library, &ref, face_index, aface ); @@ -1500,11 +1508,11 @@ typedef short ResourceIndex; if ( !spec ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); err = FT_FSpMakePath( spec, pathname, sizeof ( pathname ) ); if ( err ) - error = FT_Err_Cannot_Open_Resource; + error = FT_ERR( Cannot_Open_Resource ); error = FT_New_Face_From_Resource( library, pathname, face_index, aface ); if ( error != 0 || *aface != NULL ) @@ -1522,7 +1530,7 @@ typedef short ResourceIndex; FT_UNUSED( face_index ); FT_UNUSED( aface ); - return FT_Err_Unimplemented_Feature; + return FT_THROW( Unimplemented_Feature ); #endif /* HAVE_FSREF, HAVE_FSSPEC */ diff --git a/builds/modules.mk b/builds/modules.mk index c4a882c..3c1b083 100644 --- a/builds/modules.mk +++ b/builds/modules.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2000, 2003, 2006, 2008 by +# Copyright 1996-2000, 2003, 2006, 2008, 2014 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -28,7 +28,7 @@ $(FTMODULE_H): $(MODULES_CFG) $(FTMODULE_H_CREATE) $(FTMODULE_H_DONE) -ifneq ($(findstring $(PLATFORM),dos win32 win16 os2),) +ifneq ($(findstring $(PLATFORM),dos windows os2),) OPEN_MODULE := @echo$(space) CLOSE_MODULE := >> $(subst /,$(SEP),$(FTMODULE_H)) REMOVE_MODULE := @-$(DELETE) $(subst /,$(SEP),$(FTMODULE_H)) diff --git a/builds/symbian/bld.inf b/builds/symbian/bld.inf index dd5f559..bc8c160 100644 --- a/builds/symbian/bld.inf +++ b/builds/symbian/bld.inf @@ -2,7 +2,7 @@ // FreeType 2 project for the symbian platform // -// Copyright 2008, 2009 by +// Copyright 2008, 2009, 2013 by // David Turner, Robert Wilhelm, and Werner Lemberg. // // This file is part of the FreeType project, and may only be used, modified, @@ -19,48 +19,48 @@ freetype.mmp PRJ_EXPORTS ../../include/ft2build.h -../../include/freetype/config/ftconfig.h freetype/config/ftconfig.h -../../include/freetype/config/ftheader.h freetype/config/ftheader.h -../../include/freetype/config/ftmodule.h freetype/config/ftmodule.h -../../include/freetype/config/ftoption.h freetype/config/ftoption.h -../../include/freetype/config/ftstdlib.h freetype/config/ftstdlib.h -../../include/freetype/freetype.h freetype/freetype.h -../../include/freetype/ftbbox.h freetype/ftbbox.h -../../include/freetype/ftbdf.h freetype/ftbdf.h -../../include/freetype/ftbitmap.h freetype/ftbitmap.h -../../include/freetype/ftcache.h freetype/ftcache.h -../../include/freetype/ftcid.h freetype/ftcid.h -../../include/freetype/fterrdef.h freetype/fterrdef.h -../../include/freetype/fterrors.h freetype/fterrors.h -../../include/freetype/ftgasp.h freetype/ftgasp.h -../../include/freetype/ftglyph.h freetype/ftglyph.h -../../include/freetype/ftgxval.h freetype/ftgxval.h -../../include/freetype/ftgzip.h freetype/ftgzip.h -../../include/freetype/ftbzip2.h freetype/ftbzip2.h -../../include/freetype/ftimage.h freetype/ftimage.h -../../include/freetype/ftincrem.h freetype/ftincrem.h -../../include/freetype/ftlcdfil.h freetype/ftlcdfil.h -../../include/freetype/ftlist.h freetype/ftlist.h -../../include/freetype/ftlzw.h freetype/ftlzw.h -../../include/freetype/ftmac.h freetype/ftmac.h -../../include/freetype/ftmm.h freetype/ftmm.h -../../include/freetype/ftmodapi.h freetype/ftmodapi.h -../../include/freetype/ftmoderr.h freetype/ftmoderr.h -../../include/freetype/ftotval.h freetype/ftotval.h -../../include/freetype/ftoutln.h freetype/ftoutln.h -../../include/freetype/ftpfr.h freetype/ftpfr.h -../../include/freetype/ftrender.h freetype/ftrender.h -../../include/freetype/ftsizes.h freetype/ftsizes.h -../../include/freetype/ftsnames.h freetype/ftsnames.h -../../include/freetype/ftstroke.h freetype/ftstroke.h -../../include/freetype/ftsynth.h freetype/ftsynth.h -../../include/freetype/ftsystem.h freetype/ftsystem.h -../../include/freetype/fttrigon.h freetype/fttrigon.h -../../include/freetype/fttypes.h freetype/fttypes.h -../../include/freetype/ftwinfnt.h freetype/ftwinfnt.h -../../include/freetype/ftxf86.h freetype/ftxf86.h -../../include/freetype/t1tables.h freetype/t1tables.h -../../include/freetype/ttnameid.h freetype/ttnameid.h -../../include/freetype/tttables.h freetype/tttables.h -../../include/freetype/tttags.h freetype/tttags.h -../../include/freetype/ttunpat.h freetype/ttunpat.h +../../include/config/ftconfig.h config/ftconfig.h +../../include/config/ftheader.h config/ftheader.h +../../include/config/ftmodule.h config/ftmodule.h +../../include/config/ftoption.h config/ftoption.h +../../include/config/ftstdlib.h config/ftstdlib.h +../../include/freetype.h freetype.h +../../include/ftbbox.h ftbbox.h +../../include/ftbdf.h ftbdf.h +../../include/ftbitmap.h ftbitmap.h +../../include/ftcache.h ftcache.h +../../include/ftcid.h ftcid.h +../../include/fterrdef.h fterrdef.h +../../include/fterrors.h fterrors.h +../../include/ftgasp.h ftgasp.h +../../include/ftglyph.h ftglyph.h +../../include/ftgxval.h ftgxval.h +../../include/ftgzip.h ftgzip.h +../../include/ftbzip2.h ftbzip2.h +../../include/ftimage.h ftimage.h +../../include/ftincrem.h ftincrem.h +../../include/ftlcdfil.h ftlcdfil.h +../../include/ftlist.h ftlist.h +../../include/ftlzw.h ftlzw.h +../../include/ftmac.h ftmac.h +../../include/ftmm.h ftmm.h +../../include/ftmodapi.h ftmodapi.h +../../include/ftmoderr.h ftmoderr.h +../../include/ftotval.h ftotval.h +../../include/ftoutln.h ftoutln.h +../../include/ftpfr.h ftpfr.h +../../include/ftrender.h ftrender.h +../../include/ftsizes.h ftsizes.h +../../include/ftsnames.h ftsnames.h +../../include/ftstroke.h ftstroke.h +../../include/ftsynth.h ftsynth.h +../../include/ftsystem.h ftsystem.h +../../include/fttrigon.h fttrigon.h +../../include/fttypes.h fttypes.h +../../include/ftwinfnt.h ftwinfnt.h +../../include/ftxf86.h ftxf86.h +../../include/t1tables.h t1tables.h +../../include/ttnameid.h ttnameid.h +../../include/tttables.h tttables.h +../../include/tttags.h tttags.h +../../include/ttunpat.h ttunpat.h diff --git a/builds/toplevel.mk b/builds/toplevel.mk index 18bcef2..16d4be8 100644 --- a/builds/toplevel.mk +++ b/builds/toplevel.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2000, 2001, 2003, 2006, 2008, 2009, 2010 by +# Copyright 1996-2001, 2003, 2006, 2008-2010, 2012-2014 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -112,10 +112,10 @@ ifdef check_platform include $(TOP_DIR)/builds/detect.mk - # This rule makes sense for Unix only to remove files created by a run - # of the configure script which hasn't been successful (so that no + # This rule makes sense for Unix only to remove files created by a run of + # the configure script which hasn't been successful (so that no # `config.mk' has been created). It uses the built-in $(RM) command of - # GNU make. Similarly, `nul' is created if e.g. `make setup win32' has + # GNU make. Similarly, `nul' is created if e.g. `make setup windows' has # been erroneously used. # # Note: This test is duplicated in `builds/unix/detect.mk'. @@ -176,7 +176,7 @@ include $(TOP_DIR)/builds/modules.mk # we check for `dist', not `distclean' ifneq ($(findstring distx,$(MAKECMDGOALS)x),) - FT_H := include/freetype/freetype.h + FT_H := include/freetype.h major := $(shell sed -n 's/.*FREETYPE_MAJOR[^0-9]*\([0-9]\+\)/\1/p' < $(FT_H)) minor := $(shell sed -n 's/.*FREETYPE_MINOR[^0-9]*\([0-9]\+\)/\1/p' < $(FT_H)) @@ -201,6 +201,7 @@ dist: currdir=`pwd` ; \ for f in `find . -wholename '*/.git' -prune \ -o -name .gitignore \ + -o -name .mailmap \ -o -type d \ -o -print` ; do \ ln -s $$currdir/$$f tmp/$$f ; \ @@ -219,9 +220,9 @@ dist: mv tmp freetype-$(version) - tar cfh - freetype-$(version) \ + tar -H ustar -chf - freetype-$(version) \ | gzip -9 -c > freetype-$(version).tar.gz - tar cfh - freetype-$(version) \ + tar -H ustar -chf - freetype-$(version) \ | bzip2 -c > freetype-$(version).tar.bz2 @# Use CR/LF for zip files. diff --git a/builds/unix/.gitignore b/builds/unix/.gitignore index 86b8c40..e4e0a12 100644 --- a/builds/unix/.gitignore +++ b/builds/unix/.gitignore @@ -10,6 +10,7 @@ configure.ac freetype2.pc freetype-config ftconfig.h +install-sh libtool ltmain.sh unix-cc.mk diff --git a/builds/unix/aclocal.m4 b/builds/unix/aclocal.m4 index f90ad9f..97bf3eb 100644 --- a/builds/unix/aclocal.m4 +++ b/builds/unix/aclocal.m4 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +# generated automatically by aclocal 1.14.1 -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,6 +11,7 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -1317,7 +1318,7 @@ ia64-*-hpux*) rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -1329,9 +1330,19 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1350,7 +1361,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -1693,7 +1707,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else @@ -2517,17 +2532,6 @@ freebsd* | dragonfly*) esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -2644,7 +2648,7 @@ linux*oldld* | linux*aout* | linux*coff*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -2689,6 +2693,18 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -3248,10 +3264,6 @@ freebsd* | dragonfly*) fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -3290,11 +3302,11 @@ irix5* | irix6* | nonstopux*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -4042,7 +4054,7 @@ m4_if([$1], [CXX], [ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # KAI C++ Compiler @@ -4106,7 +4118,7 @@ m4_if([$1], [CXX], [ ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -4341,7 +4353,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -4583,6 +4595,9 @@ m4_if([$1], [CXX], [ ;; esac ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -4645,6 +4660,9 @@ dnl Note also adjust exclude_expsyms for C++ above. openbsd*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -4866,7 +4884,7 @@ _LT_EOF fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -5043,6 +5061,7 @@ _LT_EOF if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi + _LT_TAGVAR(link_all_deplibs, $1)=no else # not using gcc if test "$host_cpu" = ia64; then @@ -5347,7 +5366,7 @@ _LT_EOF _LT_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -6223,9 +6242,6 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(ld_shlibs, $1)=yes ;; - gnu*) - ;; - haiku*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes @@ -6387,7 +6403,7 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -8599,3 +8615,4 @@ m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) m4_include([ft-munmap.m4]) +m4_include([pkg.m4]) diff --git a/builds/unix/config.guess b/builds/unix/config.guess index d622a44..b79252d 100755 --- a/builds/unix/config.guess +++ b/builds/unix/config.guess @@ -1,14 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2012-02-10' +timestamp='2013-06-10' # 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 -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -22,19 +20,17 @@ timestamp='2012-02-10' # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Originally written by Per Bothner. Please send patches (context -# diff format) to and include a ChangeLog -# entry. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). # -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. +# Originally written by Per Bothner. # # 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 +# +# Please send patches with a ChangeLog entry to config-patches@gnu.org. + me=`echo "$0" | sed -e 's,.*/,,'` @@ -54,9 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-2013 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." @@ -138,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + ;; +esac + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -200,6 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} @@ -302,7 +321,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) + arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) @@ -801,6 +820,9 @@ EOF i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; @@ -852,21 +874,21 @@ EOF exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -879,59 +901,54 @@ EOF EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi else - echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -950,54 +967,63 @@ EOF #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; + or1k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; or32:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-gnu + echo sparc-unknown-linux-${LIBC} exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + echo hppa64-unknown-linux-${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + echo powerpc64-unknown-linux-${LIBC} exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu + echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1201,6 +1227,9 @@ EOF BePC:Haiku:*:*) # Haiku running on Intel PC compatible. echo i586-pc-haiku exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1227,19 +1256,21 @@ EOF exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi - fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) @@ -1256,7 +1287,7 @@ EOF NEO-?:NONSTOP_KERNEL:*:*) echo neo-tandem-nsk${UNAME_RELEASE} exit ;; - NSE-?:NONSTOP_KERNEL:*:*) + NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; NSR-?:NONSTOP_KERNEL:*:*) @@ -1330,9 +1361,6 @@ EOF exit ;; esac -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - eval $set_cc_for_build cat >$dummy.c <. @@ -26,11 +20,12 @@ timestamp='2012-02-10' # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to . Submit a context -# diff and a properly formatted GNU ChangeLog entry. +# Please send patches with a ChangeLog entry to config-patches@gnu.org. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -73,9 +68,7 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-2013 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." @@ -123,7 +116,7 @@ esac maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) @@ -156,7 +149,7 @@ case $os in -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze) + -apple | -axis | -knuth | -cray | -microblaze*) os= basic_machine=$1 ;; @@ -225,6 +218,12 @@ case $os in -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; -lynx*) os=-lynxos ;; @@ -253,10 +252,12 @@ case $basic_machine in | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | be32 | be64 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ | bfin \ - | c4x | clipper \ + | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ | epiphany \ | fido | fr30 | frv \ @@ -267,7 +268,7 @@ case $basic_machine in | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -285,16 +286,17 @@ case $basic_machine in | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ | nds32 | nds32le | nds32be \ - | nios | nios2 \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ | open8 \ - | or32 \ + | or1k | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ @@ -364,13 +366,13 @@ case $basic_machine in | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | clipper-* | craynv-* | cydra-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ @@ -383,7 +385,8 @@ case $basic_machine in | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -401,12 +404,13 @@ case $basic_machine in | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ | orion-* \ @@ -782,11 +786,15 @@ case $basic_machine in basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze*) basic_machine=microblaze-xilinx ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; mingw32) - basic_machine=i386-pc + basic_machine=i686-pc os=-mingw32 ;; mingw32ce) @@ -822,7 +830,7 @@ case $basic_machine in basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; msys) - basic_machine=i386-pc + basic_machine=i686-pc os=-msys ;; mvs) @@ -1013,7 +1021,11 @@ case $basic_machine in basic_machine=i586-unknown os=-pw32 ;; - rdos) + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) basic_machine=i386-pc os=-rdos ;; @@ -1340,21 +1352,21 @@ case $os in -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-uclibc* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1486,9 +1498,6 @@ case $os in -aros*) os=-aros ;; - -kaos*) - os=-kaos - ;; -zvmoe) os=-zvmoe ;; @@ -1537,6 +1546,12 @@ case $basic_machine in c4x-* | tic4x-*) os=-coff ;; + c8051-*) + os=-elf + ;; + hexagon-*) + os=-elf + ;; tic54x-*) os=-coff ;; @@ -1577,6 +1592,9 @@ case $basic_machine in mips*-*) os=-elf ;; + or1k-*) + os=-elf + ;; or32-*) os=-coff ;; diff --git a/builds/unix/configure b/builds/unix/configure index 7d2eb89..f4c6e91 100755 --- a/builds/unix/configure +++ b/builds/unix/configure @@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for FreeType 2.4.9. +# Generated by GNU Autoconf 2.69 for FreeType 2.5.4. # # Report bugs to . # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -136,6 +134,31 @@ export LANGUAGE # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -169,12 +192,12 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 -test \$(( 1 + 1 )) = 2 || exit 1 test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || ( ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' @@ -182,7 +205,8 @@ test \$(( 1 + 1 )) = 2 || exit 1 ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO PATH=/empty FPATH=/empty; export PATH FPATH test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\ - || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1" + || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1 +test \$(( 1 + 1 )) = 2 || exit 1" if (eval "$as_required") 2>/dev/null; then : as_have_required=yes else @@ -222,21 +246,25 @@ IFS=$as_save_IFS if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -339,6 +367,14 @@ $as_echo X"$as_dir" | } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -460,6 +496,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -494,16 +534,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -515,28 +555,8 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -570,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='FreeType' PACKAGE_TARNAME='freetype' -PACKAGE_VERSION='2.4.9' -PACKAGE_STRING='FreeType 2.4.9' +PACKAGE_VERSION='2.5.4' +PACKAGE_STRING='FreeType 2.5.4' PACKAGE_BUGREPORT='freetype@nongnu.org' PACKAGE_URL='' @@ -618,6 +638,27 @@ LIBOBJS build_libtool_libs wl hardcode_libdir_flag_spec +LIBSSTATIC_CONFIG +LIBS_PRIVATE +REQUIRES_PRIVATE +ftmac_c +HARFBUZZ_LIBS +HARFBUZZ_CFLAGS +LIBPNG_LIBS +LIBPNG_CFLAGS +BZIP2_LIBS +BZIP2_CFLAGS +ZLIB_LIBS +ZLIB_CFLAGS +XX_ANSIFLAGS +XX_CFLAGS +FTSYS_SRC +INSTALL_DATA +INSTALL_SCRIPT +INSTALL_PROGRAM +RMDIR +EXEEXT_BUILD +CC_BUILD OTOOL64 OTOOL LIPO @@ -635,28 +676,16 @@ ac_ct_DUMPBIN DUMPBIN LD FGREP +EGREP +GREP SED LIBTOOL OBJDUMP DLLTOOL AS -SYSTEM_ZLIB -FT2_EXTRA_LIBS -LIBBZ2 -LIBZ -ftmac_c -FTSYS_SRC -EGREP -GREP -INSTALL_DATA -INSTALL_SCRIPT -INSTALL_PROGRAM -RMDIR -RMF -XX_ANSIFLAGS -XX_CFLAGS -EXEEXT_BUILD -CC_BUILD +PKG_CONFIG_LIBDIR +PKG_CONFIG_PATH +PKG_CONFIG CPP OBJEXT EXEEXT @@ -716,23 +745,25 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking +enable_shared +enable_static +with_pic +enable_fast_install +with_gnu_ld +with_sysroot +enable_libtool_lock enable_biarch_config enable_mmap with_zlib with_bzip2 +with_png +with_harfbuzz with_old_mac_fonts with_fsspec with_fsref with_quickdraw_toolbox with_quickdraw_carbon with_ats -enable_shared -enable_static -with_pic -enable_fast_install -with_gnu_ld -with_sysroot -enable_libtool_lock ' ac_precious_vars='build_alias host_alias @@ -742,7 +773,18 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -CPP' +CPP +PKG_CONFIG +PKG_CONFIG_PATH +PKG_CONFIG_LIBDIR +ZLIB_CFLAGS +ZLIB_LIBS +BZIP2_CFLAGS +BZIP2_LIBS +LIBPNG_CFLAGS +LIBPNG_LIBS +HARFBUZZ_CFLAGS +HARFBUZZ_LIBS' # Initialize some variables set by options. @@ -1198,8 +1240,6 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1285,7 +1325,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures FreeType 2.4.9 to adapt to many kinds of systems. +\`configure' configures FreeType 2.5.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1350,7 +1390,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of FreeType 2.4.9:";; + short | recursive ) echo "Configuration of FreeType 2.5.4:";; esac cat <<\_ACEOF @@ -1358,20 +1398,34 @@ Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-biarch-config install biarch ftconfig.h to support multiple - architectures by single file - --disable-mmap do not check mmap() and do not use --enable-shared[=PKGS] build shared libraries [default=yes] --enable-static[=PKGS] build static libraries [default=yes] --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) + --enable-biarch-config install biarch ftconfig.h to support multiple + architectures by single file + --disable-mmap do not check mmap() and do not use Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --without-zlib use internal zlib instead of system-wide - --without-bzip2 do not support bzip2 compressed fonts + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use + both] + --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-sysroot=DIR Search for dependent libraries within DIR + (or the compiler's sysroot if not specified). + --with-zlib=[yes|no|auto] + use system zlib instead of internal library + [default=auto] + --with-bzip2=[yes|no|auto] + support bzip2 compressed fonts [default=auto] + --with-png=[yes|no|auto] + support png compressed OpenType embedded bitmaps + [default=auto] + --with-harfbuzz=[yes|no|auto] + improve auto-hinting of OpenType fonts + [default=auto] --with-old-mac-fonts allow Mac resource-based fonts to be used --with-fsspec use obsolete FSSpec API of MacOS, if available (default=yes) @@ -1383,11 +1437,6 @@ Optional Packages: --with-quickdraw-carbon use MacOS QuickDraw in Carbon, if available (default=yes) --with-ats use AppleTypeService, if available (default=yes) - --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-sysroot=DIR Search for dependent libraries within DIR - (or the compiler's sysroot if not specified). Some influential environment variables: CC C compiler command @@ -1398,6 +1447,23 @@ Some influential environment variables: CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory CPP C preprocessor + PKG_CONFIG path to pkg-config utility + PKG_CONFIG_PATH + directories to add to pkg-config's search path + PKG_CONFIG_LIBDIR + path overriding pkg-config's built-in search path + ZLIB_CFLAGS C compiler flags for ZLIB, overriding pkg-config + ZLIB_LIBS linker flags for ZLIB, overriding pkg-config + BZIP2_CFLAGS + C compiler flags for BZIP2, overriding pkg-config + BZIP2_LIBS linker flags for BZIP2, overriding pkg-config + LIBPNG_CFLAGS + C compiler flags for LIBPNG, overriding pkg-config + LIBPNG_LIBS linker flags for LIBPNG, overriding pkg-config + HARFBUZZ_CFLAGS + C compiler flags for HARFBUZZ, overriding pkg-config + HARFBUZZ_LIBS + linker flags for HARFBUZZ, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1465,10 +1531,10 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -FreeType configure 2.4.9 -generated by GNU Autoconf 2.68 +FreeType configure 2.5.4 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1554,6 +1620,83 @@ fi } # ac_fn_c_try_cpp +# ac_fn_c_try_link LINENO +# ----------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + test -x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_link + +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile + # ac_fn_c_try_run LINENO # ---------------------- # Try to link conftest.$ac_ext, and return whether this succeeded. Assumes @@ -1596,6 +1739,73 @@ fi } # ac_fn_c_try_run +# ac_fn_c_check_func LINENO FUNC VAR +# ---------------------------------- +# Tests whether FUNC exists, setting the cache variable VAR accordingly +ac_fn_c_check_func () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Define $2 to an innocuous variant, in case declares $2. + For example, HP-UX 11i declares gettimeofday. */ +#define $2 innocuous_$2 + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $2 (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $2 + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $2 (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$2 || defined __stub___$2 +choke me +#endif + +int +main () +{ +return $2 (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_func + # ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES # ------------------------------------------------------- # Tests whether HEADER exists, giving a warning if it cannot be compiled using @@ -1687,37 +1897,6 @@ fi } # ac_fn_c_check_header_mongrel -# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists and can be compiled using the include files in -# INCLUDES, setting the cache variable VAR accordingly. -ac_fn_c_check_header_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - eval "$3=yes" -else - eval "$3=no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_compile - # ac_fn_c_compute_int LINENO EXPR VAR INCLUDES # -------------------------------------------- # Tries to find the compile-time value of EXPR in a program that includes @@ -1735,7 +1914,8 @@ int main () { static int test_array [1 - 2 * !(($2) >= 0)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -1751,7 +1931,8 @@ int main () { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -1777,7 +1958,8 @@ int main () { static int test_array [1 - 2 * !(($2) < 0)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -1793,7 +1975,8 @@ int main () { static int test_array [1 - 2 * !(($2) >= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -1827,7 +2010,8 @@ int main () { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -1896,124 +2080,11 @@ rm -f conftest.val } # ac_fn_c_compute_int -# ac_fn_c_try_link LINENO -# ----------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_link () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest$ac_exeext - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information - # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would - # interfere with the next link command; also delete a directory that is - # left behind by Apple's compiler. We do this before executing the actions. - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_link - -# ac_fn_c_check_func LINENO FUNC VAR -# ---------------------------------- -# Tests whether FUNC exists, setting the cache variable VAR accordingly -ac_fn_c_check_func () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* Define $2 to an innocuous variant, in case declares $2. - For example, HP-UX 11i declares gettimeofday. */ -#define $2 innocuous_$2 - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $2 (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $2 - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $2 (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$2 || defined __stub___$2 -choke me -#endif - -int -main () -{ -return $2 (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - eval "$3=yes" -else - eval "$3=no" -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_func - -# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES -# --------------------------------------------- -# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR -# accordingly. -ac_fn_c_check_decl () +# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES +# --------------------------------------------- +# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR +# accordingly. +ac_fn_c_check_decl () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack as_decl_name=`echo $2|sed 's/ *(.*//'` @@ -2058,8 +2129,8 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by FreeType $as_me 2.4.9, which was -generated by GNU Autoconf 2.68. Invocation command line was +It was created by FreeType $as_me 2.5.4, which was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2414,7 +2485,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # Don't forget to update docs/VERSION.DLL! -version_info='14:1:8' +version_info='17:3:11' ft_version=`echo $version_info | tr : .` @@ -2548,7 +2619,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2588,7 +2659,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2641,7 +2712,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2682,7 +2753,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -2740,7 +2811,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2784,7 +2855,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3230,8 +3301,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -3456,27 +3526,34 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -# checks for native programs to generate building tool -if test ${cross_compiling} = yes; then - # Extract the first word of "${build}-gcc", so it can be a program name with args. -set dummy ${build}-gcc; ac_word=$2 + + + + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC_BUILD+:} false; then : +if ${ac_cv_path_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$CC_BUILD"; then - ac_cv_prog_CC_BUILD="$CC_BUILD" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC_BUILD="${build}-gcc" + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -3484,36 +3561,42 @@ done done IFS=$as_save_IFS + ;; +esac fi -fi -CC_BUILD=$ac_cv_prog_CC_BUILD -if test -n "$CC_BUILD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC_BUILD" >&5 -$as_echo "$CC_BUILD" >&6; } +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - test -z "${CC_BUILD}" && # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC_BUILD+:} false; then : +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$CC_BUILD"; then - ac_cv_prog_CC_BUILD="$CC_BUILD" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC_BUILD="gcc" + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -3521,332 +3604,170 @@ done done IFS=$as_save_IFS + ;; +esac fi -fi -CC_BUILD=$ac_cv_prog_CC_BUILD -if test -n "$CC_BUILD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC_BUILD" >&5 -$as_echo "$CC_BUILD" >&6; } +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - - test -z "${CC_BUILD}" && # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC_BUILD+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC_BUILD"; then - ac_cv_prog_CC_BUILD="$CC_BUILD" # Let the user override the test. -else - ac_prog_rejected=no -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC_BUILD="cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC_BUILD - shift - if test $# != 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC_BUILD to just the basename; use the full file name. - shift - ac_cv_prog_CC_BUILD="$as_dir/$ac_word${1+' '}$@" + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" fi + fi -fi -CC_BUILD=$ac_cv_prog_CC_BUILD -if test -n "$CC_BUILD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC_BUILD" >&5 -$as_echo "$CC_BUILD" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.24 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } + PKG_CONFIG="" + fi fi +case `pwd` in + *\ * | *\ *) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 +$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; +esac - test -z "${CC_BUILD}" && as_fn_error $? "cannot find native C compiler" "$LINENO" 5 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of native executables" >&5 -$as_echo_n "checking for suffix of native executables... " >&6; } - rm -f a.* b.* a_out.exe conftest.* - echo > conftest.c "int main() { return 0;}" - ${CC_BUILD} conftest.c || as_fn_error $? "native C compiler is not working" "$LINENO" 5 - rm -f conftest.c - if test -x a.out -o -x b.out -o -x conftest; then - EXEEXT_BUILD="" - elif test -x a_out.exe -o -x conftest.exe; then - EXEEXT_BUILD=".exe" - elif test -x conftest.*; then - EXEEXT_BUILD=`echo conftest.* | sed -n '1s/^.*\././'` - fi - rm -f a.* b.* a_out.exe conftest.* - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EXEEXT_BUILD" >&5 -$as_echo "$EXEEXT_BUILD" >&6; } -else - CC_BUILD=${CC} - EXEEXT_BUILD=${EXEEXT} -fi +macro_version='2.4.2' +macro_revision='1.3337' -# get compiler flags right -if test "x$GCC" = xyes; then - XX_CFLAGS="-Wall" - XX_ANSIFLAGS="-pedantic -ansi" -else - case "$host" in - *-dec-osf*) - CFLAGS= - XX_CFLAGS="-std1 -g3" - XX_ANSIFLAGS= - ;; - *) - XX_CFLAGS= - XX_ANSIFLAGS= - ;; - esac -fi -# auxiliary programs -# Extract the first word of "rm", so it can be a program name with args. -set dummy rm; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_RMF+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$RMF"; then - ac_cv_prog_RMF="$RMF" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_RMF="rm -f" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS -fi -fi -RMF=$ac_cv_prog_RMF -if test -n "$RMF"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RMF" >&5 -$as_echo "$RMF" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi +ltmain="$ac_aux_dir/ltmain.sh" -# Extract the first word of "rmdir", so it can be a program name with args. -set dummy rmdir; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_RMDIR+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$RMDIR"; then - ac_cv_prog_RMDIR="$RMDIR" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_RMDIR="rmdir" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS +# Backslashify metacharacters that are still active within +# double-quoted strings. +sed_quote_subst='s/\(["`$\\]\)/\\\1/g' -fi -fi -RMDIR=$ac_cv_prog_RMDIR -if test -n "$RMDIR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RMDIR" >&5 -$as_echo "$RMDIR" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi +# Same as above, but do not quote variable references. +double_quote_subst='s/\(["`\\]\)/\\\1/g' +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' +# Sed substitution to delay expansion of an escaped single quote. +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' -# Since this file will be finally moved to another directory we make -# the path of the install script absolute. This small code snippet has -# been taken from automake's `ylwrap' script. +ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -# Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 -$as_echo_n "checking for a BSD-compatible install... " >&6; } -if test -z "$INSTALL"; then -if ${ac_cv_path_install+:} false; then : - $as_echo_n "(cached) " >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 +$as_echo_n "checking how to print strings... " >&6; } +# Test print first, because it will be a builtin if present. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='print -r --' +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='printf %s\n' else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in #(( - ./ | .// | /[cC]/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - rm -rf conftest.one conftest.two conftest.dir - echo one > conftest.one - echo two > conftest.two - mkdir conftest.dir - if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && - test -s conftest.one && test -s conftest.two && - test -s conftest.dir/conftest.one && - test -s conftest.dir/conftest.two - then - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - fi - done - done - ;; + # Use this function as a fallback that always works. + func_fallback_echo () + { + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' + } + ECHO='func_fallback_echo' +fi + +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "" +} + +case "$ECHO" in + printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 +$as_echo "printf" >&6; } ;; + print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 +$as_echo "print -r" >&6; } ;; + *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 +$as_echo "cat" >&6; } ;; esac - done -IFS=$as_save_IFS -rm -rf conftest.one conftest.two conftest.dir -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. Don't cache a - # value for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - INSTALL=$ac_install_sh - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 -$as_echo "$INSTALL" >&6; } -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -case "$INSTALL" in -/*) - ;; -*/*) - INSTALL="`pwd`/$INSTALL" - ;; -esac -# checks for header files -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -$as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if ${ac_cv_path_GREP+:} false; then : + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +$as_echo_n "checking for a sed that does not truncate output... " >&6; } +if ${ac_cv_path_SED+:} false; then : $as_echo_n "(cached) " >&6 else - if test -z "$GREP"; then - ac_path_GREP_found=false + ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for ac_i in 1 2 3 4 5 6 7; do + ac_script="$ac_script$as_nl$ac_script" + done + echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed + { ac_script=; unset ac_script;} + if test -z "$SED"; then + ac_path_SED_found=false # Loop through the user's path and test for each of PROGNAME-LIST as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do + for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue -# Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP -case `"$ac_path_GREP" --version 2>&1` in + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_SED" || continue +# Check for GNU ac_path_SED and select it if it is found. + # Check for GNU $ac_path_SED +case `"$ac_path_SED" --version 2>&1` in *GNU*) - ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; + ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; *) ac_count=0 $as_echo_n 0123456789 >"conftest.in" @@ -3855,14 +3776,14 @@ case `"$ac_path_GREP" --version 2>&1` in cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - $as_echo 'GREP' >> "conftest.nl" - "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + $as_echo '' >> "conftest.nl" + "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_GREP_max-0}; then + if test $ac_count -gt ${ac_path_SED_max-0}; then # Best one so far, save it but keep looking for a better one - ac_cv_path_GREP="$ac_path_GREP" - ac_path_GREP_max=$ac_count + ac_cv_path_SED="$ac_path_SED" + ac_path_SED_max=$ac_count fi # 10*(2^10) chars as input seems more than enough test $ac_count -gt 10 && break @@ -3870,22 +3791,98 @@ case `"$ac_path_GREP" --version 2>&1` in rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac - $ac_path_GREP_found && break 3 + $ac_path_SED_found && break 3 done done done IFS=$as_save_IFS - if test -z "$ac_cv_path_GREP"; then - as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + if test -z "$ac_cv_path_SED"; then + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 fi else - ac_cv_path_GREP=$GREP + ac_cv_path_SED=$SED fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -$as_echo "$ac_cv_path_GREP" >&6; } - GREP="$ac_cv_path_GREP" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +$as_echo "$ac_cv_path_SED" >&6; } + SED="$ac_cv_path_SED" + rm -f conftest.sed + +test -z "$SED" && SED=sed +Xsed="$SED -e 1s/^X//" + + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; } +if ${ac_cv_path_GREP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$GREP"; then + ac_path_GREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_GREP" || continue +# Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_GREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_GREP=$GREP +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +$as_echo "$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 @@ -3907,7 +3904,7 @@ do for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -3955,1454 +3952,1603 @@ $as_echo "$ac_cv_path_EGREP" >&6; } EGREP="$ac_cv_path_EGREP" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if ${ac_cv_header_stdc+:} false; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 +$as_echo_n "checking for fgrep... " >&6; } +if ${ac_cv_path_FGREP+:} false; then : $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes -else - ac_cv_header_stdc=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : + if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 + then ac_cv_path_FGREP="$GREP -F" + else + if test -z "$FGREP"; then + ac_path_FGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in fgrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_FGREP" || continue +# Check for GNU ac_path_FGREP and select it if it is found. + # Check for GNU $ac_path_FGREP +case `"$ac_path_FGREP" --version 2>&1` in +*GNU*) + ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'FGREP' >> "conftest.nl" + "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_FGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_FGREP="$ac_path_FGREP" + ac_path_FGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + $ac_path_FGREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_FGREP"; then + as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi else - ac_cv_header_stdc=no + ac_cv_path_FGREP=$FGREP fi -rm -f conftest* + fi fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 +$as_echo "$ac_cv_path_FGREP" >&6; } + FGREP="$ac_cv_path_FGREP" -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : +test -z "$GREP" && GREP=grep -else - ac_cv_header_stdc=no -fi -rm -f conftest* -fi -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : - : -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : -else - ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then -$as_echo "#define STDC_HEADERS 1" >>confdefs.h -fi -# On IRIX 5.3, sys/types and inttypes.h are conflicting. -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF -fi -done -for ac_header in fcntl.h unistd.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF -fi -done -# checks for typedefs, structures, and compiler characteristics -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 -$as_echo_n "checking for an ANSI C-conforming const... " >&6; } -if ${ac_cv_c_const+:} false; then : - $as_echo_n "(cached) " >&6 +# Check whether --with-gnu-ld was given. +if test "${with_gnu_ld+set}" = set; then : + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -/* FIXME: Include the comments suggested by Paul. */ -#ifndef __cplusplus - /* Ultrix mips cc rejects this. */ - typedef int charset[2]; - const charset cs; - /* SunOS 4.1.1 cc rejects this. */ - char const *const *pcpcc; - char **ppc; - /* NEC SVR4.0.2 mips cc rejects this. */ - struct point {int x, y;}; - static struct point const zero = {0,0}; - /* AIX XL C 1.02.0.0 rejects this. - It does not let you subtract one const X* pointer from another in - an arm of an if-expression whose if-part is not a constant - expression */ - const char *g = "string"; - pcpcc = &g + (g ? g-g : 0); - /* HPUX 7.0 cc rejects these. */ - ++pcpcc; - ppc = (char**) pcpcc; - pcpcc = (char const *const *) ppc; - { /* SCO 3.2v4 cc rejects this. */ - char *t; - char const *s = 0 ? (char *) 0 : (char const *) 0; - - *t++ = 0; - if (s) return 0; - } - { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ - int x[] = {25, 17}; - const int *foo = &x[0]; - ++foo; - } - { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ - typedef const int *iptr; - iptr p = 0; - ++p; - } - { /* AIX XL C 1.02.0.0 rejects this saying - "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; }; - struct s *b; b->j = 5; - } - { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ - const int foo = 10; - if (!foo) return 0; - } - return !cs[0] && !zero.x; -#endif - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_c_const=yes -else - ac_cv_c_const=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + with_gnu_ld=no fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 -$as_echo "$ac_cv_c_const" >&6; } -if test $ac_cv_c_const = no; then - -$as_echo "#define const /**/" >>confdefs.h +ac_prog=ld +if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 +$as_echo_n "checking for ld used by $CC... " >&6; } + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [\\/]* | ?:[\\/]*) + re_direlt='/[^/][^/]*/\.\./' + # Canonicalize the pathname of ld + ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` + while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do + ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +elif test "$with_gnu_ld" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 +$as_echo_n "checking for GNU ld... " >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 +$as_echo_n "checking for non-GNU ld... " >&6; } fi - -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 -$as_echo_n "checking size of int... " >&6; } -if ${ac_cv_sizeof_int+:} false; then : +if ${lt_cv_path_LD+:} false; then : $as_echo_n "(cached) " >&6 else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then : - + if test -z "$LD"; then + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + lt_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some variants of GNU ld only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$lt_cv_path_LD" -v 2>&1 &5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (int) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_int=0 - fi + lt_cv_path_LD="$LD" # Let the user override the test with a path. fi - fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5 -$as_echo "$ac_cv_sizeof_int" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_INT $ac_cv_sizeof_int -_ACEOF - - -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 -$as_echo_n "checking size of long... " >&6; } -if ${ac_cv_sizeof_long+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then : +LD="$lt_cv_path_LD" +if test -n "$LD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 +$as_echo "$LD" >&6; } else - if test "$ac_cv_type_long" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (long) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_long=0 - fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } +if ${lt_cv_prog_gnu_ld+:} false; then : + $as_echo_n "(cached) " >&6 +else + # I'd rather use --version here, but apparently some GNU lds only accept -v. +case `$LD -v 2>&1 &5 -$as_echo "$ac_cv_sizeof_long" >&6; } - - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 +$as_echo "$lt_cv_prog_gnu_ld" >&6; } +with_gnu_ld=$lt_cv_prog_gnu_ld -cat >>confdefs.h <<_ACEOF -#define SIZEOF_LONG $ac_cv_sizeof_long -_ACEOF -# check whether cpp computation of size of int and long in ftconfig.in works -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cpp computation of bit length in ftconfig.in works" >&5 -$as_echo_n "checking whether cpp computation of bit length in ftconfig.in works... " >&6; } -orig_CPPFLAGS="${CPPFLAGS}" -CPPFLAGS="-I${srcdir} -I. ${CPPFLAGS}" -ac_clean_files="ft2build.h ftoption.h ftstdlib.h" -touch ft2build.h ftoption.h ftstdlib.h -cat > conftest.c <<\_ACEOF -#include -#define FT_CONFIG_OPTIONS_H "ftoption.h" -#define FT_CONFIG_STANDARD_LIBRARY_H "ftstdlib.h" -#define FT_UINT_MAX UINT_MAX -#define FT_ULONG_MAX ULONG_MAX -#include "ftconfig.in" -_ACEOF -echo >> conftest.c "#if FT_SIZEOF_INT == "${ac_cv_sizeof_int} -echo >> conftest.c "ac_cpp_ft_sizeof_int="${ac_cv_sizeof_int} -echo >> conftest.c "#endif" -echo >> conftest.c "#if FT_SIZEOF_LONG == "${ac_cv_sizeof_long} -echo >> conftest.c "ac_cpp_ft_sizeof_long="${ac_cv_sizeof_long} -echo >> conftest.c "#endif" -${CPP} ${CPPFLAGS} conftest.c | ${GREP} ac_cpp_ft > conftest.sh -eval `cat conftest.sh` -${RMF} conftest.c conftest.sh confft2build.h ftoption.h ftstdlib.h -if test x != "x${ac_cpp_ft_sizeof_int}" \ - -a x != x"${ac_cpp_ft_sizeof_long}"; then - unset ft_use_autoconf_sizeof_types +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 +$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } +if ${lt_cv_path_NM+:} false; then : + $as_echo_n "(cached) " >&6 else - ft_use_autoconf_sizeof_types=yes -fi - -# Check whether --enable-biarch-config was given. -if test "${enable_biarch_config+set}" = set; then : - enableval=$enable_biarch_config; -fi - - -case :${ft_use_autoconf_sizeof_types}:${enable_biarch_config}: in - :yes:yes:) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: broken but use it" >&5 -$as_echo "broken but use it" >&6; } - unset ft_use_autoconf_sizeof_types - ;; - ::no:) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: works but ignore it" >&5 -$as_echo "works but ignore it" >&6; } - ft_use_autoconf_sizeof_types=yes - ;; - ::yes: | :::) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - unset ft_use_autoconf_sizeof_types - ;; - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - ft_use_autoconf_sizeof_types=yes - ;; -esac - -if test x"${ft_use_autoconf_sizeof_types}" = xyes; then - $as_echo "#define FT_USE_AUTOCONF_SIZEOF_TYPES 1" >>confdefs.h - + if test -n "$NM"; then + # Let the user override the test. + lt_cv_path_NM="$NM" +else + lt_nm_to_check="${ac_tool_prefix}nm" + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then + lt_nm_to_check="$lt_nm_to_check nm" + fi + for lt_tmp_nm in $lt_nm_to_check; do + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + tmp_nm="$ac_dir/$lt_tmp_nm" + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + # Check to see if the nm accepts a BSD-compat flag. + # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored + # Tru64's nm complains that /dev/null is an invalid object file + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in + */dev/null* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" + break + ;; + *) + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" + break + ;; + *) + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but + continue # so that we can try to find one that supports BSD flags + ;; + esac + ;; + esac + fi + done + IFS="$lt_save_ifs" + done + : ${lt_cv_path_NM=no} fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 +$as_echo "$lt_cv_path_NM" >&6; } +if test "$lt_cv_path_NM" != "no"; then + NM="$lt_cv_path_NM" +else + # Didn't find any BSD compatible name lister, look for dumpbin. + if test -n "$DUMPBIN"; then : + # Let the user override the test. + else + if test -n "$ac_tool_prefix"; then + for ac_prog in dumpbin "link -dump" + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DUMPBIN+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DUMPBIN"; then + ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS -CPPFLAGS="${orig_CPPFLAGS}" - +fi +fi +DUMPBIN=$ac_cv_prog_DUMPBIN +if test -n "$DUMPBIN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 +$as_echo "$DUMPBIN" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -# checks for library functions -# Here we check whether we can use our mmap file component. + test -n "$DUMPBIN" && break + done +fi +if test -z "$DUMPBIN"; then + ac_ct_DUMPBIN=$DUMPBIN + for ac_prog in dumpbin "link -dump" +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DUMPBIN"; then + ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS -# Check whether --enable-mmap was given. -if test "${enable_mmap+set}" = set; then : - enableval=$enable_mmap; enable_mmap="no" +fi +fi +ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN +if test -n "$ac_ct_DUMPBIN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 +$as_echo "$ac_ct_DUMPBIN" >&6; } else - enable_mmap="yes" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -if test "x${enable_mmap}" != "xno"; then - - - for ac_header in $ac_header_list -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF + test -n "$ac_ct_DUMPBIN" && break +done + if test "x$ac_ct_DUMPBIN" = x; then + DUMPBIN=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DUMPBIN=$ac_ct_DUMPBIN + fi fi -done - + case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + *COFF*) + DUMPBIN="$DUMPBIN -symbols" + ;; + *) + DUMPBIN=: + ;; + esac + fi + if test "$DUMPBIN" != ":"; then + NM="$DUMPBIN" + fi +fi +test -z "$NM" && NM=nm -for ac_func in getpagesize -do : - ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize" -if test "x$ac_cv_func_getpagesize" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_GETPAGESIZE 1 -_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 +$as_echo_n "checking the name lister ($NM) interface... " >&6; } +if ${lt_cv_nm_interface+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext + (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 + (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 + (eval echo "\"\$as_me:$LINENO: output\"" >&5) + cat conftest.out >&5 + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" + fi + rm -f conftest* +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 +$as_echo "$lt_cv_nm_interface" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 +$as_echo_n "checking whether ln -s works... " >&6; } +LN_S=$as_ln_s +if test "$LN_S" = "ln -s"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 +$as_echo "no, using $LN_S" >&6; } fi -done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5 -$as_echo_n "checking for working mmap... " >&6; } -if ${ac_cv_func_mmap_fixed_mapped+:} false; then : +# find the maximum length of command line arguments +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 +$as_echo_n "checking the maximum length of command line arguments... " >&6; } +if ${lt_cv_sys_max_cmd_len+:} false; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : - ac_cv_func_mmap_fixed_mapped=no -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_includes_default -/* malloc might have been renamed as rpl_malloc. */ -#undef malloc + i=0 + teststring="ABCD" -/* Thanks to Mike Haertel and Jim Avera for this test. - Here is a matrix of mmap possibilities: - mmap private not fixed - mmap private fixed at somewhere currently unmapped - mmap private fixed at somewhere already mapped - mmap shared not fixed - mmap shared fixed at somewhere currently unmapped - mmap shared fixed at somewhere already mapped - For private mappings, we should verify that changes cannot be read() - back from the file, nor mmap's back from the file at a different - address. (There have been systems where private was not correctly - implemented like the infamous i386 svr4.0, and systems where the - VM page cache was not coherent with the file system buffer cache - like early versions of FreeBSD and possibly contemporary NetBSD.) - For shared mappings, we should conversely verify that changes get - propagated back to all the places they're supposed to be. - - Grep wants private fixed already mapped. - The main things grep needs to know about mmap are: - * does it exist and is it safe to write into the mmap'd area - * how to use it (BSD variants) */ - -#include -#include + case $build_os in + msdosdjgpp*) + # On DJGPP, this test can blow up pretty badly due to problems in libc + # (any single argument exceeding 2000 bytes causes a buffer overrun + # during glob expansion). Even if it were fixed, the result of this + # check would be larger than it should be. + lt_cv_sys_max_cmd_len=12288; # 12K is about right + ;; -#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H -char *malloc (); -#endif + gnu*) + # Under GNU Hurd, this test is not required because there is + # no limit to the length of command line arguments. + # Libtool will interpret -1 as no limit whatsoever + lt_cv_sys_max_cmd_len=-1; + ;; -/* This mess was copied from the GNU getpagesize.h. */ -#ifndef HAVE_GETPAGESIZE -# ifdef _SC_PAGESIZE -# define getpagesize() sysconf(_SC_PAGESIZE) -# else /* no _SC_PAGESIZE */ -# ifdef HAVE_SYS_PARAM_H -# include -# ifdef EXEC_PAGESIZE -# define getpagesize() EXEC_PAGESIZE -# else /* no EXEC_PAGESIZE */ -# ifdef NBPG -# define getpagesize() NBPG * CLSIZE -# ifndef CLSIZE -# define CLSIZE 1 -# endif /* no CLSIZE */ -# else /* no NBPG */ -# ifdef NBPC -# define getpagesize() NBPC -# else /* no NBPC */ -# ifdef PAGESIZE -# define getpagesize() PAGESIZE -# endif /* PAGESIZE */ -# endif /* no NBPC */ -# endif /* no NBPG */ -# endif /* no EXEC_PAGESIZE */ -# else /* no HAVE_SYS_PARAM_H */ -# define getpagesize() 8192 /* punt totally */ -# endif /* no HAVE_SYS_PARAM_H */ -# endif /* no _SC_PAGESIZE */ + cygwin* | mingw* | cegcc*) + # On Win9x/ME, this test blows up -- it succeeds, but takes + # about 5 minutes as the teststring grows exponentially. + # Worse, since 9x/ME are not pre-emptively multitasking, + # you end up with a "frozen" computer, even though with patience + # the test eventually succeeds (with a max line length of 256k). + # Instead, let's just punt: use the minimum linelength reported by + # all of the supported platforms: 8192 (on NT/2K/XP). + lt_cv_sys_max_cmd_len=8192; + ;; -#endif /* no HAVE_GETPAGESIZE */ + mint*) + # On MiNT this can take a long time and run out of memory. + lt_cv_sys_max_cmd_len=8192; + ;; -int -main () -{ - char *data, *data2, *data3; - const char *cdata2; - int i, pagesize; - int fd, fd2; + amigaos*) + # On AmigaOS with pdksh, this test takes hours, literally. + # So we just punt and use a minimum line length of 8192. + lt_cv_sys_max_cmd_len=8192; + ;; - pagesize = getpagesize (); + netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` + elif test -x /usr/sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` + else + lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs + fi + # And add a safety zone + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + ;; - /* First, make a file with some known garbage in it. */ - data = (char *) malloc (pagesize); - if (!data) - return 1; - for (i = 0; i < pagesize; ++i) - *(data + i) = rand (); - umask (0); - fd = creat ("conftest.mmap", 0600); - if (fd < 0) - return 2; - if (write (fd, data, pagesize) != pagesize) - return 3; - close (fd); + interix*) + # We know the value 262144 and hardcode it with a safety zone (like BSD) + lt_cv_sys_max_cmd_len=196608 + ;; - /* Next, check that the tail of a page is zero-filled. File must have - non-zero length, otherwise we risk SIGBUS for entire page. */ - fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600); - if (fd2 < 0) - return 4; - cdata2 = ""; - if (write (fd2, cdata2, 1) != 1) - return 5; - data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L); - if (data2 == MAP_FAILED) - return 6; - for (i = 0; i < pagesize; ++i) - if (*(data2 + i)) - return 7; - close (fd2); - if (munmap (data2, pagesize)) - return 8; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; - /* Next, try to mmap the file at a fixed address which already has - something else allocated at it. If we can, also make sure that - we see the same garbage. */ - fd = open ("conftest.mmap", O_RDWR); - if (fd < 0) - return 9; - if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_FIXED, fd, 0L)) - return 10; - for (i = 0; i < pagesize; ++i) - if (*(data + i) != *(data2 + i)) - return 11; + osf*) + # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure + # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not + # nice to cause kernel panics so lets avoid the loop below. + # First set a reasonable default. + lt_cv_sys_max_cmd_len=16384 + # + if test -x /sbin/sysconfig; then + case `/sbin/sysconfig -q proc exec_disable_arg_limit` in + *1*) lt_cv_sys_max_cmd_len=-1 ;; + esac + fi + ;; + sco3.2v5*) + lt_cv_sys_max_cmd_len=102400 + ;; + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` + else + lt_cv_sys_max_cmd_len=32768 + fi + ;; + *) + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + else + # Make teststring a little bigger before we do anything with it. + # a 1K string should be a reasonable start. + for i in 1 2 3 4 5 6 7 8 ; do + teststring=$teststring$teststring + done + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + # If test is not a shell built-in, we'll probably end up computing a + # maximum length that is only half of the actual maximum length, but + # we can't tell. + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + = "X$teststring$teststring"; } >/dev/null 2>&1 && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done + # Only check the string length outside the loop. + lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` + teststring= + # Add a significant safety factor because C++ compilers can tack on + # massive amounts of additional arguments before passing them to the + # linker. It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + fi + ;; + esac - /* Finally, make sure that changes to the mapped area do not - percolate back to the file as seen by read(). (This is a bug on - some variants of i386 svr4.0.) */ - for (i = 0; i < pagesize; ++i) - *(data2 + i) = *(data2 + i) + 1; - data3 = (char *) malloc (pagesize); - if (!data3) - return 12; - if (read (fd, data3, pagesize) != pagesize) - return 13; - for (i = 0; i < pagesize; ++i) - if (*(data + i) != *(data3 + i)) - return 14; - close (fd); - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_func_mmap_fixed_mapped=yes -else - ac_cv_func_mmap_fixed_mapped=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext fi +if test -n $lt_cv_sys_max_cmd_len ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 +$as_echo "$lt_cv_sys_max_cmd_len" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 +$as_echo "none" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_fixed_mapped" >&5 -$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; } -if test $ac_cv_func_mmap_fixed_mapped = yes; then +max_cmd_len=$lt_cv_sys_max_cmd_len -$as_echo "#define HAVE_MMAP 1" >>confdefs.h -fi -rm -f conftest.mmap conftest.txt -fi -if test "x${enable_mmap}" = "xno" \ - -o "$ac_cv_func_mmap_fixed_mapped" != "yes"; then - FTSYS_SRC='$(BASE_DIR)/ftsystem.c' -else - FTSYS_SRC='$(BUILD_DIR)/ftsystem.c' - ac_fn_c_check_decl "$LINENO" "munmap" "ac_cv_have_decl_munmap" " -#ifdef HAVE_UNISTD_H -#include -#endif -#include +: ${CP="cp -f"} +: ${MV="mv -f"} +: ${RM="rm -f"} -" -if test "x$ac_cv_have_decl_munmap" = xyes; then : - ac_have_decl=1 -else - ac_have_decl=0 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 +$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } +# Try some XSI features +xsi_shell=no +( _lt_dummy="a/b/c" + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ + = c,a/b,b/c, \ + && eval 'test $(( 1 + 1 )) -eq 2 \ + && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ + && xsi_shell=yes +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 +$as_echo "$xsi_shell" >&6; } + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 +$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } +lt_shell_append=no +( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ + >/dev/null 2>&1 \ + && lt_shell_append=yes +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 +$as_echo "$lt_shell_append" >&6; } + + +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + lt_unset=unset +else + lt_unset=false fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_MUNMAP $ac_have_decl -_ACEOF - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for munmap's first parameter type" >&5 -$as_echo_n "checking for munmap's first parameter type... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ +# test EBCDIC or ASCII +case `echo X|tr X '\101'` in + A) # ASCII based system + # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr + lt_SP2NL='tr \040 \012' + lt_NL2SP='tr \015\012 \040\040' + ;; + *) # EBCDIC based system + lt_SP2NL='tr \100 \n' + lt_NL2SP='tr \r\n \100\100' + ;; +esac -#include -#include -int munmap(void *, size_t); -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: void *" >&5 -$as_echo "void *" >&6; } -$as_echo "#define MUNMAP_USES_VOIDP /**/" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: char *" >&5 -$as_echo "char *" >&6; } -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -for ac_func in memcpy memmove -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } +if ${lt_cv_to_host_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 + ;; + esac + ;; + *-*-cygwin* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin + ;; + esac + ;; + * ) # unhandled hosts (and "normal" native builds) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; +esac fi -done +to_host_file_cmd=$lt_cv_to_host_file_cmd +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 +$as_echo "$lt_cv_to_host_file_cmd" >&6; } -# check for system zlib -# don't quote AS_HELP_STRING! -# Check whether --with-zlib was given. -if test "${with_zlib+set}" = set; then : - withval=$with_zlib; -fi -if test x$with_zlib != xno && test -z "$LIBZ"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzsetparams in -lz" >&5 -$as_echo_n "checking for gzsetparams in -lz... " >&6; } -if ${ac_cv_lib_z_gzsetparams+:} false; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } +if ${lt_cv_to_tool_file_cmd+:} false; then : $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lz $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + #assume ordinary cross tools, or native build. +lt_cv_to_tool_file_cmd=func_convert_file_noop +case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 + ;; + esac + ;; +esac -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char gzsetparams (); -int -main () -{ -return gzsetparams (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_z_gzsetparams=yes -else - ac_cv_lib_z_gzsetparams=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_gzsetparams" >&5 -$as_echo "$ac_cv_lib_z_gzsetparams" >&6; } -if test "x$ac_cv_lib_z_gzsetparams" = xyes; then : - ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default" -if test "x$ac_cv_header_zlib_h" = xyes; then : - LIBZ='-lz' fi +to_tool_file_cmd=$lt_cv_to_tool_file_cmd +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -fi - -fi -if test x$with_zlib != xno && test -n "$LIBZ"; then - CFLAGS="$CFLAGS -DFT_CONFIG_OPTION_SYSTEM_ZLIB" - LDFLAGS="$LDFLAGS $LIBZ" - SYSTEM_ZLIB=yes -fi -# check for system libbz2 -# don't quote AS_HELP_STRING! -# Check whether --with-bzip2 was given. -if test "${with_bzip2+set}" = set; then : - withval=$with_bzip2; -fi -if test x$with_bzip2 != xno && test -z "$LIBBZ2"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZ2_bzDecompress in -lbz2" >&5 -$as_echo_n "checking for BZ2_bzDecompress in -lbz2... " >&6; } -if ${ac_cv_lib_bz2_BZ2_bzDecompress+:} false; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 +$as_echo_n "checking for $LD option to reload object files... " >&6; } +if ${lt_cv_ld_reload_flag+:} false; then : $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lbz2 $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char BZ2_bzDecompress (); -int -main () -{ -return BZ2_bzDecompress (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_bz2_BZ2_bzDecompress=yes -else - ac_cv_lib_bz2_BZ2_bzDecompress=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bz2_BZ2_bzDecompress" >&5 -$as_echo "$ac_cv_lib_bz2_BZ2_bzDecompress" >&6; } -if test "x$ac_cv_lib_bz2_BZ2_bzDecompress" = xyes; then : - ac_fn_c_check_header_mongrel "$LINENO" "bzlib.h" "ac_cv_header_bzlib_h" "$ac_includes_default" -if test "x$ac_cv_header_bzlib_h" = xyes; then : - LIBBZ2='-lbz2' + lt_cv_ld_reload_flag='-r' fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 +$as_echo "$lt_cv_ld_reload_flag" >&6; } +reload_flag=$lt_cv_ld_reload_flag +case $reload_flag in +"" | " "*) ;; +*) reload_flag=" $reload_flag" ;; +esac +reload_cmds='$LD$reload_flag -o $output$reload_objs' +case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + if test "$GCC" != yes; then + reload_cmds=false + fi + ;; + darwin*) + if test "$GCC" = yes; then + reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' + else + reload_cmds='$LD$reload_flag -o $output$reload_objs' + fi + ;; +esac -fi -fi -if test x$with_bzip2 != xno && test -n "$LIBBZ2"; then - CFLAGS="$CFLAGS -DFT_CONFIG_OPTION_USE_BZIP2" - LDFLAGS="$LDFLAGS $LIBBZ2" -fi -# Some options handling SDKs/archs in CFLAGS should be copied -# to LDFLAGS. Apple TechNote 2137 recommends to include these -# options in CFLAGS but not in LDFLAGS. -save_config_args=$* -set dummy ${CFLAGS} -i=1 -while test $i -le $# -do - c=$1 - case "${c}" in - -isysroot|-arch) # options taking 1 argument - a=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether CFLAGS and LDFLAGS share ${c} ${a}" >&5 -$as_echo_n "checking whether CFLAGS and LDFLAGS share ${c} ${a}... " >&6; } - if expr " ${LDFLAGS} " : ".* ${c} *${a}.*" > /dev/null - then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, copy to LDFLAGS" >&5 -$as_echo "no, copy to LDFLAGS" >&6; } - LDFLAGS="${LDFLAGS} ${c} ${a}" - fi - shift 1 - ;; - -m32|-m64|-march=*|-mcpu=*) # options taking no argument - { $as_echo "$as_me:${as_lineno-$LINENO}: result: whether CFLAGS and LDFLAGS share ${c}" >&5 -$as_echo "whether CFLAGS and LDFLAGS share ${c}" >&6; } - if expr " ${LDFLAGS} " : ".* ${c} *${a}.*" > /dev/null - then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, copy to LDFLAGS" >&5 -$as_echo "no, copy to LDFLAGS" >&6; } - LDFLAGS="${LDFLAGS} ${c}" - fi - ;; - # *) - # AC_MSG_RESULT([${c} is not copied to LDFLAGS]) - # ;; - esac - shift 1 -done -set ${save_config_args} -# Whether to use Mac OS resource-based fonts. +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. +set dummy ${ac_tool_prefix}objdump; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_OBJDUMP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$OBJDUMP"; then + ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS -ftmac_c="" # src/base/ftmac.c should not be included in makefiles by default +fi +fi +OBJDUMP=$ac_cv_prog_OBJDUMP +if test -n "$OBJDUMP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 +$as_echo "$OBJDUMP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -# don't quote AS_HELP_STRING! -# Check whether --with-old-mac-fonts was given. -if test "${with_old_mac_fonts+set}" = set; then : - withval=$with_old_mac_fonts; fi +if test -z "$ac_cv_prog_OBJDUMP"; then + ac_ct_OBJDUMP=$OBJDUMP + # Extract the first word of "objdump", so it can be a program name with args. +set dummy objdump; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_OBJDUMP"; then + ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_OBJDUMP="objdump" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS -if test x$with_old_mac_fonts = xyes; then - orig_LDFLAGS="${LDFLAGS}" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking CoreServices & ApplicationServices of Mac OS X" >&5 -$as_echo_n "checking CoreServices & ApplicationServices of Mac OS X... " >&6; } - FT2_EXTRA_LIBS="-Wl,-framework,CoreServices -Wl,-framework,ApplicationServices" - LDFLAGS="$LDFLAGS $FT2_EXTRA_LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ +fi +fi +ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP +if test -n "$ac_ct_OBJDUMP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 +$as_echo "$ac_ct_OBJDUMP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + if test "x$ac_ct_OBJDUMP" = x; then + OBJDUMP="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + OBJDUMP=$ac_ct_OBJDUMP + fi +else + OBJDUMP="$ac_cv_prog_OBJDUMP" +fi +test -z "$OBJDUMP" && OBJDUMP=objdump -#if defined(__GNUC__) && defined(__APPLE_CC__) -# include -# include -#else -# include -# include -#endif -int -main () -{ - short res = 0; +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 +$as_echo_n "checking how to recognize dependent libraries... " >&6; } +if ${lt_cv_deplibs_check_method+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_file_magic_cmd='$MAGIC_CMD' +lt_cv_file_magic_test_file= +lt_cv_deplibs_check_method='unknown' +# Need to set the preceding variable on all platforms that support +# interlibrary dependencies. +# 'none' -- dependencies not supported. +# `unknown' -- same as none, but documents that we really don't know. +# 'pass_all' -- all dependencies passed with no checks. +# 'test_compile' -- check by making test program. +# 'file_magic [[regex]]' -- check by looking for files in library path +# which responds to the $file_magic_cmd with a given extended regex. +# If you have `file' or equivalent on your system and you're not sure +# whether `pass_all' will *always* work, you probably want this one. - UseResFile( res ); +case $host_os in +aix[4-9]*) + lt_cv_deplibs_check_method=pass_all + ;; +beos*) + lt_cv_deplibs_check_method=pass_all + ;; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -$as_echo "ok" >&6; } - ftmac_c='ftmac.c' - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether OS_INLINE macro is ANSI compatible" >&5 -$as_echo_n "checking whether OS_INLINE macro is ANSI compatible... " >&6; } - orig_CFLAGS="$CFLAGS -DFT_MACINTOSH" - CFLAGS="$CFLAGS $XX_CFLAGS $XX_ANSIFLAGS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ +bsdi[45]*) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' + lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_test_file=/shlib/libc.so + ;; +cygwin*) + # func_win32_libid is a shell function defined in ltmain.sh + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + ;; +mingw* | pw32*) + # Base MSYS/MinGW do not provide the 'file' command needed by + # func_win32_libid shell function, so use a weaker test based on 'objdump', + # unless we find 'file', for example because we are cross-compiling. + # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. + if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else + # Keep this pattern in sync with the one in func_win32_libid. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi + ;; -#if defined(__GNUC__) && defined(__APPLE_CC__) -# include -# include -#else -# include -# include -#endif +cegcc*) + # use the weaker test based on 'objdump'. See mingw*. + lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + ;; +darwin* | rhapsody*) + lt_cv_deplibs_check_method=pass_all + ;; -int -main () -{ +freebsd* | dragonfly*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) + # Not sure whether the presence of OpenBSD here was a mistake. + # Let's accept both of them until this is cleared up. + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + ;; + esac + else + lt_cv_deplibs_check_method=pass_all + fi + ;; +haiku*) + lt_cv_deplibs_check_method=pass_all + ;; - /* OSHostByteOrder() is typed as OS_INLINE */ - int32_t os_byte_order = OSHostByteOrder(); +hpux10.20* | hpux11*) + lt_cv_file_magic_cmd=/usr/bin/file + case $host_cpu in + ia64*) + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' + lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so + ;; + hppa*64*) + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]' + lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl + ;; + *) + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library' + lt_cv_file_magic_test_file=/usr/lib/libc.sl + ;; + esac + ;; +interix[3-9]*) + # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' + ;; - if ( OSBigEndian != os_byte_order ) - return 1; - - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -$as_echo "ok" >&6; } - CFLAGS="$orig_CFLAGS" - CFLAGS="$CFLAGS -DHAVE_ANSI_OS_INLINE=1" - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, ANSI incompatible" >&5 -$as_echo "no, ANSI incompatible" >&6; } - CFLAGS="$orig_CFLAGS" - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:${as_lineno-$LINENO}: checking type ResourceIndex" >&5 -$as_echo_n "checking type ResourceIndex... " >&6; } - orig_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $XX_CFLAGS $XX_ANSIFLAGS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - +irix5* | irix6* | nonstopux*) + case $LD in + *-32|*"-32 ") libmagic=32-bit;; + *-n32|*"-n32 ") libmagic=N32;; + *-64|*"-64 ") libmagic=64-bit;; + *) libmagic=never-match;; + esac + lt_cv_deplibs_check_method=pass_all + ;; +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + lt_cv_deplibs_check_method=pass_all + ;; -#if defined(__GNUC__) && defined(__APPLE_CC__) -# include -# include -#else -# include -# include -# include -#endif +netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' + fi + ;; +newos6*) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=/usr/lib/libnls.so + ;; -int -main () -{ +*nto* | *qnx*) + lt_cv_deplibs_check_method=pass_all + ;; +openbsd*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + fi + ;; - ResourceIndex i = 0; - return i; +osf3* | osf4* | osf5*) + lt_cv_deplibs_check_method=pass_all + ;; +rdos*) + lt_cv_deplibs_check_method=pass_all + ;; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -$as_echo "ok" >&6; } - CFLAGS="$orig_CFLAGS" - CFLAGS="$CFLAGS -DHAVE_TYPE_RESOURCE_INDEX=1" +solaris*) + lt_cv_deplibs_check_method=pass_all + ;; -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - CFLAGS="$orig_CFLAGS" - CFLAGS="$CFLAGS -DHAVE_TYPE_RESOURCE_INDEX=0" +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + lt_cv_deplibs_check_method=pass_all + ;; -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } - FT2_EXTRA_LIBS="" - LDFLAGS="${orig_LDFLAGS}" - CFLAGS="$CFLAGS -DDARWIN_NO_CARBON" -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -else - case x$host_os in - xdarwin*) - CFLAGS="$CFLAGS -DDARWIN_NO_CARBON" +sysv4 | sysv4.3*) + case $host_vendor in + motorola) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` ;; - *) + ncr) + lt_cv_deplibs_check_method=pass_all + ;; + sequent) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' + ;; + sni) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" + lt_cv_file_magic_test_file=/lib/libc.so + ;; + siemens) + lt_cv_deplibs_check_method=pass_all + ;; + pc) + lt_cv_deplibs_check_method=pass_all ;; esac -fi - - -# Whether to use FileManager which is deprecated since Mac OS X 10.4. + ;; +tpf*) + lt_cv_deplibs_check_method=pass_all + ;; +esac -# Check whether --with-fsspec was given. -if test "${with_fsspec+set}" = set; then : - withval=$with_fsspec; fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 +$as_echo "$lt_cv_deplibs_check_method" >&6; } -if test x$with_fsspec = xno; then - CFLAGS="$CFLAGS -DHAVE_FSSPEC=0" -elif test x$with_old_mac_fonts = xyes -a x$with_fsspec != x; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking FSSpec-based FileManager" >&5 -$as_echo_n "checking FSSpec-based FileManager... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - +file_magic_glob= +want_nocaseglob=no +if test "$build" = "$host"; then + case $host_os in + mingw* | pw32*) + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then + want_nocaseglob=yes + else + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` + fi + ;; + esac +fi -#if defined(__GNUC__) && defined(__APPLE_CC__) -# include -# include -#else -# include -# include -#endif +file_magic_cmd=$lt_cv_file_magic_cmd +deplibs_check_method=$lt_cv_deplibs_check_method +test -z "$deplibs_check_method" && deplibs_check_method=unknown -int -main () -{ - FCBPBPtr paramBlock; - short vRefNum; - long dirID; - ConstStr255Param fileName; - FSSpec* spec; - /* FSSpec functions: deprecated since Mac OS X 10.4 */ - PBGetFCBInfoSync( paramBlock ); - FSMakeFSSpec( vRefNum, dirID, fileName, spec ); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -$as_echo "ok" >&6; } - CFLAGS="$CFLAGS -DHAVE_FSSPEC=1" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } - CFLAGS="$CFLAGS -DHAVE_FSSPEC=0" -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -# Whether to use FileManager in Carbon since MacOS 9.x. -# Check whether --with-fsref was given. -if test "${with_fsref+set}" = set; then : - withval=$with_fsref; -fi -if test x$with_fsref = xno; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: -*** WARNING - FreeType2 built without FSRef API cannot load - data-fork fonts on MacOS, except of XXX.dfont. - " >&5 -$as_echo "$as_me: WARNING: -*** WARNING - FreeType2 built without FSRef API cannot load - data-fork fonts on MacOS, except of XXX.dfont. - " >&2;} - CFLAGS="$CFLAGS -DHAVE_FSREF=0" -elif test x$with_old_mac_fonts = xyes -a x$with_fsref != x; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking FSRef-based FileManager" >&5 -$as_echo_n "checking FSRef-based FileManager... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#if defined(__GNUC__) && defined(__APPLE_CC__) -# include -# include -#else -# include -# include -#endif -int -main () -{ - short vRefNum; - long dirID; - ConstStr255Param fileName; - Boolean* isDirectory; - UInt8* path; - SInt16 desiredRefNum; - SInt16* iterator; - SInt16* actualRefNum; - HFSUniStr255* outForkName; - FSVolumeRefNum volume; - FSCatalogInfoBitmap whichInfo; - FSCatalogInfo* catalogInfo; - FSForkInfo* forkInfo; - FSRef* ref; -#if HAVE_FSSPEC - FSSpec* spec; -#endif - - /* FSRef functions: no need to check? */ - FSGetForkCBInfo( desiredRefNum, volume, iterator, - actualRefNum, forkInfo, ref, - outForkName ); - FSPathMakeRef( path, ref, isDirectory ); - -#if HAVE_FSSPEC - FSpMakeFSRef ( spec, ref ); - FSGetCatalogInfo( ref, whichInfo, catalogInfo, - outForkName, spec, ref ); -#endif - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -$as_echo "ok" >&6; } - CFLAGS="$CFLAGS -DHAVE_FSREF=1" +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } - CFLAGS="$CFLAGS -DHAVE_FSREF=0" + if test -n "$DLLTOOL"; then + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext fi - - -# Whether to use QuickDraw API in ToolBox which is deprecated since -# Mac OS X 10.4. - - -# Check whether --with-quickdraw-toolbox was given. -if test "${with_quickdraw_toolbox+set}" = set; then : - withval=$with_quickdraw_toolbox; +DLLTOOL=$ac_cv_prog_DLLTOOL +if test -n "$DLLTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 +$as_echo "$DLLTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -if test x$with_quickdraw_toolbox = xno; then - CFLAGS="$CFLAGS -DHAVE_QUICKDRAW_TOOLBOX=0" -elif test x$with_old_mac_fonts = xyes -a x$with_quickdraw_toolbox != x; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking QuickDraw FontManager functions in ToolBox" >&5 -$as_echo_n "checking QuickDraw FontManager functions in ToolBox... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ +fi +if test -z "$ac_cv_prog_DLLTOOL"; then + ac_ct_DLLTOOL=$DLLTOOL + # Extract the first word of "dlltool", so it can be a program name with args. +set dummy dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DLLTOOL"; then + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DLLTOOL="dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS +fi +fi +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL +if test -n "$ac_ct_DLLTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 +$as_echo "$ac_ct_DLLTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -#if defined(__GNUC__) && defined(__APPLE_CC__) -# include -# include -#else -# include -# include -#endif + if test "x$ac_ct_DLLTOOL" = x; then + DLLTOOL="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DLLTOOL=$ac_ct_DLLTOOL + fi +else + DLLTOOL="$ac_cv_prog_DLLTOOL" +fi +test -z "$DLLTOOL" && DLLTOOL=dlltool -int -main () -{ - Str255 familyName; - SInt16 familyID = 0; - FMInput* fmIn = NULL; - FMOutput* fmOut = NULL; - GetFontName( familyID, familyName ); - GetFNum( familyName, &familyID ); - fmOut = FMSwapFont( fmIn ); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -$as_echo "ok" >&6; } - CFLAGS="$CFLAGS -DHAVE_QUICKDRAW_TOOLBOX=1" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : + $as_echo_n "(cached) " >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } - CFLAGS="$CFLAGS -DHAVE_QUICKDRAW_TOOLBOX=0" -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi - - -# Whether to use QuickDraw API in Carbon which is deprecated since -# Mac OS X 10.4. + lt_cv_sharedlib_from_linklib_cmd='unknown' +case $host_os in +cygwin* | mingw* | pw32* | cegcc*) + # two different shell functions defined in ltmain.sh + # decide which to use based on capabilities of $DLLTOOL + case `$DLLTOOL --help 2>&1` in + *--identify-strict*) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib + ;; + *) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback + ;; + esac + ;; +*) + # fallback: assume linklib IS sharedlib + lt_cv_sharedlib_from_linklib_cmd="$ECHO" + ;; +esac -# Check whether --with-quickdraw-carbon was given. -if test "${with_quickdraw_carbon+set}" = set; then : - withval=$with_quickdraw_carbon; fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -if test x$with_quickdraw_carbon = xno; then - CFLAGS="$CFLAGS -DHAVE_QUICKDRAW_CARBON=0" -elif test x$with_old_mac_fonts = xyes -a x$with_quickdraw_carbon != x; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking QuickDraw FontManager functions in Carbon" >&5 -$as_echo_n "checking QuickDraw FontManager functions in Carbon... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#if defined(__GNUC__) && defined(__APPLE_CC__) -# include -# include -#else -# include -# include -#endif -int -main () -{ - FMFontFamilyIterator famIter; - FMFontFamily family; - Str255 famNameStr; - FMFontFamilyInstanceIterator instIter; - FMFontStyle style; - FMFontSize size; - FMFont font; - FSSpec* pathSpec; +if test -n "$ac_tool_prefix"; then + for ac_prog in ar + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS +fi +fi +AR=$ac_cv_prog_AR +if test -n "$AR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +$as_echo "$AR" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi - FMCreateFontFamilyIterator( NULL, NULL, kFMUseGlobalScopeOption, - &famIter ); - FMGetNextFontFamily( &famIter, &family ); - FMGetFontFamilyName( family, famNameStr ); - FMCreateFontFamilyInstanceIterator( family, &instIter ); - FMGetNextFontFamilyInstance( &instIter, &font, &style, &size ); - FMDisposeFontFamilyInstanceIterator( &instIter ); - FMDisposeFontFamilyIterator( &famIter ); - FMGetFontContainer( font, pathSpec ); - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -$as_echo "ok" >&6; } - CFLAGS="$CFLAGS -DHAVE_QUICKDRAW_CARBON=1" + test -n "$AR" && break + done +fi +if test -z "$AR"; then + ac_ct_AR=$AR + for ac_prog in ar +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_AR+:} false; then : + $as_echo_n "(cached) " >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } - CFLAGS="$CFLAGS -DHAVE_QUICKDRAW_CARBON=0" + if test -n "$ac_ct_AR"; then + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_AR="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +fi +ac_ct_AR=$ac_cv_prog_ac_ct_AR +if test -n "$ac_ct_AR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +$as_echo "$ac_ct_AR" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -# Whether to use AppleTypeService since Mac OS X. - -# don't quote AS_HELP_STRING! + test -n "$ac_ct_AR" && break +done -# Check whether --with-ats was given. -if test "${with_ats+set}" = set; then : - withval=$with_ats; + if test "x$ac_ct_AR" = x; then + AR="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + AR=$ac_ct_AR + fi fi -if test x$with_ats = xno; then - CFLAGS="$CFLAGS -DHAVE_ATS=0" -elif test x$with_old_mac_fonts = xyes -a x$with_ats != x; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking AppleTypeService functions" >&5 -$as_echo_n "checking AppleTypeService functions... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ +: ${AR=ar} +: ${AR_FLAGS=cru} -#if defined(__GNUC__) && defined(__APPLE_CC__) -# include -# include -#else -# include -# include -#endif -int -main () -{ - FSSpec* pathSpec; - ATSFontFindFromName( NULL, kATSOptionFlagsUnRestrictedScope ); -#if HAVE_FSSPEC - ATSFontGetFileSpecification( 0, pathSpec ); -#endif +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } +if ${lt_cv_ar_at_file+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ar_at_file=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -$as_echo "ok" >&6; } - CFLAGS="$CFLAGS -DHAVE_ATS=1" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } - CFLAGS="$CFLAGS -DHAVE_ATS=0" -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi - -case "$CFLAGS" in - *HAVE_FSSPEC* | *HAVE_FSREF* | *HAVE_QUICKDRAW* | *HAVE_ATS* ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: -*** WARNING - FSSpec/FSRef/QuickDraw/ATS options are explicitly given, - thus it is recommended to replace src/base/ftmac.c by builds/mac/ftmac.c. - " >&5 -$as_echo "$as_me: WARNING: -*** WARNING - FSSpec/FSRef/QuickDraw/ATS options are explicitly given, - thus it is recommended to replace src/base/ftmac.c by builds/mac/ftmac.c. - " >&2;} - CFLAGS="$CFLAGS "'-I$(TOP_DIR)/builds/mac/' - ;; - *) - ;; -esac - - - - - - - +if ac_fn_c_try_compile "$LINENO"; then : + echo conftest.$ac_objext > conftest.lst + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 + (eval $lt_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test "$ac_status" -eq 0; then + # Ensure the archiver fails upon bogus file names. + rm -f conftest.$ac_objext libconftest.a + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 + (eval $lt_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test "$ac_status" -ne 0; then + lt_cv_ar_at_file=@ + fi + fi + rm -f conftest.* libconftest.a +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +$as_echo "$lt_cv_ar_at_file" >&6; } +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi -case `pwd` in - *\ * | *\ *) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 -$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; -esac -macro_version='2.4.2' -macro_revision='1.3337' +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS +fi +fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +fi +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_STRIP="strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS +fi +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi +else + STRIP="$ac_cv_prog_STRIP" +fi +test -z "$STRIP" && STRIP=: -ltmain="$ac_aux_dir/ltmain.sh" -# Backslashify metacharacters that are still active within -# double-quoted strings. -sed_quote_subst='s/\(["`$\\]\)/\\\1/g' -# Same as above, but do not quote variable references. -double_quote_subst='s/\(["`\\]\)/\\\1/g' +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. +set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' +fi +fi +RANLIB=$ac_cv_prog_RANLIB +if test -n "$RANLIB"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +$as_echo "$RANLIB" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -# Sed substitution to delay expansion of an escaped single quote. -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' +fi +if test -z "$ac_cv_prog_RANLIB"; then + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. +set dummy ranlib; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_RANLIB"; then + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_RANLIB="ranlib" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS -ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +fi +fi +ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB +if test -n "$ac_ct_RANLIB"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +$as_echo "$ac_ct_RANLIB" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 -$as_echo_n "checking how to print strings... " >&6; } -# Test print first, because it will be a builtin if present. -if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' -elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='printf %s\n' + if test "x$ac_ct_RANLIB" = x; then + RANLIB=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + RANLIB=$ac_ct_RANLIB + fi else - # Use this function as a fallback that always works. - func_fallback_echo () - { - eval 'cat <<_LTECHO_EOF -$1 -_LTECHO_EOF' - } - ECHO='func_fallback_echo' + RANLIB="$ac_cv_prog_RANLIB" fi -# func_echo_all arg... -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "" -} +test -z "$RANLIB" && RANLIB=: -case "$ECHO" in - printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 -$as_echo "printf" >&6; } ;; - print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 -$as_echo "print -r" >&6; } ;; - *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 -$as_echo "cat" >&6; } ;; -esac +# Determine commands to create old-style static archives. +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' +old_postinstall_cmds='chmod 644 $oldlib' +old_postuninstall_cmds= +if test -n "$RANLIB"; then + case $host_os in + openbsd*) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" + ;; + *) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" + ;; + esac + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" +fi +case $host_os in + darwin*) + lock_old_archive_extraction=yes ;; + *) + lock_old_archive_extraction=no ;; +esac @@ -5410,77 +5556,9 @@ esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 -$as_echo_n "checking for a sed that does not truncate output... " >&6; } -if ${ac_cv_path_SED+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ - for ac_i in 1 2 3 4 5 6 7; do - ac_script="$ac_script$as_nl$ac_script" - done - echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed - { ac_script=; unset ac_script;} - if test -z "$SED"; then - ac_path_SED_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue -# Check for GNU ac_path_SED and select it if it is found. - # Check for GNU $ac_path_SED -case `"$ac_path_SED" --version 2>&1` in -*GNU*) - ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo '' >> "conftest.nl" - "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_SED_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_SED="$ac_path_SED" - ac_path_SED_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - $ac_path_SED_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_SED"; then - as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 - fi -else - ac_cv_path_SED=$SED -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 -$as_echo "$ac_cv_path_SED" >&6; } - SED="$ac_cv_path_SED" - rm -f conftest.sed -test -z "$SED" && SED=sed -Xsed="$SED -e 1s/^X//" @@ -5492,74 +5570,48 @@ Xsed="$SED -e 1s/^X//" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 -$as_echo_n "checking for fgrep... " >&6; } -if ${ac_cv_path_FGREP+:} false; then : +for ac_prog in gawk mawk nawk awk +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AWK+:} false; then : $as_echo_n "(cached) " >&6 else - if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 - then ac_cv_path_FGREP="$GREP -F" - else - if test -z "$FGREP"; then - ac_path_FGREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in fgrep; do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue -# Check for GNU ac_path_FGREP and select it if it is found. - # Check for GNU $ac_path_FGREP -case `"$ac_path_FGREP" --version 2>&1` in -*GNU*) - ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'FGREP' >> "conftest.nl" - "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_FGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_FGREP="$ac_path_FGREP" - ac_path_FGREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_FGREP_found && break 3 - done - done + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AWK="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done IFS=$as_save_IFS - if test -z "$ac_cv_path_FGREP"; then - as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi + +fi +fi +AWK=$ac_cv_prog_AWK +if test -n "$AWK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +$as_echo "$AWK" >&6; } else - ac_cv_path_FGREP=$FGREP + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 -$as_echo "$ac_cv_path_FGREP" >&6; } - FGREP="$ac_cv_path_FGREP" + test -n "$AWK" && break +done -test -z "$GREP" && GREP=grep @@ -5578,656 +5630,557 @@ test -z "$GREP" && GREP=grep +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} -# Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then : - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes -else - with_gnu_ld=no -fi +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 -$as_echo_n "checking for ld used by $CC... " >&6; } - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [\\/]* | ?:[\\/]*) - re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the pathname of ld - ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` - while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do - ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 -$as_echo_n "checking for GNU ld... " >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 -$as_echo_n "checking for non-GNU ld... " >&6; } -fi -if ${lt_cv_path_LD+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 &5 -$as_echo "$LD" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi -test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 -$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if ${lt_cv_prog_gnu_ld+:} false; then : + +# Check for command to grab the raw symbol name followed by C symbol from nm. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 +$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } +if ${lt_cv_sys_global_symbol_pipe+:} false; then : $as_echo_n "(cached) " >&6 else - # I'd rather use --version here, but apparently some GNU lds only accept -v. -case `$LD -v 2>&1 &5 -$as_echo "$lt_cv_prog_gnu_ld" >&6; } -with_gnu_ld=$lt_cv_prog_gnu_ld +# If we're using GNU nm, then use its standard symbol codes. +case `$NM -V 2>&1` in +*GNU* | *'with BFD'*) + symcode='[ABCDGIRSTW]' ;; +esac +# Transform an extracted symbol line into a proper C declaration. +# Some systems (esp. on ia64) link data and code symbols differently, +# so use this general approach. +lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +# Transform an extracted symbol line into symbol name and symbol address +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +# Handle CRLF in mingw tool chain +opt_cr= +case $build_os in +mingw*) + opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp + ;; +esac +# Try without a prefix underscore, then with it. +for ac_symprfx in "" "_"; do + # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. + symxfrm="\\1 $ac_symprfx\\2 \\2" + # Write the raw and C identifiers. + if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Fake it for dumpbin and say T for any non-static function + # and D for any global variable. + # Also find C++ and __fastcall symbols from MSVC++, + # which start with @ or ?. + lt_cv_sys_global_symbol_pipe="$AWK '"\ +" {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ +" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" \$ 0!~/External *\|/{next};"\ +" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ +" {if(hide[section]) next};"\ +" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ +" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ +" s[1]~/^[@?]/{print s[1], s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +" ' prfx=^$ac_symprfx" + else + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + fi + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + # Check to see that the pipe works correctly. + pipe_works=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 -$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } -if ${lt_cv_path_NM+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$NM"; then - # Let the user override the test. - lt_cv_path_NM="$NM" -else - lt_nm_to_check="${ac_tool_prefix}nm" - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then - lt_nm_to_check="$lt_nm_to_check nm" - fi - for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" - break - ;; - *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */dev/null*) - lt_cv_path_NM="$tmp_nm -p" - break - ;; - *) - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags - ;; - esac - ;; - esac + rm -f conftest* + cat > conftest.$ac_ext <<_LT_EOF +#ifdef __cplusplus +extern "C" { +#endif +char nm_test_var; +void nm_test_func(void); +void nm_test_func(void){} +#ifdef __cplusplus +} +#endif +int main(){nm_test_var='a';nm_test_func();return(0);} +_LT_EOF + + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + # Now try to grab the symbols. + nlist=conftest.nm + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 + (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s "$nlist"; then + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then + mv -f "$nlist"T "$nlist" + else + rm -f "$nlist"T fi - done - IFS="$lt_save_ifs" - done - : ${lt_cv_path_NM=no} -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 -$as_echo "$lt_cv_path_NM" >&6; } -if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" -else - # Didn't find any BSD compatible name lister, look for dumpbin. - if test -n "$DUMPBIN"; then : - # Let the user override the test. + + # Make sure that we snagged all the symbols we need. + if $GREP ' nm_test_var$' "$nlist" >/dev/null; then + if $GREP ' nm_test_func$' "$nlist" >/dev/null; then + cat <<_LT_EOF > conftest.$ac_ext +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) +/* DATA imports from DLLs on WIN32 con't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT_DLSYM_CONST +#elif defined(__osf__) +/* This system does not cope well with relocations in const data. */ +# define LT_DLSYM_CONST +#else +# define LT_DLSYM_CONST const +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +_LT_EOF + # Now generate the symbol file. + eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' + + cat <<_LT_EOF >> conftest.$ac_ext + +/* The mapping between symbol names and symbols. */ +LT_DLSYM_CONST struct { + const char *name; + void *address; +} +lt__PROGRAM__LTX_preloaded_symbols[] = +{ + { "@PROGRAM@", (void *) 0 }, +_LT_EOF + $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + cat <<\_LT_EOF >> conftest.$ac_ext + {0, (void *) 0} +}; + +/* This works around a problem in FreeBSD linker */ +#ifdef FREEBSD_WORKAROUND +static const void *lt_preloaded_setup() { + return lt__PROGRAM__LTX_preloaded_symbols; +} +#endif + +#ifdef __cplusplus +} +#endif +_LT_EOF + # Now try linking the two files. + mv conftest.$ac_objext conftstm.$ac_objext + lt_globsym_save_LIBS=$LIBS + lt_globsym_save_CFLAGS=$CFLAGS + LIBS="conftstm.$ac_objext" + CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext}; then + pipe_works=yes + fi + LIBS=$lt_globsym_save_LIBS + CFLAGS=$lt_globsym_save_CFLAGS + else + echo "cannot find nm_test_func in $nlist" >&5 + fi + else + echo "cannot find nm_test_var in $nlist" >&5 + fi + else + echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5 + fi else - if test -n "$ac_tool_prefix"; then - for ac_prog in dumpbin "link -dump" - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DUMPBIN+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$DUMPBIN"; then - ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 + echo "$progname: failed program was:" >&5 + cat conftest.$ac_ext >&5 + fi + rm -rf conftest* conftst* + + # Do not use the global_symbol_pipe unless it works. + if test "$pipe_works" = yes; then + break + else + lt_cv_sys_global_symbol_pipe= fi done - done -IFS=$as_save_IFS fi + +if test -z "$lt_cv_sys_global_symbol_pipe"; then + lt_cv_sys_global_symbol_to_cdecl= fi -DUMPBIN=$ac_cv_prog_DUMPBIN -if test -n "$DUMPBIN"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 -$as_echo "$DUMPBIN" >&6; } +if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 +$as_echo "failed" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } fi - - test -n "$DUMPBIN" && break - done +# Response file support. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + nm_file_list_spec='@' +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then + nm_file_list_spec='@' fi -if test -z "$DUMPBIN"; then - ac_ct_DUMPBIN=$DUMPBIN - for ac_prog in dumpbin "link -dump" -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_DUMPBIN"; then - ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN -if test -n "$ac_ct_DUMPBIN"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 -$as_echo "$ac_ct_DUMPBIN" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_DUMPBIN" && break -done - - if test "x$ac_ct_DUMPBIN" = x; then - DUMPBIN=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - DUMPBIN=$ac_ct_DUMPBIN - fi -fi - - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in - *COFF*) - DUMPBIN="$DUMPBIN -symbols" - ;; - *) - DUMPBIN=: - ;; - esac - fi - - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" - fi -fi -test -z "$NM" && NM=nm - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 -$as_echo_n "checking the name lister ($NM) interface... " >&6; } -if ${lt_cv_nm_interface+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_nm_interface="BSD nm" - echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) - (eval "$ac_compile" 2>conftest.err) - cat conftest.err >&5 - (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5) - (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) - cat conftest.err >&5 - (eval echo "\"\$as_me:$LINENO: output\"" >&5) - cat conftest.out >&5 - if $GREP 'External.*some_variable' conftest.out > /dev/null; then - lt_cv_nm_interface="MS dumpbin" - fi - rm -f conftest* -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 -$as_echo "$lt_cv_nm_interface" >&6; } - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 -$as_echo_n "checking whether ln -s works... " >&6; } -LN_S=$as_ln_s -if test "$LN_S" = "ln -s"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 -$as_echo "no, using $LN_S" >&6; } -fi -# find the maximum length of command line arguments -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 -$as_echo_n "checking the maximum length of command line arguments... " >&6; } -if ${lt_cv_sys_max_cmd_len+:} false; then : - $as_echo_n "(cached) " >&6 -else - i=0 - teststring="ABCD" - case $build_os in - msdosdjgpp*) - # On DJGPP, this test can blow up pretty badly due to problems in libc - # (any single argument exceeding 2000 bytes causes a buffer overrun - # during glob expansion). Even if it were fixed, the result of this - # check would be larger than it should be. - lt_cv_sys_max_cmd_len=12288; # 12K is about right - ;; - gnu*) - # Under GNU Hurd, this test is not required because there is - # no limit to the length of command line arguments. - # Libtool will interpret -1 as no limit whatsoever - lt_cv_sys_max_cmd_len=-1; - ;; - cygwin* | mingw* | cegcc*) - # On Win9x/ME, this test blows up -- it succeeds, but takes - # about 5 minutes as the teststring grows exponentially. - # Worse, since 9x/ME are not pre-emptively multitasking, - # you end up with a "frozen" computer, even though with patience - # the test eventually succeeds (with a max line length of 256k). - # Instead, let's just punt: use the minimum linelength reported by - # all of the supported platforms: 8192 (on NT/2K/XP). - lt_cv_sys_max_cmd_len=8192; - ;; - mint*) - # On MiNT this can take a long time and run out of memory. - lt_cv_sys_max_cmd_len=8192; - ;; - amigaos*) - # On AmigaOS with pdksh, this test takes hours, literally. - # So we just punt and use a minimum line length of 8192. - lt_cv_sys_max_cmd_len=8192; - ;; - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) - # This has been around since 386BSD, at least. Likely further. - if test -x /sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` - elif test -x /usr/sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` - else - lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs - fi - # And add a safety zone - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - ;; - interix*) - # We know the value 262144 and hardcode it with a safety zone (like BSD) - lt_cv_sys_max_cmd_len=196608 - ;; - os2*) - # The test takes a long time on OS/2. - lt_cv_sys_max_cmd_len=8192 - ;; - osf*) - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not - # nice to cause kernel panics so lets avoid the loop below. - # First set a reasonable default. - lt_cv_sys_max_cmd_len=16384 - # - if test -x /sbin/sysconfig; then - case `/sbin/sysconfig -q proc exec_disable_arg_limit` in - *1*) lt_cv_sys_max_cmd_len=-1 ;; - esac - fi - ;; - sco3.2v5*) - lt_cv_sys_max_cmd_len=102400 - ;; - sysv5* | sco5v6* | sysv4.2uw2*) - kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` - if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` - else - lt_cv_sys_max_cmd_len=32768 - fi - ;; - *) - lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - else - # Make teststring a little bigger before we do anything with it. - # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do - teststring=$teststring$teststring - done - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ - = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done - # Only check the string length outside the loop. - lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` - teststring= - # Add a significant safety factor because C++ compilers can tack on - # massive amounts of additional arguments before passing them to the - # linker. It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` - fi - ;; - esac -fi -if test -n $lt_cv_sys_max_cmd_len ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 -$as_echo "$lt_cv_sys_max_cmd_len" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 -$as_echo "none" >&6; } -fi -max_cmd_len=$lt_cv_sys_max_cmd_len -: ${CP="cp -f"} -: ${MV="mv -f"} -: ${RM="rm -f"} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 -$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 -$as_echo "$xsi_shell" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 -$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } -lt_shell_append=no -( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 -$as_echo "$lt_shell_append" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - lt_unset=unset +# Check whether --with-sysroot was given. +if test "${with_sysroot+set}" = set; then : + withval=$with_sysroot; else - lt_unset=false + with_sysroot=no fi - - - -# test EBCDIC or ASCII -case `echo X|tr X '\101'` in - A) # ASCII based system - # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr - lt_SP2NL='tr \040 \012' - lt_NL2SP='tr \015\012 \040\040' - ;; - *) # EBCDIC based system - lt_SP2NL='tr \100 \n' - lt_NL2SP='tr \r\n \100\100' - ;; +lt_sysroot= +case ${with_sysroot} in #( + yes) + if test "$GCC" = yes; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 +$as_echo "${with_sysroot}" >&6; } + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 + ;; esac + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } +# Check whether --enable-libtool-lock was given. +if test "${enable_libtool_lock+set}" = set; then : + enableval=$enable_libtool_lock; +fi +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -if ${lt_cv_to_host_file_cmd+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $host in - *-*-mingw* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 - ;; - *-*-cygwin* ) - lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 - ;; - * ) # otherwise, assume *nix - lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 - ;; - esac - ;; - *-*-cygwin* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin - ;; - *-*-cygwin* ) - lt_cv_to_host_file_cmd=func_convert_file_noop - ;; - * ) # otherwise, assume *nix - lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin - ;; +# Some flags need to be propagated to the compiler or linker for good +# libtool support. +case $host in +ia64-*-hpux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) + HPUX_IA64_MODE="32" + ;; + *ELF-64*) + HPUX_IA64_MODE="64" + ;; esac - ;; - * ) # unhandled hosts (and "normal" native builds) - lt_cv_to_host_file_cmd=func_convert_file_noop - ;; -esac - -fi - -to_host_file_cmd=$lt_cv_to_host_file_cmd -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -$as_echo "$lt_cv_to_host_file_cmd" >&6; } + fi + rm -rf conftest* + ;; +*-*-irix6*) + # Find out which ABI we are using. + echo '#line '$LINENO' "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + if test "$lt_cv_prog_gnu_ld" = yes; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -melf32bsmip" + ;; + *N32*) + LD="${LD-ld} -melf32bmipn32" + ;; + *64-bit*) + LD="${LD-ld} -melf64bmip" + ;; + esac + else + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -32" + ;; + *N32*) + LD="${LD-ld} -n32" + ;; + *64-bit*) + LD="${LD-ld} -64" + ;; + esac + fi + fi + rm -rf conftest* + ;; +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ +s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + case `/usr/bin/file conftest.o` in + *32-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_i386_fbsd" + ;; + x86_64-*linux*) + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac + ;; + powerpc64le-*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) + LD="${LD-ld} -m elf_s390" + ;; + sparc64-*linux*) + LD="${LD-ld} -m elf32_sparc" + ;; + esac + ;; + *64-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" + ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; + powerpcle-*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*|s390*-*tpf*) + LD="${LD-ld} -m elf64_s390" + ;; + sparc*-*linux*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; +*-*-sco3.2v5*) + # On SCO OpenServer 5, we need -belf to get full-featured binaries. + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -belf" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 +$as_echo_n "checking whether the C compiler needs -belf... " >&6; } +if ${lt_cv_cc_needs_belf+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int +main () +{ -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -if ${lt_cv_to_tool_file_cmd+:} false; then : - $as_echo_n "(cached) " >&6 + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + lt_cv_cc_needs_belf=yes else - #assume ordinary cross tools, or native build. -lt_cv_to_tool_file_cmd=func_convert_file_noop -case $host in - *-*-mingw* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 + lt_cv_cc_needs_belf=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 +$as_echo "$lt_cv_cc_needs_belf" >&6; } + if test x"$lt_cv_cc_needs_belf" != x"yes"; then + # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf + CFLAGS="$SAVE_CFLAGS" + fi + ;; +*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi ;; + *) + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then + LD="${LD-ld} -64" + fi + ;; + esac + ;; esac - ;; + fi + rm -rf conftest* + ;; esac -fi - -to_tool_file_cmd=$lt_cv_to_tool_file_cmd -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -$as_echo "$lt_cv_to_tool_file_cmd" >&6; } - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 -$as_echo_n "checking for $LD option to reload object files... " >&6; } -if ${lt_cv_ld_reload_flag+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_ld_reload_flag='-r' -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 -$as_echo "$lt_cv_ld_reload_flag" >&6; } -reload_flag=$lt_cv_ld_reload_flag -case $reload_flag in -"" | " "*) ;; -*) reload_flag=" $reload_flag" ;; -esac -reload_cmds='$LD$reload_flag -o $output$reload_objs' -case $host_os in - cygwin* | mingw* | pw32* | cegcc*) - if test "$GCC" != yes; then - reload_cmds=false - fi - ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' - else - reload_cmds='$LD$reload_flag -o $output$reload_objs' - fi - ;; -esac - - - - - - - - +need_locks="$enable_libtool_lock" if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. -set dummy ${ac_tool_prefix}objdump; ac_word=$2 + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. +set dummy ${ac_tool_prefix}mt; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OBJDUMP+:} false; then : +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$OBJDUMP"; then - ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. + if test -n "$MANIFEST_TOOL"; then + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -6235,8 +6188,8 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -6246,10 +6199,10 @@ IFS=$as_save_IFS fi fi -OBJDUMP=$ac_cv_prog_OBJDUMP -if test -n "$OBJDUMP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 -$as_echo "$OBJDUMP" >&6; } +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL +if test -n "$MANIFEST_TOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 +$as_echo "$MANIFEST_TOOL" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -6257,17 +6210,17 @@ fi fi -if test -z "$ac_cv_prog_OBJDUMP"; then - ac_ct_OBJDUMP=$OBJDUMP - # Extract the first word of "objdump", so it can be a program name with args. -set dummy objdump; ac_word=$2 +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL + # Extract the first word of "mt", so it can be a program name with args. +set dummy mt; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_OBJDUMP"; then - ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. + if test -n "$ac_ct_MANIFEST_TOOL"; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -6275,8 +6228,8 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_OBJDUMP="objdump" + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -6286,17 +6239,17 @@ IFS=$as_save_IFS fi fi -ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP -if test -n "$ac_ct_OBJDUMP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 -$as_echo "$ac_ct_OBJDUMP" >&6; } +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL +if test -n "$ac_ct_MANIFEST_TOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - if test "x$ac_ct_OBJDUMP" = x; then - OBJDUMP="false" + if test "x$ac_ct_MANIFEST_TOOL" = x; then + MANIFEST_TOOL=":" else case $cross_compiling:$ac_tool_warned in yes:) @@ -6304,273 +6257,142 @@ yes:) $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac - OBJDUMP=$ac_ct_OBJDUMP + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL fi else - OBJDUMP="$ac_cv_prog_OBJDUMP" + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" fi -test -z "$OBJDUMP" && OBJDUMP=objdump +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } +if ${lt_cv_path_mainfest_tool+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_path_mainfest_tool=no + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out + cat conftest.err >&5 + if $GREP 'Manifest Tool' conftest.out > /dev/null; then + lt_cv_path_mainfest_tool=yes + fi + rm -f conftest* +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 +$as_echo "$lt_cv_path_mainfest_tool" >&6; } +if test "x$lt_cv_path_mainfest_tool" != xyes; then + MANIFEST_TOOL=: +fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 -$as_echo_n "checking how to recognize dependent libraries... " >&6; } -if ${lt_cv_deplibs_check_method+:} false; then : + case $host_os in + rhapsody* | darwin*) + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. +set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DSYMUTIL+:} false; then : $as_echo_n "(cached) " >&6 else - lt_cv_file_magic_cmd='$MAGIC_CMD' -lt_cv_file_magic_test_file= -lt_cv_deplibs_check_method='unknown' -# Need to set the preceding variable on all platforms that support -# interlibrary dependencies. -# 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. -# 'pass_all' -- all dependencies passed with no checks. -# 'test_compile' -- check by making test program. -# 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given extended regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. - -case $host_os in -aix[4-9]*) - lt_cv_deplibs_check_method=pass_all - ;; - -beos*) - lt_cv_deplibs_check_method=pass_all - ;; + if test -n "$DSYMUTIL"; then + ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS -bsdi[45]*) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' - lt_cv_file_magic_test_file=/shlib/libc.so - ;; +fi +fi +DSYMUTIL=$ac_cv_prog_DSYMUTIL +if test -n "$DSYMUTIL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 +$as_echo "$DSYMUTIL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -cygwin*) - # func_win32_libid is a shell function defined in ltmain.sh - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - ;; -mingw* | pw32*) - # Base MSYS/MinGW do not provide the 'file' command needed by - # func_win32_libid shell function, so use a weaker test based on 'objdump', - # unless we find 'file', for example because we are cross-compiling. - # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. - if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else - # Keep this pattern in sync with the one in func_win32_libid. - lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' +fi +if test -z "$ac_cv_prog_DSYMUTIL"; then + ac_ct_DSYMUTIL=$DSYMUTIL + # Extract the first word of "dsymutil", so it can be a program name with args. +set dummy dsymutil; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DSYMUTIL"; then + ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 fi - ;; - -cegcc*) - # use the weaker test based on 'objdump'. See mingw*. - lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' - ;; +done + done +IFS=$as_save_IFS -darwin* | rhapsody*) - lt_cv_deplibs_check_method=pass_all - ;; +fi +fi +ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL +if test -n "$ac_ct_DSYMUTIL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 +$as_echo "$ac_ct_DSYMUTIL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -freebsd* | dragonfly*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) - # Not sure whether the presence of OpenBSD here was a mistake. - # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - ;; - esac + if test "x$ac_ct_DSYMUTIL" = x; then + DSYMUTIL=":" else - lt_cv_deplibs_check_method=pass_all + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DSYMUTIL=$ac_ct_DSYMUTIL fi - ;; - -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - -haiku*) - lt_cv_deplibs_check_method=pass_all - ;; - -hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file - case $host_cpu in - ia64*) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so - ;; - hppa*64*) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]' - lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl - ;; - *) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library' - lt_cv_file_magic_test_file=/usr/lib/libc.sl - ;; - esac - ;; - -interix[3-9]*) - # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' - ;; - -irix5* | irix6* | nonstopux*) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; - esac - lt_cv_deplibs_check_method=pass_all - ;; - -# This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) - lt_cv_deplibs_check_method=pass_all - ;; - -netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' - fi - ;; - -newos6*) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/libnls.so - ;; - -*nto* | *qnx*) - lt_cv_deplibs_check_method=pass_all - ;; - -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' - fi - ;; - -osf3* | osf4* | osf5*) - lt_cv_deplibs_check_method=pass_all - ;; - -rdos*) - lt_cv_deplibs_check_method=pass_all - ;; - -solaris*) - lt_cv_deplibs_check_method=pass_all - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - lt_cv_deplibs_check_method=pass_all - ;; - -sysv4 | sysv4.3*) - case $host_vendor in - motorola) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` - ;; - ncr) - lt_cv_deplibs_check_method=pass_all - ;; - sequent) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' - ;; - sni) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" - lt_cv_file_magic_test_file=/lib/libc.so - ;; - siemens) - lt_cv_deplibs_check_method=pass_all - ;; - pc) - lt_cv_deplibs_check_method=pass_all - ;; - esac - ;; - -tpf*) - lt_cv_deplibs_check_method=pass_all - ;; -esac - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 -$as_echo "$lt_cv_deplibs_check_method" >&6; } - -file_magic_glob= -want_nocaseglob=no -if test "$build" = "$host"; then - case $host_os in - mingw* | pw32*) - if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then - want_nocaseglob=yes - else - file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` - fi - ;; - esac +else + DSYMUTIL="$ac_cv_prog_DSYMUTIL" fi -file_magic_cmd=$lt_cv_file_magic_cmd -deplibs_check_method=$lt_cv_deplibs_check_method -test -z "$deplibs_check_method" && deplibs_check_method=unknown - - - - - - - - - - - - - - - - - - - - - - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -set dummy ${ac_tool_prefix}dlltool; ac_word=$2 + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. +set dummy ${ac_tool_prefix}nmedit; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DLLTOOL+:} false; then : +if ${ac_cv_prog_NMEDIT+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$DLLTOOL"; then - ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. + if test -n "$NMEDIT"; then + ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -6578,8 +6400,8 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -6589,10 +6411,10 @@ IFS=$as_save_IFS fi fi -DLLTOOL=$ac_cv_prog_DLLTOOL -if test -n "$DLLTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -$as_echo "$DLLTOOL" >&6; } +NMEDIT=$ac_cv_prog_NMEDIT +if test -n "$NMEDIT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 +$as_echo "$NMEDIT" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -6600,17 +6422,17 @@ fi fi -if test -z "$ac_cv_prog_DLLTOOL"; then - ac_ct_DLLTOOL=$DLLTOOL - # Extract the first word of "dlltool", so it can be a program name with args. -set dummy dlltool; ac_word=$2 +if test -z "$ac_cv_prog_NMEDIT"; then + ac_ct_NMEDIT=$NMEDIT + # Extract the first word of "nmedit", so it can be a program name with args. +set dummy nmedit; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : +if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_DLLTOOL"; then - ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. + if test -n "$ac_ct_NMEDIT"; then + ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -6618,8 +6440,8 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_DLLTOOL="dlltool" + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_NMEDIT="nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -6629,17 +6451,17 @@ IFS=$as_save_IFS fi fi -ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -if test -n "$ac_ct_DLLTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -$as_echo "$ac_ct_DLLTOOL" >&6; } +ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT +if test -n "$ac_ct_NMEDIT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 +$as_echo "$ac_ct_NMEDIT" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - if test "x$ac_ct_DLLTOOL" = x; then - DLLTOOL="false" + if test "x$ac_ct_NMEDIT" = x; then + NMEDIT=":" else case $cross_compiling:$ac_tool_warned in yes:) @@ -6647,114 +6469,62 @@ yes:) $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac - DLLTOOL=$ac_ct_DLLTOOL + NMEDIT=$ac_ct_NMEDIT fi else - DLLTOOL="$ac_cv_prog_DLLTOOL" + NMEDIT="$ac_cv_prog_NMEDIT" fi -test -z "$DLLTOOL" && DLLTOOL=dlltool - - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. +set dummy ${ac_tool_prefix}lipo; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_LIPO+:} false; then : $as_echo_n "(cached) " >&6 else - lt_cv_sharedlib_from_linklib_cmd='unknown' - -case $host_os in -cygwin* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL - case `$DLLTOOL --help 2>&1` in - *--identify-strict*) - lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib - ;; - *) - lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback - ;; - esac - ;; -*) - # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" - ;; -esac - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO - - - - - - - -if test -n "$ac_tool_prefix"; then - for ac_prog in ar - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AR+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$AR"; then - ac_cv_prog_AR="$AR" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS + if test -n "$LIPO"; then + ac_cv_prog_LIPO="$LIPO" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_LIPO="${ac_tool_prefix}lipo" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS fi fi -AR=$ac_cv_prog_AR -if test -n "$AR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 -$as_echo "$AR" >&6; } +LIPO=$ac_cv_prog_LIPO +if test -n "$LIPO"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 +$as_echo "$LIPO" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - test -n "$AR" && break - done fi -if test -z "$AR"; then - ac_ct_AR=$AR - for ac_prog in ar -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 +if test -z "$ac_cv_prog_LIPO"; then + ac_ct_LIPO=$LIPO + # Extract the first word of "lipo", so it can be a program name with args. +set dummy lipo; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_AR+:} false; then : +if ${ac_cv_prog_ac_ct_LIPO+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_AR"; then - ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. + if test -n "$ac_ct_LIPO"; then + ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -6762,8 +6532,8 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_AR="$ac_prog" + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_LIPO="lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -6773,21 +6543,17 @@ IFS=$as_save_IFS fi fi -ac_ct_AR=$ac_cv_prog_ac_ct_AR -if test -n "$ac_ct_AR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 -$as_echo "$ac_ct_AR" >&6; } +ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO +if test -n "$ac_ct_LIPO"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 +$as_echo "$ac_ct_LIPO" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - - test -n "$ac_ct_AR" && break -done - - if test "x$ac_ct_AR" = x; then - AR="false" + if test "x$ac_ct_LIPO" = x; then + LIPO=":" else case $cross_compiling:$ac_tool_warned in yes:) @@ -6795,91 +6561,22 @@ yes:) $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac - AR=$ac_ct_AR + LIPO=$ac_ct_LIPO fi -fi - -: ${AR=ar} -: ${AR_FLAGS=cru} - - - - - - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -$as_echo_n "checking for archiver @FILE support... " >&6; } -if ${lt_cv_ar_at_file+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_ar_at_file=no - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - echo conftest.$ac_objext > conftest.lst - lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 - (eval $lt_ar_try) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - if test "$ac_status" -eq 0; then - # Ensure the archiver fails upon bogus file names. - rm -f conftest.$ac_objext libconftest.a - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 - (eval $lt_ar_try) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - if test "$ac_status" -ne 0; then - lt_cv_ar_at_file=@ - fi - fi - rm -f conftest.* libconftest.a - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -$as_echo "$lt_cv_ar_at_file" >&6; } - -if test "x$lt_cv_ar_at_file" = xno; then - archiver_list_spec= else - archiver_list_spec=$lt_cv_ar_at_file + LIPO="$ac_cv_prog_LIPO" fi - - - - - - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -set dummy ${ac_tool_prefix}strip; ac_word=$2 + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. +set dummy ${ac_tool_prefix}otool; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_STRIP+:} false; then : +if ${ac_cv_prog_OTOOL+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. + if test -n "$OTOOL"; then + ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -6887,8 +6584,8 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_OTOOL="${ac_tool_prefix}otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -6898,10 +6595,10 @@ IFS=$as_save_IFS fi fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } +OTOOL=$ac_cv_prog_OTOOL +if test -n "$OTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 +$as_echo "$OTOOL" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -6909,17 +6606,17 @@ fi fi -if test -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. -set dummy strip; ac_word=$2 +if test -z "$ac_cv_prog_OTOOL"; then + ac_ct_OTOOL=$OTOOL + # Extract the first word of "otool", so it can be a program name with args. +set dummy otool; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_STRIP+:} false; then : +if ${ac_cv_prog_ac_ct_OTOOL+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. + if test -n "$ac_ct_OTOOL"; then + ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -6927,8 +6624,8 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_STRIP="strip" + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_OTOOL="otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -6938,17 +6635,17 @@ IFS=$as_save_IFS fi fi -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -$as_echo "$ac_ct_STRIP" >&6; } +ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL +if test -n "$ac_ct_OTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 +$as_echo "$ac_ct_OTOOL" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - if test "x$ac_ct_STRIP" = x; then - STRIP=":" + if test "x$ac_ct_OTOOL" = x; then + OTOOL=":" else case $cross_compiling:$ac_tool_warned in yes:) @@ -6956,29 +6653,22 @@ yes:) $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac - STRIP=$ac_ct_STRIP + OTOOL=$ac_ct_OTOOL fi else - STRIP="$ac_cv_prog_STRIP" + OTOOL="$ac_cv_prog_OTOOL" fi -test -z "$STRIP" && STRIP=: - - - - - - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. -set dummy ${ac_tool_prefix}ranlib; ac_word=$2 + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. +set dummy ${ac_tool_prefix}otool64; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_RANLIB+:} false; then : +if ${ac_cv_prog_OTOOL64+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. + if test -n "$OTOOL64"; then + ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -6986,8 +6676,8 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -6997,10 +6687,10 @@ IFS=$as_save_IFS fi fi -RANLIB=$ac_cv_prog_RANLIB -if test -n "$RANLIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 -$as_echo "$RANLIB" >&6; } +OTOOL64=$ac_cv_prog_OTOOL64 +if test -n "$OTOOL64"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 +$as_echo "$OTOOL64" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -7008,17 +6698,17 @@ fi fi -if test -z "$ac_cv_prog_RANLIB"; then - ac_ct_RANLIB=$RANLIB - # Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; ac_word=$2 +if test -z "$ac_cv_prog_OTOOL64"; then + ac_ct_OTOOL64=$OTOOL64 + # Extract the first word of "otool64", so it can be a program name with args. +set dummy otool64; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : +if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. + if test -n "$ac_ct_OTOOL64"; then + ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -7026,8 +6716,8 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_RANLIB="ranlib" + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_OTOOL64="otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -7037,17 +6727,17 @@ IFS=$as_save_IFS fi fi -ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB -if test -n "$ac_ct_RANLIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 -$as_echo "$ac_ct_RANLIB" >&6; } +ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 +if test -n "$ac_ct_OTOOL64"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 +$as_echo "$ac_ct_OTOOL64" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - if test "x$ac_ct_RANLIB" = x; then - RANLIB=":" + if test "x$ac_ct_OTOOL64" = x; then + OTOOL64=":" else case $cross_compiling:$ac_tool_warned in yes:) @@ -7055,42 +6745,17 @@ yes:) $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac - RANLIB=$ac_ct_RANLIB + OTOOL64=$ac_ct_OTOOL64 fi else - RANLIB="$ac_cv_prog_RANLIB" + OTOOL64="$ac_cv_prog_OTOOL64" fi -test -z "$RANLIB" && RANLIB=: - - -# Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' -old_postinstall_cmds='chmod 644 $oldlib' -old_postuninstall_cmds= - -if test -n "$RANLIB"; then - case $host_os in - openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" - ;; - *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" - ;; - esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" -fi -case $host_os in - darwin*) - lock_old_archive_extraction=yes ;; - *) - lock_old_archive_extraction=no ;; -esac @@ -7112,1175 +6777,1016 @@ esac -for ac_prog in gawk mawk nawk awk -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AWK+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 +$as_echo_n "checking for -single_module linker flag... " >&6; } +if ${lt_cv_apple_cc_single_mod+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$AWK"; then - ac_cv_prog_AWK="$AWK" # Let the user override the test. + lt_cv_apple_cc_single_mod=no + if test -z "${LT_MULTI_MODULE}"; then + # By default we will add the -single_module flag. You can override + # by either setting the environment variable LT_MULTI_MODULE + # non-empty at configure time, or by adding -multi_module to the + # link flags. + rm -rf libconftest.dylib* + echo "int foo(void){return 1;}" > conftest.c + echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +-dynamiclib -Wl,-single_module conftest.c" >&5 + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ + -dynamiclib -Wl,-single_module conftest.c 2>conftest.err + _lt_result=$? + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&5 + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then + lt_cv_apple_cc_single_mod=yes + else + cat conftest.err >&5 + fi + rm -rf libconftest.dylib* + rm -f conftest.* + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 +$as_echo "$lt_cv_apple_cc_single_mod" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 +$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } +if ${lt_cv_ld_exported_symbols_list+:} false; then : + $as_echo_n "(cached) " >&6 else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AWK="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS + lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -fi -AWK=$ac_cv_prog_AWK -if test -n "$AWK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 -$as_echo "$AWK" >&6; } +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + lt_cv_ld_exported_symbols_list=yes else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + lt_cv_ld_exported_symbols_list=no fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 +$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } - test -n "$AWK" && break -done + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 +$as_echo_n "checking for -force_load linker flag... " >&6; } +if ${lt_cv_ld_force_load+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ld_force_load=no + cat > conftest.c << _LT_EOF +int forced_loaded() { return 2;} +_LT_EOF + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 + echo "$AR cru libconftest.a conftest.o" >&5 + $AR cru libconftest.a conftest.o 2>&5 + echo "$RANLIB libconftest.a" >&5 + $RANLIB libconftest.a 2>&5 + cat > conftest.c << _LT_EOF +int main() { return 0;} +_LT_EOF + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err + _lt_result=$? + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&5 + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + lt_cv_ld_force_load=yes + else + cat conftest.err >&5 + fi + rm -f conftest.err libconftest.a conftest conftest.c + rm -rf conftest.dSYM +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 +$as_echo "$lt_cv_ld_force_load" >&6; } + case $host_os in + rhapsody* | darwin1.[012]) + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + darwin1.*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + darwin*) # darwin 5.x on + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[91]*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + 10.[012]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + esac + ;; + esac + if test "$lt_cv_apple_cc_single_mod" = "yes"; then + _lt_dar_single_mod='$single_module' + fi + if test "$lt_cv_ld_exported_symbols_list" = "yes"; then + _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + else + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then + _lt_dsymutil='~$DSYMUTIL $lib || :' + else + _lt_dsymutil= + fi + ;; + esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if ${ac_cv_header_stdc+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include +int +main () +{ + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stdc=yes +else + ac_cv_header_stdc=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then : +else + ac_cv_header_stdc=no +fi +rm -f conftest* +fi +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then : +else + ac_cv_header_stdc=no +fi +rm -f conftest* +fi +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then : + : +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + return 2; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : +else + ac_cv_header_stdc=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } +if test $ac_cv_header_stdc = yes; then +$as_echo "#define STDC_HEADERS 1" >>confdefs.h -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} +fi -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} +# On IRIX 5.3, sys/types and inttypes.h are conflicting. +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF -# Allow CC to be a program name with arguments. -compiler=$CC +fi +done -# Check for command to grab the raw symbol name followed by C symbol from nm. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 -$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } -if ${lt_cv_sys_global_symbol_pipe+:} false; then : - $as_echo_n "(cached) " >&6 -else -# These are sane defaults that work on at least a few old systems. -# [They come from Ultrix. What could be older than Ultrix?!! ;)] +for ac_header in dlfcn.h +do : + ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default +" +if test "x$ac_cv_header_dlfcn_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_DLFCN_H 1 +_ACEOF -# Character class describing NM global symbol codes. -symcode='[BCDEGRST]' +fi -# Regexp to match symbols that can be accessed directly from C. -sympat='\([_A-Za-z][_A-Za-z0-9]*\)' +done -# Define system-specific variables. -case $host_os in -aix*) - symcode='[BCDT]' - ;; -cygwin* | mingw* | pw32* | cegcc*) - symcode='[ABCDGISTW]' - ;; -hpux*) - if test "$host_cpu" = ia64; then - symcode='[ABCDEGRST]' - fi - ;; -irix* | nonstopux*) - symcode='[BCDEGRST]' - ;; -osf*) - symcode='[BCDEGQRST]' - ;; -solaris*) - symcode='[BDRT]' - ;; -sco3.2v5*) - symcode='[DT]' - ;; -sysv4.2uw2*) - symcode='[DT]' - ;; -sysv5* | sco5v6* | unixware* | OpenUNIX*) - symcode='[ABDT]' - ;; -sysv4) - symcode='[DFNSTU]' - ;; -esac -# If we're using GNU nm, then use its standard symbol codes. -case `$NM -V 2>&1` in -*GNU* | *'with BFD'*) - symcode='[ABCDGIRSTW]' ;; -esac -# Transform an extracted symbol line into a proper C declaration. -# Some systems (esp. on ia64) link data and code symbols differently, -# so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" -# Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -# Handle CRLF in mingw tool chain -opt_cr= -case $build_os in -mingw*) - opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp - ;; -esac +# Set options +enable_win32_dll=yes -# Try without a prefix underscore, then with it. -for ac_symprfx in "" "_"; do +case $host in +*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. +set dummy ${ac_tool_prefix}as; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AS+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$AS"; then + ac_cv_prog_AS="$AS" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AS="${ac_tool_prefix}as" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS - # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. - symxfrm="\\1 $ac_symprfx\\2 \\2" +fi +fi +AS=$ac_cv_prog_AS +if test -n "$AS"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5 +$as_echo "$AS" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi - # Write the raw and C identifiers. - if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. - # Also find C++ and __fastcall symbols from MSVC++, - # which start with @ or ?. - lt_cv_sys_global_symbol_pipe="$AWK '"\ -" {last_section=section; section=\$ 3};"\ -" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ -" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ -" \$ 0!~/External *\|/{next};"\ -" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ -" {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ -" ' prfx=^$ac_symprfx" - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + +fi +if test -z "$ac_cv_prog_AS"; then + ac_ct_AS=$AS + # Extract the first word of "as", so it can be a program name with args. +set dummy as; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_AS+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_AS"; then + ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_AS="as" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 fi - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" +done + done +IFS=$as_save_IFS - # Check to see that the pipe works correctly. - pipe_works=no +fi +fi +ac_ct_AS=$ac_cv_prog_ac_ct_AS +if test -n "$ac_ct_AS"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5 +$as_echo "$ac_ct_AS" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi - rm -f conftest* - cat > conftest.$ac_ext <<_LT_EOF -#ifdef __cplusplus -extern "C" { -#endif -char nm_test_var; -void nm_test_func(void); -void nm_test_func(void){} -#ifdef __cplusplus -} -#endif -int main(){nm_test_var='a';nm_test_func();return(0);} -_LT_EOF - - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - # Now try to grab the symbols. - nlist=conftest.nm - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 - (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s "$nlist"; then - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then - mv -f "$nlist"T "$nlist" - else - rm -f "$nlist"T - fi - - # Make sure that we snagged all the symbols we need. - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime - relocations are performed -- see ld's documentation on pseudo-relocs. */ -# define LT_DLSYM_CONST -#elif defined(__osf__) -/* This system does not cope well with relocations in const data. */ -# define LT_DLSYM_CONST -#else -# define LT_DLSYM_CONST const -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -_LT_EOF - # Now generate the symbol file. - eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' - - cat <<_LT_EOF >> conftest.$ac_ext - -/* The mapping between symbol names and symbols. */ -LT_DLSYM_CONST struct { - const char *name; - void *address; -} -lt__PROGRAM__LTX_preloaded_symbols[] = -{ - { "@PROGRAM@", (void *) 0 }, -_LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext - cat <<\_LT_EOF >> conftest.$ac_ext - {0, (void *) 0} -}; - -/* This works around a problem in FreeBSD linker */ -#ifdef FREEBSD_WORKAROUND -static const void *lt_preloaded_setup() { - return lt__PROGRAM__LTX_preloaded_symbols; -} -#endif - -#ifdef __cplusplus -} -#endif -_LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext - lt_globsym_save_LIBS=$LIBS - lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 - (eval $ac_link) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi - LIBS=$lt_globsym_save_LIBS - CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi - else - echo "cannot find nm_test_var in $nlist" >&5 - fi - else - echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5 - fi + if test "x$ac_ct_AS" = x; then + AS="false" else - echo "$progname: failed program was:" >&5 - cat conftest.$ac_ext >&5 + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + AS=$ac_ct_AS fi - rm -rf conftest* conftst* +else + AS="$ac_cv_prog_AS" +fi - # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then - break - else - lt_cv_sys_global_symbol_pipe= + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DLLTOOL"; then + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 fi done + done +IFS=$as_save_IFS fi - -if test -z "$lt_cv_sys_global_symbol_pipe"; then - lt_cv_sys_global_symbol_to_cdecl= fi -if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 -$as_echo "failed" >&6; } +DLLTOOL=$ac_cv_prog_DLLTOOL +if test -n "$DLLTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 +$as_echo "$DLLTOOL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -$as_echo "ok" >&6; } -fi - -# Response file support. -if test "$lt_cv_nm_interface" = "MS dumpbin"; then - nm_file_list_spec='@' -elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then - nm_file_list_spec='@' + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi +fi +if test -z "$ac_cv_prog_DLLTOOL"; then + ac_ct_DLLTOOL=$DLLTOOL + # Extract the first word of "dlltool", so it can be a program name with args. +set dummy dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DLLTOOL"; then + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DLLTOOL="dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS +fi +fi +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL +if test -n "$ac_ct_DLLTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 +$as_echo "$ac_ct_DLLTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + if test "x$ac_ct_DLLTOOL" = x; then + DLLTOOL="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DLLTOOL=$ac_ct_DLLTOOL + fi +else + DLLTOOL="$ac_cv_prog_DLLTOOL" +fi + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. +set dummy ${ac_tool_prefix}objdump; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_OBJDUMP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$OBJDUMP"; then + ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS +fi +fi +OBJDUMP=$ac_cv_prog_OBJDUMP +if test -n "$OBJDUMP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 +$as_echo "$OBJDUMP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +fi +if test -z "$ac_cv_prog_OBJDUMP"; then + ac_ct_OBJDUMP=$OBJDUMP + # Extract the first word of "objdump", so it can be a program name with args. +set dummy objdump; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_OBJDUMP"; then + ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_OBJDUMP="objdump" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS +fi +fi +ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP +if test -n "$ac_ct_OBJDUMP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 +$as_echo "$ac_ct_OBJDUMP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + if test "x$ac_ct_OBJDUMP" = x; then + OBJDUMP="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + OBJDUMP=$ac_ct_OBJDUMP + fi +else + OBJDUMP="$ac_cv_prog_OBJDUMP" +fi + ;; +esac +test -z "$AS" && AS=as +test -z "$DLLTOOL" && DLLTOOL=dlltool +test -z "$OBJDUMP" && OBJDUMP=objdump -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -$as_echo_n "checking for sysroot... " >&6; } - -# Check whether --with-sysroot was given. -if test "${with_sysroot+set}" = set; then : - withval=$with_sysroot; -else - with_sysroot=no -fi - - -lt_sysroot= -case ${with_sysroot} in #( - yes) - if test "$GCC" = yes; then - lt_sysroot=`$CC --print-sysroot 2>/dev/null` - fi - ;; #( - /*) - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` - ;; #( - no|'') - ;; #( - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 -$as_echo "${with_sysroot}" >&6; } - as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 - ;; -esac - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -$as_echo "${lt_sysroot:-no}" >&6; } - - - - -# Check whether --enable-libtool-lock was given. -if test "${enable_libtool_lock+set}" = set; then : - enableval=$enable_libtool_lock; -fi -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes + enable_dlopen=no -# Some flags need to be propagated to the compiler or linker for good -# libtool support. -case $host in -ia64-*-hpux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - case `/usr/bin/file conftest.$ac_objext` in - *ELF-32*) - HPUX_IA64_MODE="32" - ;; - *ELF-64*) - HPUX_IA64_MODE="64" - ;; - esac - fi - rm -rf conftest* - ;; -*-*-irix6*) - # Find out which ABI we are using. - echo '#line '$LINENO' "configure"' > conftest.$ac_ext - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - if test "$lt_cv_prog_gnu_ld" = yes; then - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -melf32bsmip" - ;; - *N32*) - LD="${LD-ld} -melf32bmipn32" - ;; - *64-bit*) - LD="${LD-ld} -melf64bmip" - ;; - esac - else - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -32" - ;; - *N32*) - LD="${LD-ld} -n32" - ;; - *64-bit*) - LD="${LD-ld} -64" - ;; - esac - fi - fi - rm -rf conftest* - ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ -s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - case `/usr/bin/file conftest.o` in - *32-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_i386_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_i386" - ;; - ppc64-*linux*|powerpc64-*linux*) - LD="${LD-ld} -m elf32ppclinux" - ;; - s390x-*linux*) - LD="${LD-ld} -m elf_s390" - ;; - sparc64-*linux*) - LD="${LD-ld} -m elf32_sparc" - ;; - esac - ;; - *64-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_x86_64_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_x86_64" - ;; - ppc*-*linux*|powerpc*-*linux*) - LD="${LD-ld} -m elf64ppc" - ;; - s390*-*linux*|s390*-*tpf*) - LD="${LD-ld} -m elf64_s390" - ;; - sparc*-*linux*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 -$as_echo_n "checking whether the C compiler needs -belf... " >&6; } -if ${lt_cv_cc_needs_belf+:} false; then : - $as_echo_n "(cached) " >&6 + # Check whether --enable-shared was given. +if test "${enable_shared+set}" = set; then : + enableval=$enable_shared; p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; + no) enable_shared=no ;; + *) + enable_shared=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_shared=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac else - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu + enable_shared=yes +fi - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int -main () -{ - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - lt_cv_cc_needs_belf=yes -else - lt_cv_cc_needs_belf=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 -$as_echo "$lt_cv_cc_needs_belf" >&6; } - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" - fi - ;; -*-*solaris*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - case `/usr/bin/file conftest.o` in - *64-bit*) - case $lt_cv_prog_gnu_ld in - yes*) - case $host in - i?86-*-solaris*) - LD="${LD-ld} -m elf_x86_64" - ;; - sparc*-*-solaris*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - # GNU ld 2.21 introduced _sol2 emulations. Use them if available. - if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" - fi - ;; - *) - if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then - LD="${LD-ld} -64" + + + + + + # Check whether --enable-static was given. +if test "${enable_static+set}" = set; then : + enableval=$enable_static; p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; + no) enable_static=no ;; + *) + enable_static=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_static=yes fi - ;; - esac + done + IFS="$lt_save_ifs" ;; esac - fi - rm -rf conftest* - ;; -esac +else + enable_static=yes +fi -need_locks="$enable_libtool_lock" -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -set dummy ${ac_tool_prefix}mt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$MANIFEST_TOOL"; then - ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS -fi -fi -MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -if test -n "$MANIFEST_TOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -$as_echo "$MANIFEST_TOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi -fi -if test -z "$ac_cv_prog_MANIFEST_TOOL"; then - ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL - # Extract the first word of "mt", so it can be a program name with args. -set dummy mt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_MANIFEST_TOOL"; then - ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS -fi -fi -ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -if test -n "$ac_ct_MANIFEST_TOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - if test "x$ac_ct_MANIFEST_TOOL" = x; then - MANIFEST_TOOL=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL - fi -else - MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -fi -test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -if ${lt_cv_path_mainfest_tool+:} false; then : - $as_echo_n "(cached) " >&6 + + +# Check whether --with-pic was given. +if test "${with_pic+set}" = set; then : + withval=$with_pic; lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac else - lt_cv_path_mainfest_tool=no - echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 - $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out - cat conftest.err >&5 - if $GREP 'Manifest Tool' conftest.out > /dev/null; then - lt_cv_path_mainfest_tool=yes - fi - rm -f conftest* -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -$as_echo "$lt_cv_path_mainfest_tool" >&6; } -if test "x$lt_cv_path_mainfest_tool" != xyes; then - MANIFEST_TOOL=: + pic_mode=default fi +test -z "$pic_mode" && pic_mode=default - case $host_os in - rhapsody* | darwin*) - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. -set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DSYMUTIL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$DSYMUTIL"; then - ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS -fi -fi -DSYMUTIL=$ac_cv_prog_DSYMUTIL -if test -n "$DSYMUTIL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 -$as_echo "$DSYMUTIL" >&6; } + + + # Check whether --enable-fast-install was given. +if test "${enable_fast_install+set}" = set; then : + enableval=$enable_fast_install; p=${PACKAGE-default} + case $enableval in + yes) enable_fast_install=yes ;; + no) enable_fast_install=no ;; + *) + enable_fast_install=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_fast_install=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + enable_fast_install=yes fi -fi -if test -z "$ac_cv_prog_DSYMUTIL"; then - ac_ct_DSYMUTIL=$DSYMUTIL - # Extract the first word of "dsymutil", so it can be a program name with args. -set dummy dsymutil; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_DSYMUTIL"; then - ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS -fi -fi -ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL -if test -n "$ac_ct_DSYMUTIL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 -$as_echo "$ac_ct_DSYMUTIL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - if test "x$ac_ct_DSYMUTIL" = x; then - DSYMUTIL=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - DSYMUTIL=$ac_ct_DSYMUTIL - fi -else - DSYMUTIL="$ac_cv_prog_DSYMUTIL" -fi - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. -set dummy ${ac_tool_prefix}nmedit; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_NMEDIT+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$NMEDIT"; then - ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS -fi -fi -NMEDIT=$ac_cv_prog_NMEDIT -if test -n "$NMEDIT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 -$as_echo "$NMEDIT" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi -fi -if test -z "$ac_cv_prog_NMEDIT"; then - ac_ct_NMEDIT=$NMEDIT - # Extract the first word of "nmedit", so it can be a program name with args. -set dummy nmedit; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_NMEDIT"; then - ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_NMEDIT="nmedit" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS -fi -fi -ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT -if test -n "$ac_ct_NMEDIT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 -$as_echo "$ac_ct_NMEDIT" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - if test "x$ac_ct_NMEDIT" = x; then - NMEDIT=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - NMEDIT=$ac_ct_NMEDIT - fi -else - NMEDIT="$ac_cv_prog_NMEDIT" -fi - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. -set dummy ${ac_tool_prefix}lipo; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_LIPO+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$LIPO"; then - ac_cv_prog_LIPO="$LIPO" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_LIPO="${ac_tool_prefix}lipo" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS +# This can be used to rebuild libtool when needed +LIBTOOL_DEPS="$ltmain" + +# Always use our own libtool. +LIBTOOL='$(SHELL) $(top_builddir)/libtool' + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +test -z "$LN_S" && LN_S="ln -s" + + + -fi -fi -LIPO=$ac_cv_prog_LIPO -if test -n "$LIPO"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 -$as_echo "$LIPO" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi + + + + + + + + +if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST fi -if test -z "$ac_cv_prog_LIPO"; then - ac_ct_LIPO=$LIPO - # Extract the first word of "lipo", so it can be a program name with args. -set dummy lipo; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_LIPO+:} false; then : + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 +$as_echo_n "checking for objdir... " >&6; } +if ${lt_cv_objdir+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_LIPO"; then - ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test. + rm -f .libs 2>/dev/null +mkdir .libs 2>/dev/null +if test -d .libs; then + lt_cv_objdir=.libs else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_LIPO="lipo" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi + # MS-DOS does not allow filenames that begin with a dot. + lt_cv_objdir=_libs fi -ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO -if test -n "$ac_ct_LIPO"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 -$as_echo "$ac_ct_LIPO" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +rmdir .libs 2>/dev/null fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 +$as_echo "$lt_cv_objdir" >&6; } +objdir=$lt_cv_objdir - if test "x$ac_ct_LIPO" = x; then - LIPO=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - LIPO=$ac_ct_LIPO + + + + +cat >>confdefs.h <<_ACEOF +#define LT_OBJDIR "$lt_cv_objdir/" +_ACEOF + + + + +case $host_os in +aix3*) + # AIX sometimes has problems with the GCC collect2 program. For some + # reason, if we set the COLLECT_NAMES environment variable, the problems + # vanish in a puff of smoke. + if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES fi -else - LIPO="$ac_cv_prog_LIPO" -fi + ;; +esac - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. -set dummy ${ac_tool_prefix}otool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OTOOL+:} false; then : +# Global variables: +ofile=libtool +can_build_shared=yes + +# All known linkers require a `.a' archive for static linking (except MSVC, +# which needs '.lib'). +libext=a + +with_gnu_ld="$lt_cv_prog_gnu_ld" + +old_CC="$CC" +old_CFLAGS="$CFLAGS" + +# Set sane defaults for various variables +test -z "$CC" && CC=cc +test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS +test -z "$LD" && LD=ld +test -z "$ac_objext" && ac_objext=o + +for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` + + +# Only perform the check for file, if the check method requires it +test -z "$MAGIC_CMD" && MAGIC_CMD=file +case $deplibs_check_method in +file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 +$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } +if ${lt_cv_path_MAGIC_CMD+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$OTOOL"; then - ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_OTOOL="${ac_tool_prefix}otool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS + case $MAGIC_CMD in +[\\/*] | ?:[\\/]*) + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + ;; +*) + lt_save_MAGIC_CMD="$MAGIC_CMD" + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" + for ac_dir in $ac_dummy; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/${ac_tool_prefix}file; then + lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else + cat <<_LT_EOF 1>&2 +*** Warning: the command libtool uses to detect shared libraries, +*** $file_magic_cmd, produces output that libtool cannot recognize. +*** The result is that libtool may fail to recognize shared libraries +*** as such. This will affect the creation of libtool libraries that +*** depend on shared libraries, but programs linked with such libtool +*** libraries will work regardless of this problem. Nevertheless, you +*** may want to report the problem to your system manager and/or to +*** bug-libtool@gnu.org + +_LT_EOF + fi ;; + esac + fi + break + fi + done + IFS="$lt_save_ifs" + MAGIC_CMD="$lt_save_MAGIC_CMD" + ;; +esac fi -fi -OTOOL=$ac_cv_prog_OTOOL -if test -n "$OTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 -$as_echo "$OTOOL" >&6; } + +MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +if test -n "$MAGIC_CMD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +$as_echo "$MAGIC_CMD" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -fi -if test -z "$ac_cv_prog_OTOOL"; then - ac_ct_OTOOL=$OTOOL - # Extract the first word of "otool", so it can be a program name with args. -set dummy otool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OTOOL+:} false; then : + + + +if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 +$as_echo_n "checking for file... " >&6; } +if ${lt_cv_path_MAGIC_CMD+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_OTOOL"; then - ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_OTOOL="otool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS + case $MAGIC_CMD in +[\\/*] | ?:[\\/]*) + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + ;; +*) + lt_save_MAGIC_CMD="$MAGIC_CMD" + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" + for ac_dir in $ac_dummy; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/file; then + lt_cv_path_MAGIC_CMD="$ac_dir/file" + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else + cat <<_LT_EOF 1>&2 +*** Warning: the command libtool uses to detect shared libraries, +*** $file_magic_cmd, produces output that libtool cannot recognize. +*** The result is that libtool may fail to recognize shared libraries +*** as such. This will affect the creation of libtool libraries that +*** depend on shared libraries, but programs linked with such libtool +*** libraries will work regardless of this problem. Nevertheless, you +*** may want to report the problem to your system manager and/or to +*** bug-libtool@gnu.org + +_LT_EOF + fi ;; + esac + fi + break + fi + done + IFS="$lt_save_ifs" + MAGIC_CMD="$lt_save_MAGIC_CMD" + ;; +esac fi -fi -ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL -if test -n "$ac_ct_OTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 -$as_echo "$ac_ct_OTOOL" >&6; } + +MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +if test -n "$MAGIC_CMD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +$as_echo "$MAGIC_CMD" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - if test "x$ac_ct_OTOOL" = x; then - OTOOL=":" + else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - OTOOL=$ac_ct_OTOOL + MAGIC_CMD=: fi -else - OTOOL="$ac_cv_prog_OTOOL" fi - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. -set dummy ${ac_tool_prefix}otool64; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OTOOL64+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$OTOOL64"; then - ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 fi -done - done -IFS=$as_save_IFS + ;; +esac -fi -fi -OTOOL64=$ac_cv_prog_OTOOL64 -if test -n "$OTOOL64"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 -$as_echo "$OTOOL64" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi +# Use C for the default configuration in the libtool script +lt_save_CC="$CC" +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -fi -if test -z "$ac_cv_prog_OTOOL64"; then - ac_ct_OTOOL64=$OTOOL64 - # Extract the first word of "otool64", so it can be a program name with args. -set dummy otool64; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_OTOOL64"; then - ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_OTOOL64="otool64" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS -fi -fi -ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 -if test -n "$ac_ct_OTOOL64"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 -$as_echo "$ac_ct_OTOOL64" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi +# Source file extension for C test sources. +ac_ext=c - if test "x$ac_ct_OTOOL64" = x; then - OTOOL64=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - OTOOL64=$ac_ct_OTOOL64 - fi -else - OTOOL64="$ac_cv_prog_OTOOL64" -fi +# Object file extension for compiled C test sources. +objext=o +objext=$objext +# Code to be used in simple compile tests +lt_simple_compile_test_code="int some_variable = 0;" +# Code to be used in simple link tests +lt_simple_link_test_code='int main(){return(0);}' @@ -8288,476 +7794,474 @@ fi +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} +# Allow CC to be a program name with arguments. +compiler=$CC +# Save the default compiler, since it gets overwritten when the other +# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. +compiler_DEFAULT=$CC +# save warnings/boilerplate of simple test code +ac_outfile=conftest.$ac_objext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$RM conftest* +ac_outfile=conftest.$ac_objext +echo "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$RM -r conftest* +if test -n "$compiler"; then +lt_prog_compiler_no_builtin_flag= +if test "$GCC" = yes; then + case $cc_basename in + nvcc*) + lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; + *) + lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;; + esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } +if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_rtti_exceptions=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="-fno-rtti -fno-exceptions" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_rtti_exceptions=yes + fi + fi + $RM conftest* +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } +if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then + lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" +else + : +fi +fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 -$as_echo_n "checking for -single_module linker flag... " >&6; } -if ${lt_cv_apple_cc_single_mod+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then - # By default we will add the -single_module flag. You can override - # by either setting the environment variable LT_MULTI_MODULE - # non-empty at configure time, or by adding -multi_module to the - # link flags. - rm -rf libconftest.dylib* - echo "int foo(void){return 1;}" > conftest.c - echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ --dynamiclib -Wl,-single_module conftest.c" >&5 - $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib -Wl,-single_module conftest.c 2>conftest.err - _lt_result=$? - # If there is a non-empty error log, and "single_module" - # appears in it, assume the flag caused a linker warning - if test -s conftest.err && $GREP single_module conftest.err; then - cat conftest.err >&5 - # Otherwise, if the output was created with a 0 exit code from - # the compiler, it worked. - elif test -f libconftest.dylib && test $_lt_result -eq 0; then - lt_cv_apple_cc_single_mod=yes - else - cat conftest.err >&5 - fi - rm -rf libconftest.dylib* - rm -f conftest.* - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 -$as_echo "$lt_cv_apple_cc_single_mod" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 -$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } -if ${lt_cv_ld_exported_symbols_list+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_ld_exported_symbols_list=no - save_LDFLAGS=$LDFLAGS - echo "_main" > conftest.sym - LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + lt_prog_compiler_wl= +lt_prog_compiler_pic= +lt_prog_compiler_static= -int -main () -{ - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - lt_cv_ld_exported_symbols_list=yes -else - lt_cv_ld_exported_symbols_list=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" + if test "$GCC" = yes; then + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_static='-static' -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 -$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + case $host_os in + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static='-Bstatic' + fi + ;; - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 -$as_echo_n "checking for -force_load linker flag... " >&6; } -if ${lt_cv_ld_force_load+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_ld_force_load=no - cat > conftest.c << _LT_EOF -int forced_loaded() { return 2;} -_LT_EOF - echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 - echo "$RANLIB libconftest.a" >&5 - $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF -int main() { return 0;} -_LT_EOF - echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 - $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err - _lt_result=$? - if test -s conftest.err && $GREP force_load conftest.err; then - cat conftest.err >&5 - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then - lt_cv_ld_force_load=yes - else - cat conftest.err >&5 - fi - rm -f conftest.err libconftest.a conftest conftest.c - rm -rf conftest.dSYM - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 -$as_echo "$lt_cv_ld_force_load" >&6; } - case $host_os in - rhapsody* | darwin1.[012]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; - darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[91]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[012]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + lt_prog_compiler_pic='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' + ;; esac - ;; - esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then - _lt_dar_single_mod='$single_module' - fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' - else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then - _lt_dsymutil='~$DSYMUTIL $lib || :' - else - _lt_dsymutil= - fi - ;; - esac + ;; -for ac_header in dlfcn.h -do : - ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default -" -if test "x$ac_cv_header_dlfcn_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_DLFCN_H 1 -_ACEOF + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; -fi + mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries + lt_prog_compiler_pic='-DDLL_EXPORT' + ;; -done + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + lt_prog_compiler_pic='-fno-common' + ;; + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + lt_prog_compiler_static= + ;; + hpux*) + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. + case $host_cpu in + hppa*64*) + # +Z the default + ;; + *) + lt_prog_compiler_pic='-fPIC' + ;; + esac + ;; + interix[3-9]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + msdosdjgpp*) + # Just because we use GCC doesn't mean we suddenly get shared libraries + # on systems that don't support them. + lt_prog_compiler_can_build_shared=no + enable_shared=no + ;; -# Set options -enable_win32_dll=yes + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + lt_prog_compiler_pic='-fPIC -shared' + ;; -case $host in -*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. -set dummy ${ac_tool_prefix}as; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AS+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$AS"; then - ac_cv_prog_AS="$AS" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AS="${ac_tool_prefix}as" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS + sysv4*MP*) + if test -d /usr/nec; then + lt_prog_compiler_pic=-Kconform_pic + fi + ;; -fi -fi -AS=$ac_cv_prog_AS -if test -n "$AS"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5 -$as_echo "$AS" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi + *) + lt_prog_compiler_pic='-fPIC' + ;; + esac + case $cc_basename in + nvcc*) # Cuda Compiler Driver 2.2 + lt_prog_compiler_wl='-Xlinker ' + if test -n "$lt_prog_compiler_pic"; then + lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" + fi + ;; + esac + else + # PORTME Check for flag to pass linker flags through the system compiler. + case $host_os in + aix*) + lt_prog_compiler_wl='-Wl,' + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static='-Bstatic' + else + lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' + fi + ;; -fi -if test -z "$ac_cv_prog_AS"; then - ac_ct_AS=$AS - # Extract the first word of "as", so it can be a program name with args. -set dummy as; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_AS+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_AS"; then - ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_AS="as" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS + mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic='-DDLL_EXPORT' + ;; -fi -fi -ac_ct_AS=$ac_cv_prog_ac_ct_AS -if test -n "$ac_ct_AS"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5 -$as_echo "$ac_ct_AS" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi + hpux9* | hpux10* | hpux11*) + lt_prog_compiler_wl='-Wl,' + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + lt_prog_compiler_pic='+Z' + ;; + esac + # Is there a better lt_prog_compiler_static that works with the bundled CC? + lt_prog_compiler_static='${wl}-a ${wl}archive' + ;; - if test "x$ac_ct_AS" = x; then - AS="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - AS=$ac_ct_AS - fi -else - AS="$ac_cv_prog_AS" -fi + irix5* | irix6* | nonstopux*) + lt_prog_compiler_wl='-Wl,' + # PIC (with -KPIC) is the default. + lt_prog_compiler_static='-non_shared' + ;; - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DLLTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$DLLTOOL"; then - ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + case $cc_basename in + # old Intel for x86_64 which still supported -KPIC. + ecc*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-static' + ;; + # icc used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + icc* | ifort*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + # Lahey Fortran 8.1. + lf95*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='--shared' + lt_prog_compiler_static='--static' + ;; + nagfor*) + # NAG Fortran compiler + lt_prog_compiler_wl='-Wl,-Wl,,' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-Bstatic' + ;; + ccc*) + lt_prog_compiler_wl='-Wl,' + # All Alpha code is PIC. + lt_prog_compiler_static='-non_shared' + ;; + xl* | bgxl* | bgf* | mpixl*) + # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-qpic' + lt_prog_compiler_static='-qstaticlink' + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='' + ;; + *Sun\ F* | *Sun*Fortran*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Qoption ld ' + ;; + *Sun\ C*) + # Sun C 5.9 + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Wl,' + ;; + *Intel*\ [CF]*Compiler*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + *Portland\ Group*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-Bstatic' + ;; + esac + ;; + esac + ;; -fi -fi -DLLTOOL=$ac_cv_prog_DLLTOOL -if test -n "$DLLTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -$as_echo "$DLLTOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi + newsos6) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + lt_prog_compiler_pic='-fPIC -shared' + ;; -fi -if test -z "$ac_cv_prog_DLLTOOL"; then - ac_ct_DLLTOOL=$DLLTOOL - # Extract the first word of "dlltool", so it can be a program name with args. -set dummy dlltool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_DLLTOOL"; then - ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_DLLTOOL="dlltool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS + osf3* | osf4* | osf5*) + lt_prog_compiler_wl='-Wl,' + # All OSF/1 code is PIC. + lt_prog_compiler_static='-non_shared' + ;; -fi -fi -ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -if test -n "$ac_ct_DLLTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -$as_echo "$ac_ct_DLLTOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi + rdos*) + lt_prog_compiler_static='-non_shared' + ;; - if test "x$ac_ct_DLLTOOL" = x; then - DLLTOOL="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - DLLTOOL=$ac_ct_DLLTOOL + solaris*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + case $cc_basename in + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) + lt_prog_compiler_wl='-Qoption ld ';; + *) + lt_prog_compiler_wl='-Wl,';; + esac + ;; + + sunos4*) + lt_prog_compiler_wl='-Qoption ld ' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; + + sysv4 | sysv4.2uw2* | sysv4.3*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; + + sysv4*MP*) + if test -d /usr/nec ;then + lt_prog_compiler_pic='-Kconform_pic' + lt_prog_compiler_static='-Bstatic' + fi + ;; + + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; + + unicos*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_can_build_shared=no + ;; + + uts4*) + lt_prog_compiler_pic='-pic' + lt_prog_compiler_static='-Bstatic' + ;; + + *) + lt_prog_compiler_can_build_shared=no + ;; + esac fi + +case $host_os in + # For platforms which do not support PIC, -DPIC is meaningless: + *djgpp*) + lt_prog_compiler_pic= + ;; + *) + lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" + ;; +esac + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } +if ${lt_cv_prog_compiler_pic+:} false; then : + $as_echo_n "(cached) " >&6 else - DLLTOOL="$ac_cv_prog_DLLTOOL" + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 +$as_echo "$lt_cv_prog_compiler_pic" >&6; } +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. -set dummy ${ac_tool_prefix}objdump; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OBJDUMP+:} false; then : +# +# Check to make sure the PIC flag actually works. +# +if test -n "$lt_prog_compiler_pic"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } +if ${lt_cv_prog_compiler_pic_works+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$OBJDUMP"; then - ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -OBJDUMP=$ac_cv_prog_OBJDUMP -if test -n "$OBJDUMP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 -$as_echo "$OBJDUMP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - + lt_cv_prog_compiler_pic_works=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic -DPIC" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_pic_works=yes + fi + fi + $RM conftest* fi -if test -z "$ac_cv_prog_OBJDUMP"; then - ac_ct_OBJDUMP=$OBJDUMP - # Extract the first word of "objdump", so it can be a program name with args. -set dummy objdump; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_OBJDUMP"; then - ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_OBJDUMP="objdump" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 +$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } -fi -fi -ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP -if test -n "$ac_ct_OBJDUMP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 -$as_echo "$ac_ct_OBJDUMP" >&6; } +if test x"$lt_cv_prog_compiler_pic_works" = xyes; then + case $lt_prog_compiler_pic in + "" | " "*) ;; + *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; + esac else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + lt_prog_compiler_pic= + lt_prog_compiler_can_build_shared=no fi - if test "x$ac_ct_OBJDUMP" = x; then - OBJDUMP="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - OBJDUMP=$ac_ct_OBJDUMP - fi -else - OBJDUMP="$ac_cv_prog_OBJDUMP" fi - ;; -esac - -test -z "$AS" && AS=as - - - - - -test -z "$DLLTOOL" && DLLTOOL=dlltool - - - -test -z "$OBJDUMP" && OBJDUMP=objdump @@ -8765,31 +8269,46 @@ test -z "$OBJDUMP" && OBJDUMP=objdump - enable_dlopen=no +# +# Check to make sure the static flag actually works. +# +wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +if ${lt_cv_prog_compiler_static_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_static_works=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_static_works=yes + fi + else + lt_cv_prog_compiler_static_works=yes + fi + fi + $RM -r conftest* + LDFLAGS="$save_LDFLAGS" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 +$as_echo "$lt_cv_prog_compiler_static_works" >&6; } - # Check whether --enable-shared was given. -if test "${enable_shared+set}" = set; then : - enableval=$enable_shared; p=${PACKAGE-default} - case $enableval in - yes) enable_shared=yes ;; - no) enable_shared=no ;; - *) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac +if test x"$lt_cv_prog_compiler_static_works" = xyes; then + : else - enable_shared=yes + lt_prog_compiler_static= fi @@ -8798,92 +8317,134 @@ fi - - - # Check whether --enable-static was given. -if test "${enable_static+set}" = set; then : - enableval=$enable_static; p=${PACKAGE-default} - case $enableval in - yes) enable_static=yes ;; - no) enable_static=no ;; - *) - enable_static=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if ${lt_cv_prog_compiler_c_o+:} false; then : + $as_echo_n "(cached) " >&6 else - enable_static=yes -fi - - + lt_cv_prog_compiler_c_o=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o=yes + fi + fi + chmod u+w . 2>&5 + $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out + cd .. + $RM -r conftest + $RM conftest* +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +$as_echo "$lt_cv_prog_compiler_c_o" >&6; } -# Check whether --with-pic was given. -if test "${with_pic+set}" = set; then : - withval=$with_pic; lt_p=${PACKAGE-default} - case $withval in - yes|no) pic_mode=$withval ;; - *) - pic_mode=default - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for lt_pkg in $withval; do - IFS="$lt_save_ifs" - if test "X$lt_pkg" = "X$lt_p"; then - pic_mode=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if ${lt_cv_prog_compiler_c_o+:} false; then : + $as_echo_n "(cached) " >&6 else - pic_mode=default -fi - - -test -z "$pic_mode" && pic_mode=default - + lt_cv_prog_compiler_c_o=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o=yes + fi + fi + chmod u+w . 2>&5 + $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out + cd .. + $RM -r conftest + $RM conftest* +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +$as_echo "$lt_cv_prog_compiler_c_o" >&6; } - # Check whether --enable-fast-install was given. -if test "${enable_fast_install+set}" = set; then : - enableval=$enable_fast_install; p=${PACKAGE-default} - case $enableval in - yes) enable_fast_install=yes ;; - no) enable_fast_install=no ;; - *) - enable_fast_install=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_fast_install=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac +hard_links="nottested" +if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 +$as_echo_n "checking if we can lock with hard links... " >&6; } + hard_links=yes + $RM conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 +$as_echo "$hard_links" >&6; } + if test "$hard_links" = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + need_locks=warn + fi else - enable_fast_install=yes + need_locks=no fi @@ -8891,2207 +8452,1251 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + runpath_var= + allow_undefined_flag= + always_export_symbols=no + archive_cmds= + archive_expsym_cmds= + compiler_needs_object=no + enable_shared_with_static_runtimes=no + export_dynamic_flag_spec= + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + hardcode_automatic=no + hardcode_direct=no + hardcode_direct_absolute=no + hardcode_libdir_flag_spec= + hardcode_libdir_separator= + hardcode_minus_L=no + hardcode_shlibpath_var=unsupported + inherit_rpath=no + link_all_deplibs=unknown + module_cmds= + module_expsym_cmds= + old_archive_from_new_cmds= + old_archive_from_expsyms_cmds= + thread_safe_flag_spec= + whole_archive_flag_spec= + # include_expsyms should be a list of space-separated symbols to be *always* + # included in the symbol list + include_expsyms= + # exclude_expsyms can be an extended regexp of symbols to exclude + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. + exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. + extract_expsyms_cmds= + case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + if test "$GCC" != yes; then + with_gnu_ld=no + fi + ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; + openbsd*) + with_gnu_ld=no + ;; + linux* | k*bsd*-gnu | gnu*) + link_all_deplibs=no + ;; + esac + ld_shlibs=yes + # On some targets, GNU ld is compatible enough with the native linker + # that we're better off using the native interface for both. + lt_use_gnu_ld_interface=no + if test "$with_gnu_ld" = yes; then + case $host_os in + aix*) + # The AIX port of GNU ld has always aspired to compatibility + # with the native linker. However, as the warning in the GNU ld + # block says, versions before 2.19.5* couldn't really create working + # shared libraries, regardless of the interface used. + case `$LD -v 2>&1` in + *\ \(GNU\ Binutils\)\ 2.19.5*) ;; + *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;; + *\ \(GNU\ Binutils\)\ [3-9]*) ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + fi -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" - -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' - - - - - - - - - + if test "$lt_use_gnu_ld_interface" = yes; then + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='${wl}' + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + export_dynamic_flag_spec='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then + whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + whole_archive_flag_spec= + fi + supports_anon_versioning=no + case `$LD -v 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + # See if GNU ld supports shared libraries. + case $host_os in + aix[3-9]*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + ld_shlibs=no + cat <<_LT_EOF 1>&2 +*** Warning: the GNU linker, at least up to release 2.19, is reported +*** to be unable to reliably create shared libraries on AIX. +*** Therefore, libtool is disabling shared libraries support. If you +*** really care for shared libraries, you may want to install binutils +*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. +*** You will then need to restart the configuration process. +_LT_EOF + fi + ;; + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac + ;; + beos*) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + allow_undefined_flag=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + ld_shlibs=no + fi + ;; + cygwin* | mingw* | pw32* | cegcc*) + # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, + # as there is no search path for DLLs. + hardcode_libdir_flag_spec='-L$libdir' + export_dynamic_flag_spec='${wl}--export-all-symbols' + allow_undefined_flag=unsupported + always_export_symbols=no + enable_shared_with_static_runtimes=yes + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + ld_shlibs=no + fi + ;; + haiku*) + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + link_all_deplibs=yes + ;; + interix[3-9]*) + hardcode_direct=no + hardcode_shlibpath_var=no + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + export_dynamic_flag_spec='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + tmp_diet=no + if test "$host_os" = linux-dietlibc; then + case $cc_basename in + diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) + esac + fi + if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ + && test "$tmp_diet" = no + then + tmp_addflag=' $pic_flag' + tmp_sharedflag='-shared' + case $cc_basename,$host_cpu in + pgcc*) # Portland Group C compiler + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag' + ;; + pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group f77 and f90 compilers + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + lf95*) # Lahey Fortran 8.1 + whole_archive_flag_spec= + tmp_sharedflag='--shared' ;; + xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) + tmp_sharedflag='-qmkshrobj' + tmp_addflag= ;; + nvcc*) # Cuda Compiler Driver 2.2 + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + compiler_needs_object=yes + ;; + esac + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C 5.9 + whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + compiler_needs_object=yes + tmp_sharedflag='-G' ;; + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + esac + archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then + archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi + case $cc_basename in + xlf* | bgf* | bgxlf* | mpixlf*) + # IBM XL Fortran 10.1 on PPC cannot create shared libs itself + whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then + archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + fi + ;; + esac + else + ld_shlibs=no + fi + ;; + netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + solaris*) + if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then + ld_shlibs=no + cat <<_LT_EOF 1>&2 +*** Warning: The releases 2.8.* of the GNU linker cannot reliably +*** create shared libraries on Solaris systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.9.1 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. +_LT_EOF + elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi + ;; + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) + ld_shlibs=no + cat <<_LT_EOF 1>&2 +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. +_LT_EOF + ;; + *) + # For security reasons, it is highly recommended that you always + # use absolute paths for naming shared libraries, and exclude the + # DT_RUNPATH tag from executables and libraries. But doing so + # requires that you compile everything twice, which is a pain. + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi + ;; + esac + ;; -test -z "$LN_S" && LN_S="ln -s" + sunos4*) + archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + wlarc= + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; + *) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi + ;; + esac + if test "$ld_shlibs" = no; then + runpath_var= + hardcode_libdir_flag_spec= + export_dynamic_flag_spec= + whole_archive_flag_spec= + fi + else + # PORTME fill in a description of your system's linker (not GNU ld) + case $host_os in + aix3*) + allow_undefined_flag=unsupported + always_export_symbols=yes + archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. + hardcode_minus_L=yes + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. + hardcode_direct=unsupported + fi + ;; + aix[4-9]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + # Also, AIX nm treats weak defined symbols like other global + # defined symbols, whereas GNU nm marks them as "W". + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + else + export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + fi + aix_use_runtimelinking=no + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes + break + fi + done + ;; + esac + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + archive_cmds='' + hardcode_direct=yes + hardcode_direct_absolute=yes + hardcode_libdir_separator=':' + link_all_deplibs=yes + file_list_spec='${wl}-f,' + if test "$GCC" = yes; then + case $host_os in aix4.[012]|aix4.[012].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then + # We have reworked collect2 + : + else + # We have old collect2 + hardcode_direct=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + hardcode_minus_L=yes + hardcode_libdir_flag_spec='-L$libdir' + hardcode_libdir_separator= + fi + ;; + esac + shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi + link_all_deplibs=no + else + # not using gcc + if test "$host_cpu" = ia64; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi + fi + fi + export_dynamic_flag_spec='${wl}-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + always_export_symbols=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + allow_undefined_flag='-berok' + # Determine the default libpath from the value encoded in an + # empty executable. + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int +main () +{ + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_="/usr/lib:/lib" + fi +fi -if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST + aix_libpath=$lt_cv_aix_libpath_ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 -$as_echo_n "checking for objdir... " >&6; } -if ${lt_cv_objdir+:} false; then : - $as_echo_n "(cached) " >&6 + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' + allow_undefined_flag="-z nodefs" + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an + # empty executable. + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath else - rm -f .libs 2>/dev/null -mkdir .libs 2>/dev/null -if test -d .libs; then - lt_cv_objdir=.libs + if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 else - # MS-DOS does not allow filenames that begin with a dot. - lt_cv_objdir=_libs -fi -rmdir .libs 2>/dev/null -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 -$as_echo "$lt_cv_objdir" >&6; } -objdir=$lt_cv_objdir - - - + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int +main () +{ -cat >>confdefs.h <<_ACEOF -#define LT_OBJDIR "$lt_cv_objdir/" + ; + return 0; +} _ACEOF +if ac_fn_c_try_link "$LINENO"; then : - - - -case $host_os in -aix3*) - # AIX sometimes has problems with the GCC collect2 program. For some - # reason, if we set the COLLECT_NAMES environment variable, the problems - # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_="/usr/lib:/lib" fi - ;; -esac - -# Global variables: -ofile=libtool -can_build_shared=yes - -# All known linkers require a `.a' archive for static linking (except MSVC, -# which needs '.lib'). -libext=a -with_gnu_ld="$lt_cv_prog_gnu_ld" +fi -old_CC="$CC" -old_CFLAGS="$CFLAGS" + aix_libpath=$lt_cv_aix_libpath_ +fi -# Set sane defaults for various variables -test -z "$CC" && CC=cc -test -z "$LTCC" && LTCC=$CC -test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -test -z "$LD" && LD=ld -test -z "$ac_objext" && ac_objext=o + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + no_undefined_flag=' ${wl}-bernotok' + allow_undefined_flag=' ${wl}-berok' + if test "$with_gnu_ld" = yes; then + # We only use this code for GNU lds that support --whole-archive. + whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + whole_archive_flag_spec='$convenience' + fi + archive_cmds_need_lc=yes + # This is similar to how AIX traditionally builds its shared libraries. + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac + ;; + bsdi[45]*) + export_dynamic_flag_spec=-rdynamic + ;; -# Only perform the check for file, if the check method requires it -test -z "$MAGIC_CMD" && MAGIC_CMD=file -case $deplibs_check_method in -file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 -$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } -if ${lt_cv_path_MAGIC_CMD+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $MAGIC_CMD in -[\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; -*) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" - for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/${ac_tool_prefix}file; then - lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : - else - cat <<_LT_EOF 1>&2 - -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org - -_LT_EOF - fi ;; - esac - fi - break - fi - done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; -esac -fi - -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 -$as_echo "$MAGIC_CMD" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - - - -if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 -$as_echo_n "checking for file... " >&6; } -if ${lt_cv_path_MAGIC_CMD+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $MAGIC_CMD in -[\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; -*) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" - for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/file; then - lt_cv_path_MAGIC_CMD="$ac_dir/file" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : + cygwin* | mingw* | pw32* | cegcc*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + case $cc_basename in + cl*) + # Native MSVC + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + always_export_symbols=yes + file_list_spec='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; else - cat <<_LT_EOF 1>&2 - -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' + enable_shared_with_static_runtimes=yes + exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + # Don't use ranlib + old_postinstall_cmds='chmod 644 $oldlib' + postlink_cmds='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # Assume MSVC wrapper + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + old_archive_from_new_cmds='true' + # FIXME: Should let the user specify the lib program. + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' + enable_shared_with_static_runtimes=yes + ;; + esac + ;; -_LT_EOF - fi ;; - esac - fi - break - fi - done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; -esac -fi + darwin* | rhapsody*) -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 -$as_echo "$MAGIC_CMD" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi + archive_cmds_need_lc=no + hardcode_direct=no + hardcode_automatic=yes + hardcode_shlibpath_var=unsupported + if test "$lt_cv_ld_force_load" = "yes"; then + whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' else - MAGIC_CMD=: + whole_archive_flag_spec='' fi -fi + link_all_deplibs=yes + allow_undefined_flag="$_lt_dar_allow_undefined" + case $cc_basename in + ifort*) _lt_dar_can_shared=yes ;; + *) _lt_dar_can_shared=$GCC ;; + esac + if test "$_lt_dar_can_shared" = "yes"; then + output_verbose_link_cmd=func_echo_all + archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + else + ld_shlibs=no fi - ;; -esac -# Use C for the default configuration in the libtool script - -lt_save_CC="$CC" -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -# Source file extension for C test sources. -ac_ext=c - -# Object file extension for compiled C test sources. -objext=o -objext=$objext + ;; -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;" + dgux*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_shlibpath_var=no + ;; -# Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}' + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor + # support. Future versions do this automatically, but an explicit c++rt0.o + # does not break anything, and helps significantly (at the cost of a little + # extra space). + freebsd2.2*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; + # Unfortunately, older versions of FreeBSD 2 do not have this feature. + freebsd2.*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes + hardcode_minus_L=yes + hardcode_shlibpath_var=no + ;; + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | dragonfly*) + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; + hpux9*) + if test "$GCC" = yes; then + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + fi + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + hardcode_direct=yes + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + export_dynamic_flag_spec='${wl}-E' + ;; + hpux10*) + if test "$GCC" = yes && test "$with_gnu_ld" = no; then + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + hardcode_direct=yes + hardcode_direct_absolute=yes + export_dynamic_flag_spec='${wl}-E' + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + fi + ;; + hpux11*) + if test "$GCC" = yes && test "$with_gnu_ld" = no; then + case $host_cpu in + hppa*64*) + archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else + case $host_cpu in + hppa*64*) + archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} - -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - -# Allow CC to be a program name with arguments. -compiler=$CC - -# Save the default compiler, since it gets overwritten when the other -# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. -compiler_DEFAULT=$CC - -# save warnings/boilerplate of simple test code -ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$RM conftest* - -ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$RM -r conftest* - - -if test -n "$compiler"; then - -lt_prog_compiler_no_builtin_flag= - -if test "$GCC" = yes; then - case $cc_basename in - nvcc*) - lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; - *) - lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;; - esac - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } -if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : + # Older versions of the 11.00 compiler do not understand -b yet + # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 +$as_echo_n "checking if $CC understands -b... " >&6; } +if ${lt_cv_prog_compiler__b+:} false; then : $as_echo_n "(cached) " >&6 else - lt_cv_prog_compiler_rtti_exceptions=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="-fno-rtti -fno-exceptions" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_rtti_exceptions=yes + lt_cv_prog_compiler__b=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -b" + echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler__b=yes + fi + else + lt_cv_prog_compiler__b=yes fi fi - $RM conftest* + $RM -r conftest* + LDFLAGS="$save_LDFLAGS" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 +$as_echo "$lt_cv_prog_compiler__b" >&6; } -if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then - lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" +if test x"$lt_cv_prog_compiler__b" = xyes; then + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else - : -fi - + archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi + ;; + esac + fi + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + case $host_cpu in + hppa*64*|ia64*) + hardcode_direct=no + hardcode_shlibpath_var=no + ;; + *) + hardcode_direct=yes + hardcode_direct_absolute=yes + export_dynamic_flag_spec='${wl}-E' + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + ;; + esac + fi + ;; + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + # Try to use the -exported_symbol ld option, if it does not + # work, assume that -exports_file does not work either and + # implicitly export all symbols. + # This should be the same for all languages, so no per-tag cache variable. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } +if ${lt_cv_irix_exported_symbol+:} false; then : + $as_echo_n "(cached) " >&6 +else + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int foo (void) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + lt_cv_irix_exported_symbol=yes +else + lt_cv_irix_exported_symbol=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 +$as_echo "$lt_cv_irix_exported_symbol" >&6; } + if test "$lt_cv_irix_exported_symbol" = yes; then + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + fi + else + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + fi + archive_cmds_need_lc='no' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + inherit_rpath=yes + link_all_deplibs=yes + ;; - - lt_prog_compiler_wl= -lt_prog_compiler_pic= -lt_prog_compiler_static= - - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_static='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static='-Bstatic' + netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else + archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF fi + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no ;; - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - lt_prog_compiler_pic='-fPIC' - ;; - m68k) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' - ;; - esac + newsos6) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + hardcode_shlibpath_var=no ;; - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. + *nto* | *qnx*) ;; - mingw* | cygwin* | pw32* | os2* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - lt_prog_compiler_pic='-DDLL_EXPORT' + openbsd*) + if test -f /usr/libexec/ld.so; then + hardcode_direct=yes + hardcode_shlibpath_var=no + hardcode_direct_absolute=yes + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + export_dynamic_flag_spec='${wl}-E' + else + case $host_os in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-R$libdir' + ;; + *) + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + ;; + esac + fi + else + ld_shlibs=no + fi ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - lt_prog_compiler_pic='-fno-common' + os2*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + allow_undefined_flag=unsupported + archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ;; - haiku*) - # PIC is the default for Haiku. - # The "-static" flag exists, but is broken. - lt_prog_compiler_static= + osf3*) + if test "$GCC" = yes; then + allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + allow_undefined_flag=' -expect_unresolved \*' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + fi + archive_cmds_need_lc='no' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: ;; - hpux*) - # PIC is the default for 64-bit PA HP-UX, but not for 32-bit - # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag - # sets the default TLS model and affects inlining. - case $host_cpu in - hppa*64*) - # +Z the default - ;; + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test "$GCC" = yes; then + allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + else + allow_undefined_flag=' -expect_unresolved \*' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ + $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + + # Both c and cxx compiler support -rpath directly + hardcode_libdir_flag_spec='-rpath $libdir' + fi + archive_cmds_need_lc='no' + hardcode_libdir_separator=: + ;; + + solaris*) + no_undefined_flag=' -z defs' + if test "$GCC" = yes; then + wlarc='${wl}' + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + else + case `$CC -V 2>&1` in + *"Compilers 5.0"*) + wlarc='' + archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + ;; + *) + wlarc='${wl}' + archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + ;; + esac + fi + hardcode_libdir_flag_spec='-R$libdir' + hardcode_shlibpath_var=no + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; *) - lt_prog_compiler_pic='-fPIC' + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. GCC discards it without `$wl', + # but is careful enough not to reorder. + # Supported since Solaris 2.6 (maybe 2.5.1?) + if test "$GCC" = yes; then + whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + else + whole_archive_flag_spec='-z allextract$convenience -z defaultextract' + fi ;; esac + link_all_deplibs=yes ;; - interix[3-9]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. + sunos4*) + if test "x$host_vendor" = xsequent; then + # Use $CC to link under sequent, because it throws in some extra .o + # files that make .init and .fini sections work. + archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' + fi + hardcode_libdir_flag_spec='-L$libdir' + hardcode_direct=yes + hardcode_minus_L=yes + hardcode_shlibpath_var=no ;; - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries - # on systems that don't support them. - lt_prog_compiler_can_build_shared=no - enable_shared=no + sysv4) + case $host_vendor in + sni) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes # is this really true??? + ;; + siemens) + ## LD is ld it makes a PLAMLIB + ## CC just makes a GrossModule. + archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' + reload_cmds='$CC -r -o $output$reload_objs' + hardcode_direct=no + ;; + motorola) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=no #Motorola manual says yes, but my tests say they lie + ;; + esac + runpath_var='LD_RUN_PATH' + hardcode_shlibpath_var=no ;; - *nto* | *qnx*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - lt_prog_compiler_pic='-fPIC -shared' + sysv4.3*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var=no + export_dynamic_flag_spec='-Bexport' ;; sysv4*MP*) if test -d /usr/nec; then - lt_prog_compiler_pic=-Kconform_pic + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var=no + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + ld_shlibs=yes fi ;; - *) - lt_prog_compiler_pic='-fPIC' - ;; - esac + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) + no_undefined_flag='${wl}-z,text' + archive_cmds_need_lc=no + hardcode_shlibpath_var=no + runpath_var='LD_RUN_PATH' - case $cc_basename in - nvcc*) # Cuda Compiler Driver 2.2 - lt_prog_compiler_wl='-Xlinker ' - if test -n "$lt_prog_compiler_pic"; then - lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" + if test "$GCC" = yes; then + archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; - esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - lt_prog_compiler_wl='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static='-Bstatic' + + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + no_undefined_flag='${wl}-z,text' + allow_undefined_flag='${wl}-z,nodefs' + archive_cmds_need_lc=no + hardcode_shlibpath_var=no + hardcode_libdir_flag_spec='${wl}-R,$libdir' + hardcode_libdir_separator=':' + link_all_deplibs=yes + export_dynamic_flag_spec='${wl}-Bexport' + runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' + archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; - mingw* | cygwin* | pw32* | os2* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - lt_prog_compiler_pic='-DDLL_EXPORT' + uts4*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_shlibpath_var=no ;; - hpux9* | hpux10* | hpux11*) - lt_prog_compiler_wl='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic='+Z' + *) + ld_shlibs=no + ;; + esac + + if test x$host_vendor = xsni; then + case $host in + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + export_dynamic_flag_spec='${wl}-Blargedynsym' ;; esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? - lt_prog_compiler_static='${wl}-a ${wl}archive' - ;; + fi + fi - irix5* | irix6* | nonstopux*) - lt_prog_compiler_wl='-Wl,' - # PIC (with -KPIC) is the default. - lt_prog_compiler_static='-non_shared' - ;; +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 +$as_echo "$ld_shlibs" >&6; } +test "$ld_shlibs" = no && can_build_shared=no - linux* | k*bsd*-gnu | kopensolaris*-gnu) - case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. - ecc*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-static' - ;; - # icc used to be incompatible with GCC. - # ICC 10 doesn't accept -KPIC any more. - icc* | ifort*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fPIC' - lt_prog_compiler_static='-static' - ;; - # Lahey Fortran 8.1. - lf95*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; - nagfor*) - # NAG Fortran compiler - lt_prog_compiler_wl='-Wl,-Wl,,' - lt_prog_compiler_pic='-PIC' - lt_prog_compiler_static='-Bstatic' - ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fpic' - lt_prog_compiler_static='-Bstatic' - ;; - ccc*) - lt_prog_compiler_wl='-Wl,' - # All Alpha code is PIC. - lt_prog_compiler_static='-non_shared' - ;; - xl* | bgxl* | bgf* | mpixl*) - # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-qpic' - lt_prog_compiler_static='-qstaticlink' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='' - ;; - *Sun\ F* | *Sun*Fortran*) - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='-Qoption ld ' - ;; - *Sun\ C*) - # Sun C 5.9 - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='-Wl,' - ;; - *Intel*\ [CF]*Compiler*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fPIC' - lt_prog_compiler_static='-static' - ;; - *Portland\ Group*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fpic' - lt_prog_compiler_static='-Bstatic' - ;; - esac - ;; - esac - ;; +with_gnu_ld=$with_gnu_ld - newsos6) - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; - *nto* | *qnx*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - lt_prog_compiler_pic='-fPIC -shared' - ;; - osf3* | osf4* | osf5*) - lt_prog_compiler_wl='-Wl,' - # All OSF/1 code is PIC. - lt_prog_compiler_static='-non_shared' - ;; - rdos*) - lt_prog_compiler_static='-non_shared' - ;; - solaris*) - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in - f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; - esac - ;; - sunos4*) - lt_prog_compiler_wl='-Qoption ld ' - lt_prog_compiler_pic='-PIC' - lt_prog_compiler_static='-Bstatic' - ;; - sysv4 | sysv4.2uw2* | sysv4.3*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; - sysv4*MP*) - if test -d /usr/nec ;then - lt_prog_compiler_pic='-Kconform_pic' - lt_prog_compiler_static='-Bstatic' - fi - ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; - unicos*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_can_build_shared=no - ;; - uts4*) - lt_prog_compiler_pic='-pic' - lt_prog_compiler_static='-Bstatic' - ;; - *) - lt_prog_compiler_can_build_shared=no - ;; - esac - fi -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic= - ;; - *) - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; -esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -if ${lt_cv_prog_compiler_pic+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -$as_echo "$lt_cv_prog_compiler_pic" >&6; } -lt_prog_compiler_pic=$lt_cv_prog_compiler_pic # -# Check to make sure the PIC flag actually works. +# Do we need to explicitly link libc? # -if test -n "$lt_prog_compiler_pic"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 -$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } -if ${lt_cv_prog_compiler_pic_works+:} false; then : +case "x$archive_cmds_need_lc" in +x|xyes) + # Assume -lc should be added + archive_cmds_need_lc=yes + + if test "$enable_shared" = yes && test "$GCC" = yes; then + case $archive_cmds in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. + ;; + '$CC '*) + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 +$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } +if ${lt_cv_archive_cmds_need_lc+:} false; then : $as_echo_n "(cached) " >&6 else - lt_cv_prog_compiler_pic_works=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic -DPIC" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_pic_works=yes - fi - fi - $RM conftest* + $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 -$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$lt_prog_compiler_wl + pic_flag=$lt_prog_compiler_pic + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag + allow_undefined_flag= + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 + (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + then + lt_cv_archive_cmds_need_lc=no + else + lt_cv_archive_cmds_need_lc=yes + fi + allow_undefined_flag=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* -if test x"$lt_cv_prog_compiler_pic_works" = xyes; then - case $lt_prog_compiler_pic in - "" | " "*) ;; - *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; - esac -else - lt_prog_compiler_pic= - lt_prog_compiler_can_build_shared=no fi - -fi - - - - - - - - - - - -# -# Check to make sure the static flag actually works. -# -wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if ${lt_cv_prog_compiler_static_works+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_static_works=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 - $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_static_works=yes - fi - else - lt_cv_prog_compiler_static_works=yes - fi - fi - $RM -r conftest* - LDFLAGS="$save_LDFLAGS" - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 -$as_echo "$lt_cv_prog_compiler_static_works" >&6; } - -if test x"$lt_cv_prog_compiler_static_works" = xyes; then - : -else - lt_prog_compiler_static= -fi - - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if ${lt_cv_prog_compiler_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_c_o=no - $RM -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o=yes - fi - fi - chmod u+w . 2>&5 - $RM conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files - $RM out/* && rmdir out - cd .. - $RM -r conftest - $RM conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 -$as_echo "$lt_cv_prog_compiler_c_o" >&6; } - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if ${lt_cv_prog_compiler_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_c_o=no - $RM -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o=yes - fi - fi - chmod u+w . 2>&5 - $RM conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files - $RM out/* && rmdir out - cd .. - $RM -r conftest - $RM conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 -$as_echo "$lt_cv_prog_compiler_c_o" >&6; } - - - - -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 -$as_echo_n "checking if we can lock with hard links... " >&6; } - hard_links=yes - $RM conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 -$as_echo "$hard_links" >&6; } - if test "$hard_links" = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} - need_locks=warn - fi -else - need_locks=no -fi - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } - - runpath_var= - allow_undefined_flag= - always_export_symbols=no - archive_cmds= - archive_expsym_cmds= - compiler_needs_object=no - enable_shared_with_static_runtimes=no - export_dynamic_flag_spec= - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - hardcode_automatic=no - hardcode_direct=no - hardcode_direct_absolute=no - hardcode_libdir_flag_spec= - hardcode_libdir_separator= - hardcode_minus_L=no - hardcode_shlibpath_var=unsupported - inherit_rpath=no - link_all_deplibs=unknown - module_cmds= - module_expsym_cmds= - old_archive_from_new_cmds= - old_archive_from_expsyms_cmds= - thread_safe_flag_spec= - whole_archive_flag_spec= - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list - include_expsyms= - # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. - exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - # Exclude shared library initialization/finalization symbols. - extract_expsyms_cmds= - - case $host_os in - cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi - ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; - openbsd*) - with_gnu_ld=no - ;; - esac - - ld_shlibs=yes - - # On some targets, GNU ld is compatible enough with the native linker - # that we're better off using the native interface for both. - lt_use_gnu_ld_interface=no - if test "$with_gnu_ld" = yes; then - case $host_os in - aix*) - # The AIX port of GNU ld has always aspired to compatibility - # with the native linker. However, as the warning in the GNU ld - # block says, versions before 2.19.5* couldn't really create working - # shared libraries, regardless of the interface used. - case `$LD -v 2>&1` in - *\ \(GNU\ Binutils\)\ 2.19.5*) ;; - *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;; - *\ \(GNU\ Binutils\)\ [3-9]*) ;; - *) - lt_use_gnu_ld_interface=yes - ;; - esac - ;; - *) - lt_use_gnu_ld_interface=yes - ;; - esac - fi - - if test "$lt_use_gnu_ld_interface" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec= - fi - supports_anon_versioning=no - case `$LD -v 2>&1` in - *GNU\ gold*) supports_anon_versioning=yes ;; - *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac - - # See if GNU ld supports shared libraries. - case $host_os in - aix[3-9]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - ld_shlibs=no - cat <<_LT_EOF 1>&2 - -*** Warning: the GNU linker, at least up to release 2.19, is reported -*** to be unable to reliably create shared libraries on AIX. -*** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to install binutils -*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. -*** You will then need to restart the configuration process. - -_LT_EOF - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='' - ;; - m68k) - archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - ;; - esac - ;; - - beos*) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - ld_shlibs=no - fi - ;; - - cygwin* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec='-L$libdir' - export_dynamic_flag_spec='${wl}--export-all-symbols' - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' - exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - ld_shlibs=no - fi - ;; - - haiku*) - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - link_all_deplibs=yes - ;; - - interix[3-9]*) - hardcode_direct=no - hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - - gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) - tmp_diet=no - if test "$host_os" = linux-dietlibc; then - case $cc_basename in - diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) - esac - fi - if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no - then - tmp_addflag=' $pic_flag' - tmp_sharedflag='-shared' - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group f77 and f90 compilers - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 - tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - lf95*) # Lahey Fortran 8.1 - whole_archive_flag_spec= - tmp_sharedflag='--shared' ;; - xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) - tmp_sharedflag='-qmkshrobj' - tmp_addflag= ;; - nvcc*) # Cuda Compiler Driver 2.2 - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - compiler_needs_object=yes - ;; - esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - compiler_needs_object=yes - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 - tmp_sharedflag='-G' ;; - esac - archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - - case $cc_basename in - xlf* | bgf* | bgxlf* | mpixlf*) - # IBM XL Fortran 10.1 on PPC cannot create shared libs itself - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac - else - ld_shlibs=no - fi - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - - solaris*) - if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then - ld_shlibs=no - cat <<_LT_EOF 1>&2 - -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.9.1 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -_LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) - ld_shlibs=no - cat <<_LT_EOF 1>&2 - -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -*** reliably create shared libraries on SCO systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -_LT_EOF - ;; - *) - # For security reasons, it is highly recommended that you always - # use absolute paths for naming shared libraries, and exclude the - # DT_RUNPATH tag from executables and libraries. But doing so - # requires that you compile everything twice, which is a pain. - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - esac - ;; - - sunos4*) - archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - esac - - if test "$ld_shlibs" = no; then - runpath_var= - hardcode_libdir_flag_spec= - export_dynamic_flag_spec= - whole_archive_flag_spec= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - allow_undefined_flag=unsupported - always_export_symbols=yes - archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - hardcode_minus_L=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - hardcode_direct=unsupported - fi - ;; - - aix[4-9]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global - # defined symbols, whereas GNU nm marks them as "W". - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - else - export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - fi - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done - ;; - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - archive_cmds='' - hardcode_direct=yes - hardcode_direct_absolute=yes - hardcode_libdir_separator=':' - link_all_deplibs=yes - file_list_spec='${wl}-f,' - - if test "$GCC" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && - strings "$collect2name" | $GREP resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - hardcode_direct=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - hardcode_minus_L=yes - hardcode_libdir_flag_spec='-L$libdir' - hardcode_libdir_separator= - fi - ;; - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - export_dynamic_flag_spec='${wl}-bexpall' - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - always_export_symbols=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then - aix_libpath=$lt_cv_aix_libpath -else - if ${lt_cv_aix_libpath_+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\([^ ]*\) *$/\1/ - p - } - }' - lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. - if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - fi -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_="/usr/lib:/lib" - fi - -fi - - aix_libpath=$lt_cv_aix_libpath_ -fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' - allow_undefined_flag="-z nodefs" - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an - # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then - aix_libpath=$lt_cv_aix_libpath -else - if ${lt_cv_aix_libpath_+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\([^ ]*\) *$/\1/ - p - } - }' - lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. - if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - fi -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_="/usr/lib:/lib" - fi - -fi - - aix_libpath=$lt_cv_aix_libpath_ -fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - no_undefined_flag=' ${wl}-bernotok' - allow_undefined_flag=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then - # We only use this code for GNU lds that support --whole-archive. - whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - else - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec='$convenience' - fi - archive_cmds_need_lc=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='' - ;; - m68k) - archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - ;; - esac - ;; - - bsdi[45]*) - export_dynamic_flag_spec=-rdynamic - ;; - - cygwin* | mingw* | pw32* | cegcc*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - case $cc_basename in - cl*) - # Native MSVC - hardcode_libdir_flag_spec=' ' - allow_undefined_flag=unsupported - always_export_symbols=yes - file_list_spec='@' - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' - # The linker will not automatically build a static lib if we build a DLL. - # _LT_TAGVAR(old_archive_from_new_cmds, )='true' - enable_shared_with_static_runtimes=yes - exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' - # Don't use ranlib - old_postinstall_cmds='chmod 644 $oldlib' - postlink_cmds='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' - ;; - *) - # Assume MSVC wrapper - hardcode_libdir_flag_spec=' ' - allow_undefined_flag=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - old_archive_from_new_cmds='true' - # FIXME: Should let the user specify the lib program. - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' - enable_shared_with_static_runtimes=yes - ;; - esac - ;; - - darwin* | rhapsody*) - - - archive_cmds_need_lc=no - hardcode_direct=no - hardcode_automatic=yes - hardcode_shlibpath_var=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' - - else - whole_archive_flag_spec='' - fi - link_all_deplibs=yes - allow_undefined_flag="$_lt_dar_allow_undefined" - case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; - *) _lt_dar_can_shared=$GCC ;; - esac - if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=func_echo_all - archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - - else - ld_shlibs=no - fi - - ;; - - dgux*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_shlibpath_var=no - ;; - - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2.*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_minus_L=yes - hardcode_shlibpath_var=no - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - hpux9*) - if test "$GCC" = yes; then - archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - export_dynamic_flag_spec='${wl}-E' - ;; - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - fi - ;; - - hpux11*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else - case $host_cpu in - hppa*64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - - # Older versions of the 11.00 compiler do not understand -b yet - # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 -$as_echo_n "checking if $CC understands -b... " >&6; } -if ${lt_cv_prog_compiler__b+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler__b=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -b" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 - $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler__b=yes - fi - else - lt_cv_prog_compiler__b=yes - fi - fi - $RM -r conftest* - LDFLAGS="$save_LDFLAGS" - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 -$as_echo "$lt_cv_prog_compiler__b" >&6; } - -if test x"$lt_cv_prog_compiler__b" = xyes; then - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' -fi - - ;; - esac - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - - case $host_cpu in - hppa*64*|ia64*) - hardcode_direct=no - hardcode_shlibpath_var=no - ;; - *) - hardcode_direct=yes - hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - ;; - esac - fi - ;; - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. - # This should be the same for all languages, so no per-tag cache variable. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -if ${lt_cv_irix_exported_symbol+:} false; then : - $as_echo_n "(cached) " >&6 -else - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int foo (void) { return 0; } -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - lt_cv_irix_exported_symbol=yes -else - lt_cv_irix_exported_symbol=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -$as_echo "$lt_cv_irix_exported_symbol" >&6; } - if test "$lt_cv_irix_exported_symbol" = yes; then - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' - fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' - fi - archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - inherit_rpath=yes - link_all_deplibs=yes - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - newsos6) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_shlibpath_var=no - ;; - - *nto* | *qnx*) - ;; - - openbsd*) - if test -f /usr/libexec/ld.so; then - hardcode_direct=yes - hardcode_shlibpath_var=no - hardcode_direct_absolute=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' - else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac - fi - else - ld_shlibs=no - fi - ;; - - os2*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - allow_undefined_flag=unsupported - archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - - osf3*) - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - fi - archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; - - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' - - # Both c and cxx compiler support -rpath directly - hardcode_libdir_flag_spec='-rpath $libdir' - fi - archive_cmds_need_lc='no' - hardcode_libdir_separator=: - ;; - - solaris*) - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) - wlarc='' - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' - ;; - *) - wlarc='${wl}' - archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - ;; - esac - fi - hardcode_libdir_flag_spec='-R$libdir' - hardcode_shlibpath_var=no - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', - # but is careful enough not to reorder. - # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - else - whole_archive_flag_spec='-z allextract$convenience -z defaultextract' - fi - ;; - esac - link_all_deplibs=yes - ;; - - sunos4*) - if test "x$host_vendor" = xsequent; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. - archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - hardcode_libdir_flag_spec='-L$libdir' - hardcode_direct=yes - hardcode_minus_L=yes - hardcode_shlibpath_var=no - ;; - - sysv4) - case $host_vendor in - sni) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' - reload_cmds='$CC -r -o $output$reload_objs' - hardcode_direct=no - ;; - motorola) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var=no - ;; - - sysv4.3*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - export_dynamic_flag_spec='-Bexport' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ld_shlibs=yes - fi - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag='${wl}-z,text' - archive_cmds_need_lc=no - hardcode_shlibpath_var=no - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - no_undefined_flag='${wl}-z,text' - allow_undefined_flag='${wl}-z,nodefs' - archive_cmds_need_lc=no - hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-R,$libdir' - hardcode_libdir_separator=':' - link_all_deplibs=yes - export_dynamic_flag_spec='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - uts4*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_shlibpath_var=no - ;; - - *) - ld_shlibs=no - ;; - esac - - if test x$host_vendor = xsni; then - case $host in - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - export_dynamic_flag_spec='${wl}-Blargedynsym' - ;; - esac - fi - fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 -$as_echo "$ld_shlibs" >&6; } -test "$ld_shlibs" = no && can_build_shared=no - -with_gnu_ld=$with_gnu_ld - - - - - - - - - - - - - - - -# -# Do we need to explicitly link libc? -# -case "x$archive_cmds_need_lc" in -x|xyes) - # Assume -lc should be added - archive_cmds_need_lc=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $archive_cmds in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 -$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } -if ${lt_cv_archive_cmds_need_lc+:} false; then : - $as_echo_n "(cached) " >&6 -else - $RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl - pic_flag=$lt_prog_compiler_pic - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag - allow_undefined_flag= - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 - (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - then - lt_cv_archive_cmds_need_lc=no - else - lt_cv_archive_cmds_need_lc=yes - fi - allow_undefined_flag=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 -$as_echo "$lt_cv_archive_cmds_need_lc" >&6; } - archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc - ;; - esac - fi - ;; -esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 +$as_echo "$lt_cv_archive_cmds_need_lc" >&6; } + archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc + ;; + esac + fi + ;; +esac @@ -11598,17 +10203,6 @@ freebsd* | dragonfly*) esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -11725,7 +10319,7 @@ linux*oldld* | linux*aout* | linux*coff*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -11739,428 +10333,2389 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) if ${lt_cv_shlibpath_overrides_runpath+:} false; then : $as_echo_n "(cached) " >&6 else - lt_cv_shlibpath_overrides_runpath=no - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ - LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ + lt_cv_shlibpath_overrides_runpath=no + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ + LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : + lt_cv_shlibpath_overrides_runpath=yes +fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir + +fi + + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on + # powerpc, because MkLinux only supported shared libraries with the + # GNU dynamic linker. Since this was broken with cross compilers, + # most powerpc-linux boxes support dynamic linking these days and + # people can always --disable-shared, the test was removed, and we + # assume the GNU/Linux dynamic linker is in use. + dynamic_linker='GNU/Linux ld.so' + ;; + +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + +netbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' + else + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='NetBSD ld.elf_so' + fi + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + +newsos6) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; + +*nto* | *qnx*) + version_type=qnx + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='ldqnx.so' + ;; + +openbsd*) + version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" + need_lib_prefix=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; + esac + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case $host_os in + openbsd2.[89] | openbsd2.[89].*) + shlibpath_overrides_runpath=no + ;; + *) + shlibpath_overrides_runpath=yes + ;; + esac + else + shlibpath_overrides_runpath=yes + fi + ;; + +os2*) + libname_spec='$name' + shrext_cmds=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' + shlibpath_var=LIBPATH + ;; + +osf3* | osf4* | osf5*) + version_type=osf + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + +rdos*) + dynamic_linker=no + ;; + +solaris*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + # ldd complains unless libraries are executable + postinstall_cmds='chmod +x $lib' + ;; + +sunos4*) + version_type=sunos + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + if test "$with_gnu_ld" = yes; then + need_lib_prefix=no + fi + need_version=yes + ;; + +sysv4 | sysv4.3*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + case $host_vendor in + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no + ;; + motorola) + need_lib_prefix=no + need_version=no + shlibpath_overrides_runpath=no + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' + ;; + esac + ;; + +sysv4*MP*) + if test -d /usr/nec ;then + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' + soname_spec='$libname${shared_ext}.$major' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + +tpf*) + # TPF is a cross-target only. Preferred cross-host = GNU/Linux. + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +uts4*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +*) + dynamic_linker=no + ;; +esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 +$as_echo "$dynamic_linker" >&6; } +test "$dynamic_linker" = no && can_build_shared=no + +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +fi +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" +fi + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 +$as_echo_n "checking how to hardcode library paths into programs... " >&6; } +hardcode_action= +if test -n "$hardcode_libdir_flag_spec" || + test -n "$runpath_var" || + test "X$hardcode_automatic" = "Xyes" ; then + + # We can hardcode non-existent directories. + if test "$hardcode_direct" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && + test "$hardcode_minus_L" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action=unsupported +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 +$as_echo "$hardcode_action" >&6; } + +if test "$hardcode_action" = relink || + test "$inherit_rpath" = yes; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi + + + + + + + if test "x$enable_dlopen" != xyes; then + enable_dlopen=unknown + enable_dlopen_self=unknown + enable_dlopen_self_static=unknown +else + lt_cv_dlopen=no + lt_cv_dlopen_libs= + + case $host_os in + beos*) + lt_cv_dlopen="load_add_on" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ;; + + mingw* | pw32* | cegcc*) + lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen_libs= + ;; + + cygwin*) + lt_cv_dlopen="dlopen" + lt_cv_dlopen_libs= + ;; + + darwin*) + # if libdl is installed we need to link against it + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if ${ac_cv_lib_dl_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dl_dlopen=yes +else + ac_cv_lib_dl_dlopen=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +else + + lt_cv_dlopen="dyld" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + +fi + + ;; + + *) + ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" +if test "x$ac_cv_func_shl_load" = xyes; then : + lt_cv_dlopen="shl_load" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 +$as_echo_n "checking for shl_load in -ldld... " >&6; } +if ${ac_cv_lib_dld_shl_load+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldld $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char shl_load (); +int +main () +{ +return shl_load (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dld_shl_load=yes +else + ac_cv_lib_dld_shl_load=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 +$as_echo "$ac_cv_lib_dld_shl_load" >&6; } +if test "x$ac_cv_lib_dld_shl_load" = xyes; then : + lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" +else + ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" +if test "x$ac_cv_func_dlopen" = xyes; then : + lt_cv_dlopen="dlopen" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if ${ac_cv_lib_dl_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dl_dlopen=yes +else + ac_cv_lib_dl_dlopen=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 +$as_echo_n "checking for dlopen in -lsvld... " >&6; } +if ${ac_cv_lib_svld_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsvld $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_svld_dlopen=yes +else + ac_cv_lib_svld_dlopen=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 +$as_echo "$ac_cv_lib_svld_dlopen" >&6; } +if test "x$ac_cv_lib_svld_dlopen" = xyes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 +$as_echo_n "checking for dld_link in -ldld... " >&6; } +if ${ac_cv_lib_dld_dld_link+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldld $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dld_link (); +int +main () +{ +return dld_link (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dld_dld_link=yes +else + ac_cv_lib_dld_dld_link=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 +$as_echo "$ac_cv_lib_dld_dld_link" >&6; } +if test "x$ac_cv_lib_dld_dld_link" = xyes; then : + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" +fi + + +fi + + +fi + + +fi + + +fi + + +fi + + ;; + esac + + if test "x$lt_cv_dlopen" != xno; then + enable_dlopen=yes + else + enable_dlopen=no + fi + + case $lt_cv_dlopen in + dlopen) + save_CPPFLAGS="$CPPFLAGS" + test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + + save_LDFLAGS="$LDFLAGS" + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 +$as_echo_n "checking whether a program can dlopen itself... " >&6; } +if ${lt_cv_dlopen_self+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self=cross +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +#line $LINENO "configure" +#include "confdefs.h" + +#if HAVE_DLFCN_H +#include +#endif + +#include + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +/* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +int fnord () __attribute__((visibility("default"))); +#endif + +int fnord () { return 42; } +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } + /* dlclose (self); */ + } + else + puts (dlerror ()); + + return status; +} +_LT_EOF + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; + x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; + esac + else : + # compilation failed + lt_cv_dlopen_self=no + fi +fi +rm -fr conftest* + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 +$as_echo "$lt_cv_dlopen_self" >&6; } + + if test "x$lt_cv_dlopen_self" = xyes; then + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 +$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } +if ${lt_cv_dlopen_self_static+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self_static=cross +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +#line $LINENO "configure" +#include "confdefs.h" + +#if HAVE_DLFCN_H +#include +#endif + +#include + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +/* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +int fnord () __attribute__((visibility("default"))); +#endif + +int fnord () { return 42; } +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } + /* dlclose (self); */ + } + else + puts (dlerror ()); + + return status; +} +_LT_EOF + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; + esac + else : + # compilation failed + lt_cv_dlopen_self_static=no + fi +fi +rm -fr conftest* + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 +$as_echo "$lt_cv_dlopen_self_static" >&6; } + fi + + CPPFLAGS="$save_CPPFLAGS" + LDFLAGS="$save_LDFLAGS" + LIBS="$save_LIBS" + ;; + esac + + case $lt_cv_dlopen_self in + yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; + *) enable_dlopen_self=unknown ;; + esac + + case $lt_cv_dlopen_self_static in + yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; + *) enable_dlopen_self_static=unknown ;; + esac +fi + + + + + + + + + + + + + + + + + +striplib= +old_striplib= +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 +$as_echo_n "checking whether stripping libraries is possible... " >&6; } +if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + old_striplib="$STRIP -S" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + ;; + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + ;; + esac +fi + + + + + + + + + + + + + # Report which library types will actually be built + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 +$as_echo_n "checking if libtool supports shared libraries... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 +$as_echo "$can_build_shared" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 +$as_echo_n "checking whether to build shared libraries... " >&6; } + test "$can_build_shared" = "no" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + + aix[4-9]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; + esac + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 +$as_echo "$enable_shared" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 +$as_echo_n "checking whether to build static libraries... " >&6; } + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 +$as_echo "$enable_static" >&6; } + + + + +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +CC="$lt_save_CC" + + + + + + + + + + + + + + + + ac_config_commands="$ac_config_commands libtool" + + + + +# Only expand once: + + + + +# checks for native programs to generate building tool + +if test ${cross_compiling} = yes; then + # Extract the first word of "${build}-gcc", so it can be a program name with args. +set dummy ${build}-gcc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC_BUILD+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC_BUILD"; then + ac_cv_prog_CC_BUILD="$CC_BUILD" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC_BUILD="${build}-gcc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC_BUILD=$ac_cv_prog_CC_BUILD +if test -n "$CC_BUILD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC_BUILD" >&5 +$as_echo "$CC_BUILD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -z "${CC_BUILD}" && # Extract the first word of "gcc", so it can be a program name with args. +set dummy gcc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC_BUILD+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC_BUILD"; then + ac_cv_prog_CC_BUILD="$CC_BUILD" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC_BUILD="gcc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC_BUILD=$ac_cv_prog_CC_BUILD +if test -n "$CC_BUILD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC_BUILD" >&5 +$as_echo "$CC_BUILD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -z "${CC_BUILD}" && # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC_BUILD+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC_BUILD"; then + ac_cv_prog_CC_BUILD="$CC_BUILD" # Let the user override the test. +else + ac_prog_rejected=no +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC_BUILD="cc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC_BUILD + shift + if test $# != 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC_BUILD to just the basename; use the full file name. + shift + ac_cv_prog_CC_BUILD="$as_dir/$ac_word${1+' '}$@" + fi +fi +fi +fi +CC_BUILD=$ac_cv_prog_CC_BUILD +if test -n "$CC_BUILD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC_BUILD" >&5 +$as_echo "$CC_BUILD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -z "${CC_BUILD}" && as_fn_error $? "cannot find native C compiler" "$LINENO" 5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of native executables" >&5 +$as_echo_n "checking for suffix of native executables... " >&6; } + rm -f a.* b.* a_out.exe conftest.* + echo > conftest.c "int main() { return 0;}" + ${CC_BUILD} conftest.c || as_fn_error $? "native C compiler is not working" "$LINENO" 5 + rm -f conftest.c + if test -x a.out -o -x b.out -o -x conftest; then + EXEEXT_BUILD="" + elif test -x a_out.exe -o -x conftest.exe; then + EXEEXT_BUILD=".exe" + elif test -x conftest.*; then + EXEEXT_BUILD=`echo conftest.* | sed -n '1s/^.*\././'` + fi + rm -f a.* b.* a_out.exe conftest.* + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EXEEXT_BUILD" >&5 +$as_echo "$EXEEXT_BUILD" >&6; } +else + CC_BUILD=${CC} + EXEEXT_BUILD=${EXEEXT} +fi + + + + + +# auxiliary programs + +# Extract the first word of "rmdir", so it can be a program name with args. +set dummy rmdir; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_RMDIR+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$RMDIR"; then + ac_cv_prog_RMDIR="$RMDIR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_RMDIR="rmdir" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +RMDIR=$ac_cv_prog_RMDIR +if test -n "$RMDIR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RMDIR" >&5 +$as_echo "$RMDIR" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + + +# Since this file will be finally moved to another directory we make +# the path of the install script absolute. This small code snippet has +# been taken from automake's `ylwrap' script. + +# Find a good install program. We prefer a C program (faster), +# so one script is as good as another. But avoid the broken or +# incompatible versions: +# SysV /etc/install, /usr/sbin/install +# SunOS /usr/etc/install +# IRIX /sbin/install +# AIX /bin/install +# AmigaOS /C/install, which installs bootblocks on floppy discs +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag +# AFS /usr/afsws/bin/install, which mishandles nonexistent args +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# OS/2's system install, which has a completely different semantic +# ./install, which can be erroneously created by make from ./install.sh. +# Reject install programs that cannot install multiple files. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +$as_echo_n "checking for a BSD-compatible install... " >&6; } +if test -z "$INSTALL"; then +if ${ac_cv_path_install+:} false; then : + $as_echo_n "(cached) " >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in #(( + ./ | .// | /[cC]/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + rm -rf conftest.one conftest.two conftest.dir + echo one > conftest.one + echo two > conftest.two + mkdir conftest.dir + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + test -s conftest.one && test -s conftest.two && + test -s conftest.dir/conftest.one && + test -s conftest.dir/conftest.two + then + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi + fi + fi + done + done + ;; +esac + + done +IFS=$as_save_IFS + +rm -rf conftest.one conftest.two conftest.dir + +fi + if test "${ac_cv_path_install+set}" = set; then + INSTALL=$ac_cv_path_install + else + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + INSTALL=$ac_install_sh + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +$as_echo "$INSTALL" >&6; } + +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. +# It thinks the first close brace ends the variable substitution. +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' + +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' + +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +case "$INSTALL" in +/*) + ;; +*/*) + INSTALL="`pwd`/$INSTALL" + ;; +esac + + +# checks for header files + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if ${ac_cv_header_stdc+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stdc=yes +else + ac_cv_header_stdc=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then : + +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then : + +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then : + : +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + return 2; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + +else + ac_cv_header_stdc=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } +if test $ac_cv_header_stdc = yes; then + +$as_echo "#define STDC_HEADERS 1" >>confdefs.h + +fi + +for ac_header in fcntl.h unistd.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + + +# checks for typedefs, structures, and compiler characteristics + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 +$as_echo_n "checking for an ANSI C-conforming const... " >&6; } +if ${ac_cv_c_const+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + +#ifndef __cplusplus + /* Ultrix mips cc rejects this sort of thing. */ + typedef int charset[2]; + const charset cs = { 0, 0 }; + /* SunOS 4.1.1 cc rejects this. */ + char const *const *pcpcc; + char **ppc; + /* NEC SVR4.0.2 mips cc rejects this. */ + struct point {int x, y;}; + static struct point const zero = {0,0}; + /* AIX XL C 1.02.0.0 rejects this. + It does not let you subtract one const X* pointer from another in + an arm of an if-expression whose if-part is not a constant + expression */ + const char *g = "string"; + pcpcc = &g + (g ? g-g : 0); + /* HPUX 7.0 cc rejects these. */ + ++pcpcc; + ppc = (char**) pcpcc; + pcpcc = (char const *const *) ppc; + { /* SCO 3.2v4 cc rejects this sort of thing. */ + char tx; + char *t = &tx; + char const *s = 0 ? (char *) 0 : (char const *) 0; + + *t++ = 0; + if (s) return 0; + } + { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ + int x[] = {25, 17}; + const int *foo = &x[0]; + ++foo; + } + { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ + typedef const int *iptr; + iptr p = 0; + ++p; + } + { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying + "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ + struct s { int j; const int *ap[3]; } bx; + struct s *b = &bx; b->j = 5; + } + { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ + const int foo = 10; + if (!foo) return 0; + } + return !cs[0] && !zero.x; +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_const=yes +else + ac_cv_c_const=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 +$as_echo "$ac_cv_c_const" >&6; } +if test $ac_cv_c_const = no; then + +$as_echo "#define const /**/" >>confdefs.h + +fi + +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 +$as_echo_n "checking size of int... " >&6; } +if ${ac_cv_sizeof_int+:} false; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then : - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : - lt_cv_shlibpath_overrides_runpath=yes -fi +else + if test "$ac_cv_type_int" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (int) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_int=0 + fi fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5 +$as_echo "$ac_cv_sizeof_int" >&6; } - shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi +cat >>confdefs.h <<_ACEOF +#define SIZEOF_INT $ac_cv_sizeof_int +_ACEOF - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, - # most powerpc-linux boxes support dynamic linking these days and - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' - ;; -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 +$as_echo_n "checking size of long... " >&6; } +if ${ac_cv_sizeof_long+:} false; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then : -newsos6) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; +else + if test "$ac_cv_type_long" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (long) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_long=0 + fi +fi -*nto* | *qnx*) - version_type=qnx - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='ldqnx.so' - ;; +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 +$as_echo "$ac_cv_sizeof_long" >&6; } -openbsd*) - version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac - else - shlibpath_overrides_runpath=yes - fi - ;; -os2*) - libname_spec='$name' - shrext_cmds=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; +cat >>confdefs.h <<_ACEOF +#define SIZEOF_LONG $ac_cv_sizeof_long +_ACEOF -rdos*) - dynamic_linker=no - ;; -solaris*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - fi - need_version=yes - ;; -sysv4 | sysv4.3*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no - ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; - esac - ;; +# check whether cpp computation of size of int and long in ftconfig.in works -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cpp computation of bit length in ftconfig.in works" >&5 +$as_echo_n "checking whether cpp computation of bit length in ftconfig.in works... " >&6; } +orig_CPPFLAGS="${CPPFLAGS}" +CPPFLAGS="-I${srcdir} -I. ${CPPFLAGS}" -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac +ac_clean_files= +for f in ft2build.h ftoption.h ftstdlib.h; do + if test ! -f $f; then + ac_clean_files="$ac_clean_files $f" + touch $f fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; +done + +cat > conftest.c <<\_ACEOF +#include +#define FT_CONFIG_OPTIONS_H "ftoption.h" +#define FT_CONFIG_STANDARD_LIBRARY_H "ftstdlib.h" +#define FT_UINT_MAX UINT_MAX +#define FT_ULONG_MAX ULONG_MAX +#include "ftconfig.in" +_ACEOF +echo >> conftest.c "#if FT_SIZEOF_INT == "${ac_cv_sizeof_int} +echo >> conftest.c "ac_cpp_ft_sizeof_int="${ac_cv_sizeof_int} +echo >> conftest.c "#endif" +echo >> conftest.c "#if FT_SIZEOF_LONG == "${ac_cv_sizeof_long} +echo >> conftest.c "ac_cpp_ft_sizeof_long="${ac_cv_sizeof_long} +echo >> conftest.c "#endif" -tpf*) - # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; +${CPP} ${CPPFLAGS} conftest.c | ${GREP} ac_cpp_ft > conftest.sh +eval `cat conftest.sh` +rm -f conftest.* $ac_clean_files -uts4*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; +if test x != "x${ac_cpp_ft_sizeof_int}" \ + -a x != x"${ac_cpp_ft_sizeof_long}"; then + unset ft_use_autoconf_sizeof_types +else + ft_use_autoconf_sizeof_types=yes +fi -*) - dynamic_linker=no - ;; +# Check whether --enable-biarch-config was given. +if test "${enable_biarch_config+set}" = set; then : + enableval=$enable_biarch_config; +fi + + +case :${ft_use_autoconf_sizeof_types}:${enable_biarch_config}: in + :yes:yes:) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: broken but use it" >&5 +$as_echo "broken but use it" >&6; } + unset ft_use_autoconf_sizeof_types + ;; + ::no:) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: works but ignore it" >&5 +$as_echo "works but ignore it" >&6; } + ft_use_autoconf_sizeof_types=yes + ;; + ::yes: | :::) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + unset ft_use_autoconf_sizeof_types + ;; + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + ft_use_autoconf_sizeof_types=yes + ;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 -$as_echo "$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +if test x"${ft_use_autoconf_sizeof_types}" = xyes; then + +$as_echo "#define FT_USE_AUTOCONF_SIZEOF_TYPES /**/" >>confdefs.h + fi -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +CPPFLAGS="${orig_CPPFLAGS}" + + +# checks for library functions + +# Here we check whether we can use our mmap file component. + +# Check whether --enable-mmap was given. +if test "${enable_mmap+set}" = set; then : + enableval=$enable_mmap; enable_mmap="no" +else + enable_mmap="yes" fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + +if test "x${enable_mmap}" != "xno"; then + + + + for ac_header in $ac_header_list +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + fi +done + + +for ac_func in getpagesize +do : + ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize" +if test "x$ac_cv_func_getpagesize" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_GETPAGESIZE 1 +_ACEOF +fi +done +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5 +$as_echo_n "checking for working mmap... " >&6; } +if ${ac_cv_func_mmap_fixed_mapped+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + ac_cv_func_mmap_fixed_mapped=no +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_includes_default +/* malloc might have been renamed as rpl_malloc. */ +#undef malloc +/* Thanks to Mike Haertel and Jim Avera for this test. + Here is a matrix of mmap possibilities: + mmap private not fixed + mmap private fixed at somewhere currently unmapped + mmap private fixed at somewhere already mapped + mmap shared not fixed + mmap shared fixed at somewhere currently unmapped + mmap shared fixed at somewhere already mapped + For private mappings, we should verify that changes cannot be read() + back from the file, nor mmap's back from the file at a different + address. (There have been systems where private was not correctly + implemented like the infamous i386 svr4.0, and systems where the + VM page cache was not coherent with the file system buffer cache + like early versions of FreeBSD and possibly contemporary NetBSD.) + For shared mappings, we should conversely verify that changes get + propagated back to all the places they're supposed to be. + Grep wants private fixed already mapped. + The main things grep needs to know about mmap are: + * does it exist and is it safe to write into the mmap'd area + * how to use it (BSD variants) */ +#include +#include +#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H +char *malloc (); +#endif +/* This mess was copied from the GNU getpagesize.h. */ +#ifndef HAVE_GETPAGESIZE +# ifdef _SC_PAGESIZE +# define getpagesize() sysconf(_SC_PAGESIZE) +# else /* no _SC_PAGESIZE */ +# ifdef HAVE_SYS_PARAM_H +# include +# ifdef EXEC_PAGESIZE +# define getpagesize() EXEC_PAGESIZE +# else /* no EXEC_PAGESIZE */ +# ifdef NBPG +# define getpagesize() NBPG * CLSIZE +# ifndef CLSIZE +# define CLSIZE 1 +# endif /* no CLSIZE */ +# else /* no NBPG */ +# ifdef NBPC +# define getpagesize() NBPC +# else /* no NBPC */ +# ifdef PAGESIZE +# define getpagesize() PAGESIZE +# endif /* PAGESIZE */ +# endif /* no NBPC */ +# endif /* no NBPG */ +# endif /* no EXEC_PAGESIZE */ +# else /* no HAVE_SYS_PARAM_H */ +# define getpagesize() 8192 /* punt totally */ +# endif /* no HAVE_SYS_PARAM_H */ +# endif /* no _SC_PAGESIZE */ +#endif /* no HAVE_GETPAGESIZE */ +int +main () +{ + char *data, *data2, *data3; + const char *cdata2; + int i, pagesize; + int fd, fd2; + pagesize = getpagesize (); + /* First, make a file with some known garbage in it. */ + data = (char *) malloc (pagesize); + if (!data) + return 1; + for (i = 0; i < pagesize; ++i) + *(data + i) = rand (); + umask (0); + fd = creat ("conftest.mmap", 0600); + if (fd < 0) + return 2; + if (write (fd, data, pagesize) != pagesize) + return 3; + close (fd); + /* Next, check that the tail of a page is zero-filled. File must have + non-zero length, otherwise we risk SIGBUS for entire page. */ + fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600); + if (fd2 < 0) + return 4; + cdata2 = ""; + if (write (fd2, cdata2, 1) != 1) + return 5; + data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L); + if (data2 == MAP_FAILED) + return 6; + for (i = 0; i < pagesize; ++i) + if (*(data2 + i)) + return 7; + close (fd2); + if (munmap (data2, pagesize)) + return 8; + /* Next, try to mmap the file at a fixed address which already has + something else allocated at it. If we can, also make sure that + we see the same garbage. */ + fd = open ("conftest.mmap", O_RDWR); + if (fd < 0) + return 9; + if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_FIXED, fd, 0L)) + return 10; + for (i = 0; i < pagesize; ++i) + if (*(data + i) != *(data2 + i)) + return 11; + /* Finally, make sure that changes to the mapped area do not + percolate back to the file as seen by read(). (This is a bug on + some variants of i386 svr4.0.) */ + for (i = 0; i < pagesize; ++i) + *(data2 + i) = *(data2 + i) + 1; + data3 = (char *) malloc (pagesize); + if (!data3) + return 12; + if (read (fd, data3, pagesize) != pagesize) + return 13; + for (i = 0; i < pagesize; ++i) + if (*(data + i) != *(data3 + i)) + return 14; + close (fd); + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_func_mmap_fixed_mapped=yes +else + ac_cv_func_mmap_fixed_mapped=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_fixed_mapped" >&5 +$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; } +if test $ac_cv_func_mmap_fixed_mapped = yes; then +$as_echo "#define HAVE_MMAP 1" >>confdefs.h +fi +rm -f conftest.mmap conftest.txt +fi +if test "x${enable_mmap}" = "xno" \ + -o "$ac_cv_func_mmap_fixed_mapped" != "yes"; then + FTSYS_SRC='$(BASE_DIR)/ftsystem.c' +else + FTSYS_SRC='$(BUILD_DIR)/ftsystem.c' + ac_fn_c_check_decl "$LINENO" "munmap" "ac_cv_have_decl_munmap" " +#ifdef HAVE_UNISTD_H +#include +#endif +#include +" +if test "x$ac_cv_have_decl_munmap" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_MUNMAP $ac_have_decl +_ACEOF + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for munmap's first parameter type" >&5 +$as_echo_n "checking for munmap's first parameter type... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +int munmap(void *, size_t); +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: void *" >&5 +$as_echo "void *" >&6; } +$as_echo "#define MUNMAP_USES_VOIDP /**/" >>confdefs.h +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: char *" >&5 +$as_echo "char *" >&6; } +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +for ac_func in memcpy memmove +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF +fi +done +# get compiler flags right +# +# We try to make the compiler work for C89-strict source. Even if the +# C compiler is gcc and C89 flags are available, some system headers +# (e.g., Android Bionic libc) are broken in C89 mode. We have to check +# whether the compilation finishes successfully. +# +# Due to bugs in mingwrt 4.0.3 we don't use `-ansi' for MinGW. +# +# To avoid zillions of +# +# ISO C90 does not support 'long long' +# +# warnings, we disable `-pedantic' for gcc version < 4.6. +# +if test "x$GCC" = xyes; then + XX_CFLAGS="-Wall" + case "$host" in + *-*-mingw*) + XX_ANSIFLAGS="-pedantic" + ;; + *) + GCC_VERSION=`$CC -dumpversion` + GCC_MAJOR=`echo "$GCC_VERSION" | sed 's/\([^.][^.]*\).*/\1/'` + GCC_MINOR=`echo "$GCC_VERSION" | sed 's/[^.][^.]*.\([^.][^.]*\).*/\1/'` + XX_PEDANTIC=-pedantic + if test $GCC_MAJOR -lt 4; then + XX_PEDANTIC= + else + if test $GCC_MAJOR -eq 4 -a $GCC_MINOR -lt 6; then + XX_PEDANTIC= + fi + fi + XX_ANSIFLAGS="" + for a in $XX_PEDANTIC -ansi + do + { $as_echo "$as_me:${as_lineno-$LINENO}: checking gcc compiler flag ${a} to assure ANSI C works correctly" >&5 +$as_echo_n "checking gcc compiler flag ${a} to assure ANSI C works correctly... " >&6; } + orig_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} ${XX_ANSIFLAGS} ${a}" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ + { + puts( "" ); + return 0; + } + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok, add it to XX_ANSIFLAGS" >&5 +$as_echo "ok, add it to XX_ANSIFLAGS" >&6; } + XX_ANSIFLAGS="${XX_ANSIFLAGS} ${a}" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="${orig_CFLAGS}" + done + ;; + esac +else + case "$host" in + *-dec-osf*) + CFLAGS= + XX_CFLAGS="-std1 -g3" + XX_ANSIFLAGS= + ;; + *) + XX_CFLAGS= + XX_ANSIFLAGS= + ;; + esac +fi +# All library tests below try `pkg-config' first. If that fails, a function +# from the library is tested in the traditional autoconf way (zlib, bzip2), +# or a config script is called (libpng). +# +# The `xxx_reqpriv' variables are for the `Requires.private' field in +# `freetype2.pc'. The `xxx_libpriv' variables are for the `Libs.private' +# field in `freetype2.pc' if pkg-config doesn't find a proper .pc file. +# +# The `xxx_libstaticconf' variables are for the `freetype-config' script. +# +# Note that a call to PKG_CHECK_MODULES(XXX, ...) sets and creates the +# output variables `XXX_CFLAGS' and `XXX_LIBS'. In case one or both are set +# for a library by the user, no entry for this library is added to +# `Requires.private'. Instead, it gets added to `Libs.private' +# check for system zlib +# Check whether --with-zlib was given. +if test "${with_zlib+set}" = set; then : + withval=$with_zlib; +else + with_zlib=auto +fi +have_zlib=no +if test x"$with_zlib" = xyes -o x"$with_zlib" = xauto; then + zlib_pkg="zlib" + have_zlib_pkg=no + if test x"$ZLIB_CFLAGS" = x -a x"$ZLIB_LIBS" = x; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$zlib_pkg\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$zlib_pkg") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + have_zlib_pkg=yes +fi + fi +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ZLIB" >&5 +$as_echo_n "checking for ZLIB... " >&6; } +if test -n "$ZLIB_CFLAGS"; then + pkg_cv_ZLIB_CFLAGS="$ZLIB_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$zlib_pkg\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$zlib_pkg") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ZLIB_CFLAGS=`$PKG_CONFIG --cflags "$zlib_pkg" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$ZLIB_LIBS"; then + pkg_cv_ZLIB_LIBS="$ZLIB_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$zlib_pkg\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$zlib_pkg") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ZLIB_LIBS=`$PKG_CONFIG --libs "$zlib_pkg" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + ZLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$zlib_pkg" 2>&1` + else + ZLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$zlib_pkg" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$ZLIB_PKG_ERRORS" >&5 + : +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + : +else + ZLIB_CFLAGS=$pkg_cv_ZLIB_CFLAGS + ZLIB_LIBS=$pkg_cv_ZLIB_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_zlib="yes (pkg-config)" +fi + if test $have_zlib_pkg = yes; then + # we have zlib.pc + zlib_reqpriv="$zlib_pkg" + zlib_libpriv= + zlib_libstaticconf=`$PKG_CONFIG --static --libs "$zlib_pkg"` + else + zlib_reqpriv= + if test "$have_zlib" != no; then + # ZLIB_CFLAGS and ZLIB_LIBS are set by the user + zlib_libpriv="$ZLIB_LIBS" + zlib_libstaticconf="$ZLIB_LIBS" + have_zlib="yes (ZLIB_CFLAGS and ZLIB_LIBS)" + else + # fall back to standard autoconf test + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzsetparams in -lz" >&5 +$as_echo_n "checking for gzsetparams in -lz... " >&6; } +if ${ac_cv_lib_z_gzsetparams+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lz $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gzsetparams (); +int +main () +{ +return gzsetparams (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_z_gzsetparams=yes +else + ac_cv_lib_z_gzsetparams=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_gzsetparams" >&5 +$as_echo "$ac_cv_lib_z_gzsetparams" >&6; } +if test "x$ac_cv_lib_z_gzsetparams" = xyes; then : + ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default" +if test "x$ac_cv_header_zlib_h" = xyes; then : + have_zlib="yes (autoconf test)" + zlib_libpriv="-lz" + zlib_libstaticconf="$zlib_libpriv" + ZLIB_LIBS="$zlib_libpriv" +fi +fi + fi + fi +fi +if test x"$with_zlib" = xyes -a "$have_zlib" = no; then + as_fn_error $? "external zlib support requested but library not found" "$LINENO" 5 +fi +# check for system libbz2 +# Check whether --with-bzip2 was given. +if test "${with_bzip2+set}" = set; then : + withval=$with_bzip2; +else + with_bzip2=auto +fi +have_bzip2=no +if test x"$with_bzip2" = xyes -o x"$with_bzip2" = xauto; then + bzip2_pkg="bzip2" + have_bzip2_pkg=no + if test x"$BZIP2_CFLAGS" = x -a x"$BZIP2_LIBS" = x; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$bzip2_pkg\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$bzip2_pkg") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + have_bzip2_pkg=yes +fi + fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 -$as_echo_n "checking how to hardcode library paths into programs... " >&6; } -hardcode_action= -if test -n "$hardcode_libdir_flag_spec" || - test -n "$runpath_var" || - test "X$hardcode_automatic" = "Xyes" ; then +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZIP2" >&5 +$as_echo_n "checking for BZIP2... " >&6; } - # We can hardcode non-existent directories. - if test "$hardcode_direct" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && - test "$hardcode_minus_L" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action=immediate - fi +if test -n "$BZIP2_CFLAGS"; then + pkg_cv_BZIP2_CFLAGS="$BZIP2_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$bzip2_pkg\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$bzip2_pkg") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_BZIP2_CFLAGS=`$PKG_CONFIG --cflags "$bzip2_pkg" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action=unsupported + pkg_failed=yes fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 -$as_echo "$hardcode_action" >&6; } - -if test "$hardcode_action" = relink || - test "$inherit_rpath" = yes; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless + else + pkg_failed=untried +fi +if test -n "$BZIP2_LIBS"; then + pkg_cv_BZIP2_LIBS="$BZIP2_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$bzip2_pkg\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$bzip2_pkg") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_BZIP2_LIBS=`$PKG_CONFIG --libs "$bzip2_pkg" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried fi +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - - - if test "x$enable_dlopen" != xyes; then - enable_dlopen=unknown - enable_dlopen_self=unknown - enable_dlopen_self_static=unknown +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes else - lt_cv_dlopen=no - lt_cv_dlopen_libs= - - case $host_os in - beos*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ;; + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + BZIP2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$bzip2_pkg" 2>&1` + else + BZIP2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$bzip2_pkg" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$BZIP2_PKG_ERRORS" >&5 - mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= - ;; + : +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + : +else + BZIP2_CFLAGS=$pkg_cv_BZIP2_CFLAGS + BZIP2_LIBS=$pkg_cv_BZIP2_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_bzip2="yes (pkg-config)" +fi - cygwin*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; + if test $have_bzip2_pkg = yes; then + # we have bzip2.pc + bzip2_reqpriv="$bzip2_pkg" + bzip2_libpriv= + bzip2_libstaticconf=`$PKG_CONFIG --static --libs "$bzip2_pkg"` + else + bzip2_reqpriv= - darwin*) - # if libdl is installed we need to link against it - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 -$as_echo_n "checking for dlopen in -ldl... " >&6; } -if ${ac_cv_lib_dl_dlopen+:} false; then : + if test "$have_bzip2" != no; then + # BZIP2_CFLAGS and BZIP2_LIBS are set by the user + bzip2_libpriv="$BZIP2_LIBS" + bzip2_libstaticconf="$BZIP2_LIBS" + have_bzip2="yes (BZIP2_CFLAGS and BZIP2_LIBS)" + else + # fall back to standard autoconf test + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZ2_bzDecompress in -lbz2" >&5 +$as_echo_n "checking for BZ2_bzDecompress in -lbz2... " >&6; } +if ${ac_cv_lib_bz2_BZ2_bzDecompress+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" +LIBS="-lbz2 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12170,597 +12725,957 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char dlopen (); +char BZ2_bzDecompress (); int main () { -return dlopen (); +return BZ2_bzDecompress (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dl_dlopen=yes + ac_cv_lib_bz2_BZ2_bzDecompress=yes else - ac_cv_lib_dl_dlopen=no + ac_cv_lib_bz2_BZ2_bzDecompress=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bz2_BZ2_bzDecompress" >&5 +$as_echo "$ac_cv_lib_bz2_BZ2_bzDecompress" >&6; } +if test "x$ac_cv_lib_bz2_BZ2_bzDecompress" = xyes; then : + ac_fn_c_check_header_mongrel "$LINENO" "bzlib.h" "ac_cv_header_bzlib_h" "$ac_includes_default" +if test "x$ac_cv_header_bzlib_h" = xyes; then : + have_bzip2="yes (autoconf test)" + bzip2_libpriv="-lbz2" + bzip2_libstaticconf="$bzip2_libpriv" + BZIP2_LIBS="$bzip2_libpriv" +fi + + +fi + + fi + fi +fi + +if test x"$with_bzip2" = xyes -a "$have_bzip2" = no; then + as_fn_error $? "bzip2 support requested but library not found" "$LINENO" 5 +fi + + +# check for system libpng + + +# Check whether --with-png was given. +if test "${with_png+set}" = set; then : + withval=$with_png; else + with_png=auto +fi - lt_cv_dlopen="dyld" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes +have_libpng=no +if test x"$with_png" = xyes -o x"$with_png" = xauto; then + libpng_pkg="libpng" + have_libpng_pkg=no + + if test x"$LIBPNG_CFLAGS" = x -a x"$LIBPNG_LIBS" = x; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$libpng_pkg\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$libpng_pkg") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + have_libpng_pkg=yes fi + fi - ;; +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBPNG" >&5 +$as_echo_n "checking for LIBPNG... " >&6; } - *) - ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" -if test "x$ac_cv_func_shl_load" = xyes; then : - lt_cv_dlopen="shl_load" +if test -n "$LIBPNG_CFLAGS"; then + pkg_cv_LIBPNG_CFLAGS="$LIBPNG_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$libpng_pkg\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$libpng_pkg") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBPNG_CFLAGS=`$PKG_CONFIG --cflags "$libpng_pkg" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 -$as_echo_n "checking for shl_load in -ldld... " >&6; } -if ${ac_cv_lib_dld_shl_load+:} false; then : - $as_echo_n "(cached) " >&6 + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$LIBPNG_LIBS"; then + pkg_cv_LIBPNG_LIBS="$LIBPNG_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$libpng_pkg\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$libpng_pkg") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBPNG_LIBS=`$PKG_CONFIG --libs "$libpng_pkg" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + pkg_failed=yes +fi + else + pkg_failed=untried +fi -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char shl_load (); -int -main () -{ -return shl_load (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dld_shl_load=yes + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes else - ac_cv_lib_dld_shl_load=no + _pkg_short_errors_supported=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + if test $_pkg_short_errors_supported = yes; then + LIBPNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$libpng_pkg" 2>&1` + else + LIBPNG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$libpng_pkg" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBPNG_PKG_ERRORS" >&5 + + : +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + : +else + LIBPNG_CFLAGS=$pkg_cv_LIBPNG_CFLAGS + LIBPNG_LIBS=$pkg_cv_LIBPNG_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_libpng="yes (pkg-config)" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 -$as_echo "$ac_cv_lib_dld_shl_load" >&6; } -if test "x$ac_cv_lib_dld_shl_load" = xyes; then : - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" + + if test $have_libpng_pkg = yes; then + # we have libpng.pc + libpng_reqpriv="$libpng_pkg" + libpng_libpriv= + libpng_libstaticconf=`$PKG_CONFIG --static --libs "$libpng_pkg"` + else + libpng_reqpriv= + + if test "$have_libpng" != no; then + # LIBPNG_CFLAGS and LIBPNG_LIBS are set by the user + libpng_libpriv="$LIBPNG_LIBS" + libpng_libstaticconf="$LIBPNG_LIBS" + have_libpng="yes (LIBPNG_CFLAGS and LIBPNG_LIBS)" + else + # fall back to config script. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng-config" >&5 +$as_echo_n "checking for libpng-config... " >&6; } + if which libpng-config > /dev/null 2>&1; then + LIBPNG_CFLAGS=`libpng-config --cflags` + LIBPNG_LIBS=`libpng-config --ldflags` + libpng_libpriv=`libpng-config --static --ldflags` + libpng_libstaticconf="$libpng_libpriv" + have_libpng="yes (libpng-config)" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + fi + fi +fi + +if test x"$with_png" = xyes -a "$have_libpng" = no; then + as_fn_error $? "libpng support requested but library not found" "$LINENO" 5 +fi + + +# check for system libharfbuzz + + +# Check whether --with-harfbuzz was given. +if test "${with_harfbuzz+set}" = set; then : + withval=$with_harfbuzz; else - ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" -if test "x$ac_cv_func_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" + with_harfbuzz=auto +fi + + +have_harfbuzz=no +if test x"$with_harfbuzz" = xyes -o x"$with_harfbuzz" = xauto; then + harfbuzz_pkg="harfbuzz >= 0.9.19" + have_harfbuzz_pkg=no + + if test x"$HARFBUZZ_CFLAGS" = x -a x"$HARFBUZZ_LIBS" = x; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$harfbuzz_pkg\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$harfbuzz_pkg") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + have_harfbuzz_pkg=yes +fi + fi + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for HARFBUZZ" >&5 +$as_echo_n "checking for HARFBUZZ... " >&6; } + +if test -n "$HARFBUZZ_CFLAGS"; then + pkg_cv_HARFBUZZ_CFLAGS="$HARFBUZZ_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$harfbuzz_pkg\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$harfbuzz_pkg") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_HARFBUZZ_CFLAGS=`$PKG_CONFIG --cflags "$harfbuzz_pkg" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 -$as_echo_n "checking for dlopen in -ldl... " >&6; } -if ${ac_cv_lib_dl_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$HARFBUZZ_LIBS"; then + pkg_cv_HARFBUZZ_LIBS="$HARFBUZZ_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$harfbuzz_pkg\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$harfbuzz_pkg") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_HARFBUZZ_LIBS=`$PKG_CONFIG --libs "$harfbuzz_pkg" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + pkg_failed=yes +fi + else + pkg_failed=untried +fi -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dl_dlopen=yes + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes else - ac_cv_lib_dl_dlopen=no + _pkg_short_errors_supported=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + if test $_pkg_short_errors_supported = yes; then + HARFBUZZ_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$harfbuzz_pkg" 2>&1` + else + HARFBUZZ_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$harfbuzz_pkg" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$HARFBUZZ_PKG_ERRORS" >&5 + + : +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + : +else + HARFBUZZ_CFLAGS=$pkg_cv_HARFBUZZ_CFLAGS + HARFBUZZ_LIBS=$pkg_cv_HARFBUZZ_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_harfbuzz="yes (pkg-config)" +fi + + if test $have_harfbuzz_pkg = yes; then + # we have harfbuzz.pc + harfbuzz_reqpriv="$harfbuzz_pkg" + harfbuzz_libpriv= + harfbuzz_libstaticconf=`$PKG_CONFIG --static --libs "$harfbuzz_pkg"` + else + harfbuzz_reqpriv= + + if test "$have_harfbuzz" != no; then + # HARFBUZZ_CFLAGS and HARFBUZZ_LIBS are set by the user + harfbuzz_libpriv="$HARFBUZZ_LIBS" + harfbuzz_libstaticconf="$HARFBUZZ_LIBS" + have_harfbuzz="yes (HARFBUZZ_CFLAGS and HARFBUZZ_LIBS)" + else + # since HarfBuzz is quite a new library we don't fall back to a + # different test; additionally, it has too many dependencies + : + fi + fi +fi + +if test x"$with_harfbuzz" = xyes -a "$have_harfbuzz" = no; then + as_fn_error $? "harfbuzz support requested but library not found" "$LINENO" 5 +fi + + +# Some options handling SDKs/archs in CFLAGS should be copied +# to LDFLAGS. Apple TechNote 2137 recommends to include these +# options in CFLAGS but not in LDFLAGS. + +save_config_args=$* +set dummy ${CFLAGS} +i=1 +while test $i -le $# +do + c=$1 + + case "${c}" in + -isysroot|-arch) # options taking 1 argument + a=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether CFLAGS and LDFLAGS share ${c} ${a}" >&5 +$as_echo_n "checking whether CFLAGS and LDFLAGS share ${c} ${a}... " >&6; } + if expr " ${LDFLAGS} " : ".* ${c} *${a}.*" > /dev/null + then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, copy to LDFLAGS" >&5 +$as_echo "no, copy to LDFLAGS" >&6; } + LDFLAGS="${LDFLAGS} ${c} ${a}" + fi + shift 1 + ;; + -m32|-m64|-march=*|-mcpu=*) # options taking no argument + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether CFLAGS and LDFLAGS share ${c}" >&5 +$as_echo_n "checking whether CFLAGS and LDFLAGS share ${c}... " >&6; } + if expr " ${LDFLAGS} " : ".* ${c} *${a}.*" > /dev/null + then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, copy to LDFLAGS" >&5 +$as_echo "no, copy to LDFLAGS" >&6; } + LDFLAGS="${LDFLAGS} ${c}" + fi + ;; + # *) + # AC_MSG_RESULT([${c} is not copied to LDFLAGS]) + # ;; + esac + + shift 1 +done +set ${save_config_args} + + +# Whether to use Mac OS resource-based fonts. + +ftmac_c="" # src/base/ftmac.c should not be included in makefiles by default + + +# Check whether --with-old-mac-fonts was given. +if test "${with_old_mac_fonts+set}" = set; then : + withval=$with_old_mac_fonts; fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 -$as_echo_n "checking for dlopen in -lsvld... " >&6; } -if ${ac_cv_lib_svld_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsvld $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + +if test x$with_old_mac_fonts = xyes; then + orig_LDFLAGS="${LDFLAGS}" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking CoreServices & ApplicationServices of Mac OS X" >&5 +$as_echo_n "checking CoreServices & ApplicationServices of Mac OS X... " >&6; } + ft2_extra_libs="-Wl,-framework,CoreServices -Wl,-framework,ApplicationServices" + LDFLAGS="$LDFLAGS $ft2_extra_libs" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" + + +#if defined(__GNUC__) && defined(__APPLE_CC__) +# include +# include +#else +# include +# include #endif -char dlopen (); + + int main () { -return dlopen (); + + + short res = 0; + + + UseResFile( res ); + + ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_svld_dlopen=yes -else - ac_cv_lib_svld_dlopen=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 -$as_echo "$ac_cv_lib_svld_dlopen" >&6; } -if test "x$ac_cv_lib_svld_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 -$as_echo_n "checking for dld_link in -ldld... " >&6; } -if ${ac_cv_lib_dld_dld_link+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } + ftmac_c='ftmac.c' + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether OS_INLINE macro is ANSI compatible" >&5 +$as_echo_n "checking whether OS_INLINE macro is ANSI compatible... " >&6; } + orig_CFLAGS="$CFLAGS -DFT_MACINTOSH" + CFLAGS="$CFLAGS $XX_CFLAGS $XX_ANSIFLAGS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" + + +#if defined(__GNUC__) && defined(__APPLE_CC__) +# include +# include +#else +# include +# include #endif -char dld_link (); + + int main () { -return dld_link (); + + + /* OSHostByteOrder() is typed as OS_INLINE */ + int32_t os_byte_order = OSHostByteOrder(); + + + if ( OSBigEndian != os_byte_order ) + return 1; + + ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dld_dld_link=yes -else - ac_cv_lib_dld_dld_link=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 -$as_echo "$ac_cv_lib_dld_dld_link" >&6; } -if test "x$ac_cv_lib_dld_dld_link" = xyes; then : - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" -fi - - -fi +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } + CFLAGS="$orig_CFLAGS" + CFLAGS="$CFLAGS -DHAVE_ANSI_OS_INLINE=1" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, ANSI incompatible" >&5 +$as_echo "no, ANSI incompatible" >&6; } + CFLAGS="$orig_CFLAGS" fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: checking type ResourceIndex" >&5 +$as_echo_n "checking type ResourceIndex... " >&6; } + orig_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $XX_CFLAGS $XX_ANSIFLAGS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi - -fi +#if defined(__GNUC__) && defined(__APPLE_CC__) +# include +# include +#else +# include +# include +# include +#endif -fi +int +main () +{ - ;; - esac - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else - enable_dlopen=no - fi + ResourceIndex i = 0; + return i; - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - save_LDFLAGS="$LDFLAGS" - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } + CFLAGS="$orig_CFLAGS" + CFLAGS="$CFLAGS -DHAVE_TYPE_RESOURCE_INDEX=1" - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + CFLAGS="$orig_CFLAGS" + CFLAGS="$CFLAGS -DHAVE_TYPE_RESOURCE_INDEX=0" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 -$as_echo_n "checking whether a program can dlopen itself... " >&6; } -if ${lt_cv_dlopen_self+:} false; then : - $as_echo_n "(cached) " >&6 +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self=cross + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } + ft2_extra_libs="" + LDFLAGS="${orig_LDFLAGS}" + CFLAGS="$CFLAGS -DDARWIN_NO_CARBON" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF -#line $LINENO "configure" -#include "confdefs.h" + case x$host_os in + xdarwin*) + CFLAGS="$CFLAGS -DDARWIN_NO_CARBON" + ;; + *) + ;; + esac +fi -#if HAVE_DLFCN_H -#include -#endif -#include +# Whether to use FileManager, which is deprecated since Mac OS X 10.4. -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif +# Check whether --with-fsspec was given. +if test "${with_fsspec+set}" = set; then : + withval=$with_fsspec; +fi -/* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -int fnord () __attribute__((visibility("default"))); +if test x$with_fsspec = xno; then + CFLAGS="$CFLAGS -DHAVE_FSSPEC=0" +elif test x$with_old_mac_fonts = xyes -a x$with_fsspec != x; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking FSSpec-based FileManager" >&5 +$as_echo_n "checking FSSpec-based FileManager... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + + +#if defined(__GNUC__) && defined(__APPLE_CC__) +# include +# include +#else +# include +# include #endif -int fnord () { return 42; } -int main () + +int +main () { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else - { - if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - else puts (dlerror ()); - } - /* dlclose (self); */ - } - else - puts (dlerror ()); - return status; + FCBPBPtr paramBlock; + short vRefNum; + long dirID; + ConstStr255Param fileName; + FSSpec* spec; + + + /* FSSpec functions: deprecated since Mac OS X 10.4 */ + PBGetFCBInfoSync( paramBlock ); + FSMakeFSSpec( vRefNum, dirID, fileName, spec ); + + + ; + return 0; } -_LT_EOF - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 - (eval $ac_link) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; - x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; - esac - else : - # compilation failed - lt_cv_dlopen_self=no - fi +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } + CFLAGS="$CFLAGS -DHAVE_FSSPEC=1" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } + CFLAGS="$CFLAGS -DHAVE_FSSPEC=0" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi -rm -fr conftest* +# Whether to use FileManager in Carbon since MacOS 9.x. + + +# Check whether --with-fsref was given. +if test "${with_fsref+set}" = set; then : + withval=$with_fsref; fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 -$as_echo "$lt_cv_dlopen_self" >&6; } - if test "x$lt_cv_dlopen_self" = xyes; then - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 -$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } -if ${lt_cv_dlopen_self_static+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self_static=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF -#line $LINENO "configure" -#include "confdefs.h" +if test x$with_fsref = xno; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: +*** WARNING + FreeType2 built without FSRef API cannot load + data-fork fonts on MacOS, except of XXX.dfont. + " >&5 +$as_echo "$as_me: WARNING: +*** WARNING + FreeType2 built without FSRef API cannot load + data-fork fonts on MacOS, except of XXX.dfont. + " >&2;} + CFLAGS="$CFLAGS -DHAVE_FSREF=0" +elif test x$with_old_mac_fonts = xyes -a x$with_fsref != x; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking FSRef-based FileManager" >&5 +$as_echo_n "checking FSRef-based FileManager... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -#if HAVE_DLFCN_H -#include -#endif -#include -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL +#if defined(__GNUC__) && defined(__APPLE_CC__) +# include +# include #else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif +# include +# include #endif -/* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -int fnord () __attribute__((visibility("default"))); -#endif -int fnord () { return 42; } -int main () +int +main () { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else - { - if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - else puts (dlerror ()); - } - /* dlclose (self); */ - } - else - puts (dlerror ()); - return status; -} -_LT_EOF - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 - (eval $ac_link) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; - esac - else : - # compilation failed - lt_cv_dlopen_self_static=no - fi -fi -rm -fr conftest* + short vRefNum; + long dirID; + ConstStr255Param fileName; + Boolean* isDirectory; + UInt8* path; + SInt16 desiredRefNum; + SInt16* iterator; + SInt16* actualRefNum; + HFSUniStr255* outForkName; + FSVolumeRefNum volume; + FSCatalogInfoBitmap whichInfo; + FSCatalogInfo* catalogInfo; + FSForkInfo* forkInfo; + FSRef* ref; -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 -$as_echo "$lt_cv_dlopen_self_static" >&6; } - fi +#if HAVE_FSSPEC + FSSpec* spec; +#endif - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac + /* FSRef functions: no need to check? */ + FSGetForkCBInfo( desiredRefNum, volume, iterator, + actualRefNum, forkInfo, ref, + outForkName ); + FSPathMakeRef( path, ref, isDirectory ); - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac +#if HAVE_FSSPEC + FSpMakeFSRef ( spec, ref ); + FSGetCatalogInfo( ref, whichInfo, catalogInfo, + outForkName, spec, ref ); +#endif - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; - esac + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } + CFLAGS="$CFLAGS -DHAVE_FSREF=1" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } + CFLAGS="$CFLAGS -DHAVE_FSREF=0" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi +# Whether to use QuickDraw API in ToolBox, which is deprecated since +# Mac OS X 10.4. +# Check whether --with-quickdraw-toolbox was given. +if test "${with_quickdraw_toolbox+set}" = set; then : + withval=$with_quickdraw_toolbox; +fi +if test x$with_quickdraw_toolbox = xno; then + CFLAGS="$CFLAGS -DHAVE_QUICKDRAW_TOOLBOX=0" +elif test x$with_old_mac_fonts = xyes -a x$with_quickdraw_toolbox != x; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking QuickDraw FontManager functions in ToolBox" >&5 +$as_echo_n "checking QuickDraw FontManager functions in ToolBox... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#if defined(__GNUC__) && defined(__APPLE_CC__) +# include +# include +#else +# include +# include +#endif +int +main () +{ + Str255 familyName; + SInt16 familyID = 0; + FMInput* fmIn = NULL; + FMOutput* fmOut = NULL; + GetFontName( familyID, familyName ); + GetFNum( familyName, &familyID ); + fmOut = FMSwapFont( fmIn ); - -striplib= -old_striplib= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 -$as_echo_n "checking whether stripping libraries is possible... " >&6; } -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } + CFLAGS="$CFLAGS -DHAVE_QUICKDRAW_TOOLBOX=1" else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - old_striplib="$STRIP -S" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi - ;; - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - ;; - esac + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } + CFLAGS="$CFLAGS -DHAVE_QUICKDRAW_TOOLBOX=0" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi +# Whether to use QuickDraw API in Carbon, which is deprecated since +# Mac OS X 10.4. +# Check whether --with-quickdraw-carbon was given. +if test "${with_quickdraw_carbon+set}" = set; then : + withval=$with_quickdraw_carbon; +fi +if test x$with_quickdraw_carbon = xno; then + CFLAGS="$CFLAGS -DHAVE_QUICKDRAW_CARBON=0" +elif test x$with_old_mac_fonts = xyes -a x$with_quickdraw_carbon != x; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking QuickDraw FontManager functions in Carbon" >&5 +$as_echo_n "checking QuickDraw FontManager functions in Carbon... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#if defined(__GNUC__) && defined(__APPLE_CC__) +# include +# include +#else +# include +# include +#endif +int +main () +{ - # Report which library types will actually be built - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 -$as_echo_n "checking if libtool supports shared libraries... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 -$as_echo "$can_build_shared" >&6; } + FMFontFamilyIterator famIter; + FMFontFamily family; + Str255 famNameStr; + FMFontFamilyInstanceIterator instIter; + FMFontStyle style; + FMFontSize size; + FMFont font; + FSSpec* pathSpec; - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 -$as_echo_n "checking whether to build shared libraries... " >&6; } - test "$can_build_shared" = "no" && enable_shared=no - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; + FMCreateFontFamilyIterator( NULL, NULL, kFMUseGlobalScopeOption, + &famIter ); + FMGetNextFontFamily( &famIter, &family ); + FMGetFontFamilyName( family, famNameStr ); + FMCreateFontFamilyInstanceIterator( family, &instIter ); + FMGetNextFontFamilyInstance( &instIter, &font, &style, &size ); + FMDisposeFontFamilyInstanceIterator( &instIter ); + FMDisposeFontFamilyIterator( &famIter ); + FMGetFontContainer( font, pathSpec ); - aix[4-9]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 -$as_echo "$enable_shared" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 -$as_echo_n "checking whether to build static libraries... " >&6; } - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 -$as_echo "$enable_static" >&6; } + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } + CFLAGS="$CFLAGS -DHAVE_QUICKDRAW_CARBON=1" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } + CFLAGS="$CFLAGS -DHAVE_QUICKDRAW_CARBON=0" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +# Whether to use AppleTypeService since Mac OS X. +# Check whether --with-ats was given. +if test "${with_ats+set}" = set; then : + withval=$with_ats; fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -CC="$lt_save_CC" +if test x$with_ats = xno; then + CFLAGS="$CFLAGS -DHAVE_ATS=0" +elif test x$with_old_mac_fonts = xyes -a x$with_ats != x; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking AppleTypeService functions" >&5 +$as_echo_n "checking AppleTypeService functions... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + + +#if defined(__GNUC__) && defined(__APPLE_CC__) +# include +# include +#else +# include +# include +#endif + + +int +main () +{ + + + FSSpec* pathSpec; + ATSFontFindFromName( NULL, kATSOptionFlagsUnRestrictedScope ); +#if HAVE_FSSPEC + ATSFontGetFileSpecification( 0, pathSpec ); +#endif + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } + CFLAGS="$CFLAGS -DHAVE_ATS=1" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } + CFLAGS="$CFLAGS -DHAVE_ATS=0" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +case "$CFLAGS" in + *HAVE_FSSPEC* | *HAVE_FSREF* | *HAVE_QUICKDRAW* | *HAVE_ATS* ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: +*** WARNING + FSSpec/FSRef/QuickDraw/ATS options are explicitly given, + thus it is recommended to replace src/base/ftmac.c by builds/mac/ftmac.c. + " >&5 +$as_echo "$as_me: WARNING: +*** WARNING + FSSpec/FSRef/QuickDraw/ATS options are explicitly given, + thus it is recommended to replace src/base/ftmac.c by builds/mac/ftmac.c. + " >&2;} + CFLAGS="$CFLAGS "'-I$(TOP_DIR)/builds/mac/' + ;; + *) + ;; +esac +# entries in Requires.private are separated by commas; +REQUIRES_PRIVATE="$zlib_reqpriv, \ + $bzip2_reqpriv, \ + $libpng_reqpriv, \ + $harfbuzz_reqpriv" +# beautify +REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVATE" \ + | sed -e 's/^ *//' \ + -e 's/ *$//' \ + -e 's/, */,/g' \ + -e 's/,,*/,/g' \ + -e 's/^,*//' \ + -e 's/,*$//' \ + -e 's/,/, /g'` +LIBS_PRIVATE="$zlib_libpriv \ + $bzip2_libpriv \ + $libpng_libpriv \ + $harfbuzz_libpriv \ + $ft2_extra_libs" +# beautify +LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \ + | sed -e 's/^ *//' \ + -e 's/ *$//' \ + -e 's/ */ /g'` +LIBSSTATIC_CONFIG="-lfreetype \ + $zlib_libstaticconf \ + $bzip2_libstaticconf \ + $libpng_libstaticconf \ + $harfbuzz_libstaticconf \ + $ft2_extra_libs" +# remove -L/usr/lib and -L/usr/lib64 since `freetype-config' adds them later +# on if necessary; also beautify +LIBSSTATIC_CONFIG=`echo "$LIBSSTATIC_CONFIG" \ + | sed -e 's|-L */usr/lib64/* | |g' \ + -e 's|-L */usr/lib/* | |g' \ + -e 's/^ *//' \ + -e 's/ *$//' \ + -e 's/ */ /g'` - ac_config_commands="$ac_config_commands libtool" -# Only expand once: +# changing LDFLAGS value should only be done after +# lt_cv_prog_compiler_static_works test +if test "$have_zlib" != no; then + CFLAGS="$CFLAGS $ZLIB_CFLAGS -DFT_CONFIG_OPTION_SYSTEM_ZLIB" + LDFLAGS="$LDFLAGS $ZLIB_LIBS" +fi +if test "$have_bzip2" != no; then + CFLAGS="$CFLAGS $BZIP2_CFLAGS -DFT_CONFIG_OPTION_USE_BZIP2" + LDFLAGS="$LDFLAGS $BZIP2_LIBS" +fi +if test "$have_libpng" != no; then + CFLAGS="$CFLAGS $LIBPNG_CFLAGS -DFT_CONFIG_OPTION_USE_PNG" + LDFLAGS="$LDFLAGS $LIBPNG_LIBS" +fi +if test "$have_harfbuzz" != no; then + CFLAGS="$CFLAGS $HARFBUZZ_CFLAGS -DFT_CONFIG_OPTION_USE_HARFBUZZ" + LDFLAGS="$LDFLAGS $HARFBUZZ_LIBS" +fi @@ -12776,7 +13691,7 @@ ac_config_headers="$ac_config_headers ftconfig.h:ftconfig.in" # create the Unix-specific sub-Makefiles `builds/unix/unix-def.mk' # and `builds/unix/unix-cc.mk' that will be used by the build system # -ac_config_files="$ac_config_files unix-cc.mk:unix-cc.in unix-def.mk:unix-def.in freetype-config freetype2.pc:freetype2.in" +ac_config_files="$ac_config_files unix-cc.mk:unix-cc.in unix-def.mk:unix-def.in" # re-generate the Jamfile to use libtool now @@ -13190,16 +14105,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -13259,28 +14174,16 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -13301,8 +14204,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by FreeType $as_me 2.4.9, which was -generated by GNU Autoconf 2.68. Invocation command line was +This file was extended by FreeType $as_me 2.5.4, which was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -13367,11 +14270,11 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -FreeType config.status 2.4.9 -configured by $0, generated by GNU Autoconf 2.68, +FreeType config.status 2.5.4 +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -13461,7 +14364,7 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -13777,8 +14680,6 @@ do "ftconfig.h") CONFIG_HEADERS="$CONFIG_HEADERS ftconfig.h:ftconfig.in" ;; "unix-cc.mk") CONFIG_FILES="$CONFIG_FILES unix-cc.mk:unix-cc.in" ;; "unix-def.mk") CONFIG_FILES="$CONFIG_FILES unix-def.mk:unix-def.in" ;; - "freetype-config") CONFIG_FILES="$CONFIG_FILES freetype-config" ;; - "freetype2.pc") CONFIG_FILES="$CONFIG_FILES freetype2.pc:freetype2.in" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac @@ -15009,4 +15910,21 @@ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: + +Library configuration: + external zlib: $have_zlib + bzip2: $have_bzip2 + libpng: $have_libpng + harfbuzz: $have_harfbuzz +" >&5 +$as_echo "$as_me: + +Library configuration: + external zlib: $have_zlib + bzip2: $have_bzip2 + libpng: $have_libpng + harfbuzz: $have_harfbuzz +" >&6;} + # end of configure.raw diff --git a/builds/unix/configure.ac b/builds/unix/configure.ac index a066216..ab6ee8e 100644 --- a/builds/unix/configure.ac +++ b/builds/unix/configure.ac @@ -2,7 +2,7 @@ # # Process this file with autoconf to produce a configure script. # -# Copyright 2001-2012 by +# Copyright 2001-2014 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.4.9], [freetype@nongnu.org], [freetype]) +AC_INIT([FreeType], [2.5.4], [freetype@nongnu.org], [freetype]) AC_CONFIG_SRCDIR([ftconfig.in]) # Don't forget to update docs/VERSION.DLL! -version_info='14:1:8' +version_info='17:3:11' AC_SUBST([version_info]) ft_version=`echo $version_info | tr : .` AC_SUBST([ft_version]) @@ -34,6 +34,10 @@ AC_PROG_CC AC_PROG_CPP AC_SUBST(EXEEXT) +PKG_PROG_PKG_CONFIG([0.24]) + +LT_INIT(win32-dll) + # checks for native programs to generate building tool @@ -66,32 +70,8 @@ AC_SUBST(CC_BUILD) AC_SUBST(EXEEXT_BUILD) - -# get compiler flags right - -if test "x$GCC" = xyes; then - XX_CFLAGS="-Wall" - XX_ANSIFLAGS="-pedantic -ansi" -else - case "$host" in - *-dec-osf*) - CFLAGS= - XX_CFLAGS="-std1 -g3" - XX_ANSIFLAGS= - ;; - *) - XX_CFLAGS= - XX_ANSIFLAGS= - ;; - esac -fi -AC_SUBST([XX_CFLAGS]) -AC_SUBST([XX_ANSIFLAGS]) - - # auxiliary programs -AC_CHECK_PROG([RMF], [rm], [rm -f]) AC_CHECK_PROG([RMDIR], [rmdir], [rmdir]) @@ -127,8 +107,14 @@ AC_CHECK_SIZEOF([long]) AC_MSG_CHECKING([whether cpp computation of bit length in ftconfig.in works]) orig_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="-I${srcdir} -I. ${CPPFLAGS}" -ac_clean_files="ft2build.h ftoption.h ftstdlib.h" -touch ft2build.h ftoption.h ftstdlib.h + +ac_clean_files= +for f in ft2build.h ftoption.h ftstdlib.h; do + if test ! -f $f; then + ac_clean_files="$ac_clean_files $f" + touch $f + fi +done cat > conftest.c <<\_ACEOF #include @@ -147,7 +133,7 @@ echo >> conftest.c "#endif" ${CPP} ${CPPFLAGS} conftest.c | ${GREP} ac_cpp_ft > conftest.sh eval `cat conftest.sh` -${RMF} conftest.c conftest.sh confft2build.h ftoption.h ftstdlib.h +rm -f conftest.* $ac_clean_files if test x != "x${ac_cpp_ft_sizeof_int}" \ -a x != x"${ac_cpp_ft_sizeof_long}"; then @@ -180,7 +166,8 @@ case :${ft_use_autoconf_sizeof_types}:${enable_biarch_config}: in esac if test x"${ft_use_autoconf_sizeof_types}" = xyes; then - AC_DEFINE([FT_USE_AUTOCONF_SIZEOF_TYPES]) + AC_DEFINE([FT_USE_AUTOCONF_SIZEOF_TYPES], [], + [Define if autoconf sizeof types should be used.]) fi CPPFLAGS="${orig_CPPFLAGS}" @@ -222,35 +209,297 @@ AC_SUBST([FTSYS_SRC]) AC_CHECK_FUNCS([memcpy memmove]) +# get compiler flags right +# +# We try to make the compiler work for C89-strict source. Even if the +# C compiler is gcc and C89 flags are available, some system headers +# (e.g., Android Bionic libc) are broken in C89 mode. We have to check +# whether the compilation finishes successfully. +# +# Due to bugs in mingwrt 4.0.3 we don't use `-ansi' for MinGW. +# +# To avoid zillions of +# +# ISO C90 does not support 'long long' +# +# warnings, we disable `-pedantic' for gcc version < 4.6. +# +if test "x$GCC" = xyes; then + XX_CFLAGS="-Wall" + case "$host" in + *-*-mingw*) + XX_ANSIFLAGS="-pedantic" + ;; + *) + GCC_VERSION=`$CC -dumpversion` + GCC_MAJOR=`echo "$GCC_VERSION" | sed 's/\([[^.]][[^.]]*\).*/\1/'` + GCC_MINOR=`echo "$GCC_VERSION" | sed 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1/'` + + XX_PEDANTIC=-pedantic + if test $GCC_MAJOR -lt 4; then + XX_PEDANTIC= + else + if test $GCC_MAJOR -eq 4 -a $GCC_MINOR -lt 6; then + XX_PEDANTIC= + fi + fi + + XX_ANSIFLAGS="" + for a in $XX_PEDANTIC -ansi + do + AC_MSG_CHECKING([gcc compiler flag ${a} to assure ANSI C works correctly]) + orig_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} ${XX_ANSIFLAGS} ${a}" + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM([ + +#include + + ], + [ + + { + puts( "" ); + return 0; + } + + ])], + [AC_MSG_RESULT([ok, add it to XX_ANSIFLAGS]) + XX_ANSIFLAGS="${XX_ANSIFLAGS} ${a}" + ], + [AC_MSG_RESULT([no])]) + CFLAGS="${orig_CFLAGS}" + done + ;; + esac +else + case "$host" in + *-dec-osf*) + CFLAGS= + XX_CFLAGS="-std1 -g3" + XX_ANSIFLAGS= + ;; + *) + XX_CFLAGS= + XX_ANSIFLAGS= + ;; + esac +fi +AC_SUBST([XX_CFLAGS]) +AC_SUBST([XX_ANSIFLAGS]) + + +# All library tests below try `pkg-config' first. If that fails, a function +# from the library is tested in the traditional autoconf way (zlib, bzip2), +# or a config script is called (libpng). +# +# The `xxx_reqpriv' variables are for the `Requires.private' field in +# `freetype2.pc'. The `xxx_libpriv' variables are for the `Libs.private' +# field in `freetype2.pc' if pkg-config doesn't find a proper .pc file. +# +# The `xxx_libstaticconf' variables are for the `freetype-config' script. +# +# Note that a call to PKG_CHECK_MODULES(XXX, ...) sets and creates the +# output variables `XXX_CFLAGS' and `XXX_LIBS'. In case one or both are set +# for a library by the user, no entry for this library is added to +# `Requires.private'. Instead, it gets added to `Libs.private' + + # check for system zlib -# don't quote AS_HELP_STRING! AC_ARG_WITH([zlib], - AS_HELP_STRING([--without-zlib], - [use internal zlib instead of system-wide])) -if test x$with_zlib != xno && test -z "$LIBZ"; then - AC_CHECK_LIB([z], [gzsetparams], [AC_CHECK_HEADER([zlib.h], [LIBZ='-lz'])]) + [AS_HELP_STRING([--with-zlib=@<:@yes|no|auto@:>@], + [use system zlib instead of internal library @<:@default=auto@:>@])], + [], [with_zlib=auto]) + +have_zlib=no +if test x"$with_zlib" = xyes -o x"$with_zlib" = xauto; then + zlib_pkg="zlib" + have_zlib_pkg=no + + if test x"$ZLIB_CFLAGS" = x -a x"$ZLIB_LIBS" = x; then + PKG_CHECK_EXISTS([$zlib_pkg], [have_zlib_pkg=yes]) + fi + PKG_CHECK_MODULES([ZLIB], [$zlib_pkg], + [have_zlib="yes (pkg-config)"], [:]) + + if test $have_zlib_pkg = yes; then + # we have zlib.pc + zlib_reqpriv="$zlib_pkg" + zlib_libpriv= + zlib_libstaticconf=`$PKG_CONFIG --static --libs "$zlib_pkg"` + else + zlib_reqpriv= + + if test "$have_zlib" != no; then + # ZLIB_CFLAGS and ZLIB_LIBS are set by the user + zlib_libpriv="$ZLIB_LIBS" + zlib_libstaticconf="$ZLIB_LIBS" + have_zlib="yes (ZLIB_CFLAGS and ZLIB_LIBS)" + else + # fall back to standard autoconf test + AC_CHECK_LIB([z], + [gzsetparams], + [AC_CHECK_HEADER([zlib.h], + [have_zlib="yes (autoconf test)" + zlib_libpriv="-lz" + zlib_libstaticconf="$zlib_libpriv" + ZLIB_LIBS="$zlib_libpriv"])]) + fi + fi fi -if test x$with_zlib != xno && test -n "$LIBZ"; then - CFLAGS="$CFLAGS -DFT_CONFIG_OPTION_SYSTEM_ZLIB" - LDFLAGS="$LDFLAGS $LIBZ" - SYSTEM_ZLIB=yes + +if test x"$with_zlib" = xyes -a "$have_zlib" = no; then + AC_MSG_ERROR([external zlib support requested but library not found]) fi + # check for system libbz2 -# don't quote AS_HELP_STRING! AC_ARG_WITH([bzip2], - AS_HELP_STRING([--without-bzip2], - [do not support bzip2 compressed fonts])) -if test x$with_bzip2 != xno && test -z "$LIBBZ2"; then - AC_CHECK_LIB([bz2], [BZ2_bzDecompress], [AC_CHECK_HEADER([bzlib.h], [LIBBZ2='-lbz2'])]) + [AS_HELP_STRING([--with-bzip2=@<:@yes|no|auto@:>@], + [support bzip2 compressed fonts @<:@default=auto@:>@])], + [], [with_bzip2=auto]) + +have_bzip2=no +if test x"$with_bzip2" = xyes -o x"$with_bzip2" = xauto; then + bzip2_pkg="bzip2" + have_bzip2_pkg=no + + if test x"$BZIP2_CFLAGS" = x -a x"$BZIP2_LIBS" = x; then + PKG_CHECK_EXISTS([$bzip2_pkg], [have_bzip2_pkg=yes]) + fi + PKG_CHECK_MODULES([BZIP2], [$bzip2_pkg], + [have_bzip2="yes (pkg-config)"], [:]) + + if test $have_bzip2_pkg = yes; then + # we have bzip2.pc + bzip2_reqpriv="$bzip2_pkg" + bzip2_libpriv= + bzip2_libstaticconf=`$PKG_CONFIG --static --libs "$bzip2_pkg"` + else + bzip2_reqpriv= + + if test "$have_bzip2" != no; then + # BZIP2_CFLAGS and BZIP2_LIBS are set by the user + bzip2_libpriv="$BZIP2_LIBS" + bzip2_libstaticconf="$BZIP2_LIBS" + have_bzip2="yes (BZIP2_CFLAGS and BZIP2_LIBS)" + else + # fall back to standard autoconf test + AC_CHECK_LIB([bz2], + [BZ2_bzDecompress], + [AC_CHECK_HEADER([bzlib.h], + [have_bzip2="yes (autoconf test)" + bzip2_libpriv="-lbz2" + bzip2_libstaticconf="$bzip2_libpriv" + BZIP2_LIBS="$bzip2_libpriv"])]) + fi + fi +fi + +if test x"$with_bzip2" = xyes -a "$have_bzip2" = no; then + AC_MSG_ERROR([bzip2 support requested but library not found]) +fi + + +# check for system libpng + +AC_ARG_WITH([png], + [AS_HELP_STRING([--with-png=@<:@yes|no|auto@:>@], + [support png compressed OpenType embedded bitmaps @<:@default=auto@:>@])], + [], [with_png=auto]) + +have_libpng=no +if test x"$with_png" = xyes -o x"$with_png" = xauto; then + libpng_pkg="libpng" + have_libpng_pkg=no + + if test x"$LIBPNG_CFLAGS" = x -a x"$LIBPNG_LIBS" = x; then + PKG_CHECK_EXISTS([$libpng_pkg], [have_libpng_pkg=yes]) + fi + PKG_CHECK_MODULES([LIBPNG], [$libpng_pkg], + [have_libpng="yes (pkg-config)"], [:]) + + if test $have_libpng_pkg = yes; then + # we have libpng.pc + libpng_reqpriv="$libpng_pkg" + libpng_libpriv= + libpng_libstaticconf=`$PKG_CONFIG --static --libs "$libpng_pkg"` + else + libpng_reqpriv= + + if test "$have_libpng" != no; then + # LIBPNG_CFLAGS and LIBPNG_LIBS are set by the user + libpng_libpriv="$LIBPNG_LIBS" + libpng_libstaticconf="$LIBPNG_LIBS" + have_libpng="yes (LIBPNG_CFLAGS and LIBPNG_LIBS)" + else + # fall back to config script. + AC_MSG_CHECKING([for libpng-config]) + if which libpng-config > /dev/null 2>&1; then + LIBPNG_CFLAGS=`libpng-config --cflags` + LIBPNG_LIBS=`libpng-config --ldflags` + libpng_libpriv=`libpng-config --static --ldflags` + libpng_libstaticconf="$libpng_libpriv" + have_libpng="yes (libpng-config)" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + fi + fi fi -if test x$with_bzip2 != xno && test -n "$LIBBZ2"; then - CFLAGS="$CFLAGS -DFT_CONFIG_OPTION_USE_BZIP2" - LDFLAGS="$LDFLAGS $LIBBZ2" + +if test x"$with_png" = xyes -a "$have_libpng" = no; then + AC_MSG_ERROR([libpng support requested but library not found]) +fi + + +# check for system libharfbuzz + +AC_ARG_WITH([harfbuzz], + [AS_HELP_STRING([--with-harfbuzz=@<:@yes|no|auto@:>@], + [improve auto-hinting of OpenType fonts @<:@default=auto@:>@])], + [], [with_harfbuzz=auto]) + +have_harfbuzz=no +if test x"$with_harfbuzz" = xyes -o x"$with_harfbuzz" = xauto; then + harfbuzz_pkg="harfbuzz >= 0.9.19" + have_harfbuzz_pkg=no + + if test x"$HARFBUZZ_CFLAGS" = x -a x"$HARFBUZZ_LIBS" = x; then + PKG_CHECK_EXISTS([$harfbuzz_pkg], [have_harfbuzz_pkg=yes]) + fi + PKG_CHECK_MODULES([HARFBUZZ], [$harfbuzz_pkg], + [have_harfbuzz="yes (pkg-config)"], [:]) + + if test $have_harfbuzz_pkg = yes; then + # we have harfbuzz.pc + harfbuzz_reqpriv="$harfbuzz_pkg" + harfbuzz_libpriv= + harfbuzz_libstaticconf=`$PKG_CONFIG --static --libs "$harfbuzz_pkg"` + else + harfbuzz_reqpriv= + + if test "$have_harfbuzz" != no; then + # HARFBUZZ_CFLAGS and HARFBUZZ_LIBS are set by the user + harfbuzz_libpriv="$HARFBUZZ_LIBS" + harfbuzz_libstaticconf="$HARFBUZZ_LIBS" + have_harfbuzz="yes (HARFBUZZ_CFLAGS and HARFBUZZ_LIBS)" + else + # since HarfBuzz is quite a new library we don't fall back to a + # different test; additionally, it has too many dependencies + : + fi + fi +fi + +if test x"$with_harfbuzz" = xyes -a "$have_harfbuzz" = no; then + AC_MSG_ERROR([harfbuzz support requested but library not found]) fi + # Some options handling SDKs/archs in CFLAGS should be copied # to LDFLAGS. Apple TechNote 2137 recommends to include these # options in CFLAGS but not in LDFLAGS. @@ -276,7 +525,7 @@ do shift 1 ;; -m32|-m64|-march=*|-mcpu=*) # options taking no argument - AC_MSG_RESULT([whether CFLAGS and LDFLAGS share ${c}]) + AC_MSG_CHECKING([whether CFLAGS and LDFLAGS share ${c}]) if expr " ${LDFLAGS} " : ".* ${c} *${a}.*" > /dev/null then AC_MSG_RESULT([yes]) @@ -299,15 +548,14 @@ set ${save_config_args} ftmac_c="" # src/base/ftmac.c should not be included in makefiles by default -# don't quote AS_HELP_STRING! AC_ARG_WITH([old-mac-fonts], AS_HELP_STRING([--with-old-mac-fonts], [allow Mac resource-based fonts to be used])) if test x$with_old_mac_fonts = xyes; then orig_LDFLAGS="${LDFLAGS}" AC_MSG_CHECKING([CoreServices & ApplicationServices of Mac OS X]) - FT2_EXTRA_LIBS="-Wl,-framework,CoreServices -Wl,-framework,ApplicationServices" - LDFLAGS="$LDFLAGS $FT2_EXTRA_LIBS" + ft2_extra_libs="-Wl,-framework,CoreServices -Wl,-framework,ApplicationServices" + LDFLAGS="$LDFLAGS $ft2_extra_libs" AC_LINK_IFELSE([ AC_LANG_PROGRAM([ @@ -393,7 +641,7 @@ if test x$with_old_mac_fonts = xyes; then CFLAGS="$CFLAGS -DHAVE_TYPE_RESOURCE_INDEX=0" ])], [AC_MSG_RESULT([not found]) - FT2_EXTRA_LIBS="" + ft2_extra_libs="" LDFLAGS="${orig_LDFLAGS}" CFLAGS="$CFLAGS -DDARWIN_NO_CARBON"]) else @@ -408,7 +656,7 @@ else fi -# Whether to use FileManager which is deprecated since Mac OS X 10.4. +# Whether to use FileManager, which is deprecated since Mac OS X 10.4. AC_ARG_WITH([fsspec], AS_HELP_STRING([--with-fsspec], @@ -517,7 +765,7 @@ elif test x$with_old_mac_fonts = xyes -a x$with_fsref != x; then fi -# Whether to use QuickDraw API in ToolBox which is deprecated since +# Whether to use QuickDraw API in ToolBox, which is deprecated since # Mac OS X 10.4. AC_ARG_WITH([quickdraw-toolbox], @@ -559,7 +807,7 @@ elif test x$with_old_mac_fonts = xyes -a x$with_quickdraw_toolbox != x; then fi -# Whether to use QuickDraw API in Carbon which is deprecated since +# Whether to use QuickDraw API in Carbon, which is deprecated since # Mac OS X 10.4. AC_ARG_WITH([quickdraw-carbon], @@ -613,7 +861,6 @@ fi # Whether to use AppleTypeService since Mac OS X. -# don't quote AS_HELP_STRING! AC_ARG_WITH([ats], AS_HELP_STRING([--with-ats], [use AppleTypeService, if available (default=yes)])) @@ -664,22 +911,82 @@ case "$CFLAGS" in esac -AC_SUBST([ftmac_c]) -AC_SUBST([LIBZ]) -AC_SUBST([LIBBZ2]) -AC_SUBST([CFLAGS]) -AC_SUBST([LDFLAGS]) -AC_SUBST([FT2_EXTRA_LIBS]) -AC_SUBST([SYSTEM_ZLIB]) +# entries in Requires.private are separated by commas; +REQUIRES_PRIVATE="$zlib_reqpriv, \ + $bzip2_reqpriv, \ + $libpng_reqpriv, \ + $harfbuzz_reqpriv" +# beautify +REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVATE" \ + | sed -e 's/^ *//' \ + -e 's/ *$//' \ + -e 's/, */,/g' \ + -e 's/,,*/,/g' \ + -e 's/^,*//' \ + -e 's/,*$//' \ + -e 's/,/, /g'` + +LIBS_PRIVATE="$zlib_libpriv \ + $bzip2_libpriv \ + $libpng_libpriv \ + $harfbuzz_libpriv \ + $ft2_extra_libs" +# beautify +LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \ + | sed -e 's/^ *//' \ + -e 's/ *$//' \ + -e 's/ */ /g'` + +LIBSSTATIC_CONFIG="-lfreetype \ + $zlib_libstaticconf \ + $bzip2_libstaticconf \ + $libpng_libstaticconf \ + $harfbuzz_libstaticconf \ + $ft2_extra_libs" +# remove -L/usr/lib and -L/usr/lib64 since `freetype-config' adds them later +# on if necessary; also beautify +LIBSSTATIC_CONFIG=`echo "$LIBSSTATIC_CONFIG" \ + | sed -e 's|-L */usr/lib64/* | |g' \ + -e 's|-L */usr/lib/* | |g' \ + -e 's/^ *//' \ + -e 's/ *$//' \ + -e 's/ */ /g'` -LT_INIT(win32-dll) +AC_SUBST([ftmac_c]) +AC_SUBST([REQUIRES_PRIVATE]) +AC_SUBST([LIBS_PRIVATE]) +AC_SUBST([LIBSSTATIC_CONFIG]) AC_SUBST([hardcode_libdir_flag_spec]) AC_SUBST([wl]) AC_SUBST([build_libtool_libs]) +# changing LDFLAGS value should only be done after +# lt_cv_prog_compiler_static_works test + +if test "$have_zlib" != no; then + CFLAGS="$CFLAGS $ZLIB_CFLAGS -DFT_CONFIG_OPTION_SYSTEM_ZLIB" + LDFLAGS="$LDFLAGS $ZLIB_LIBS" +fi + +if test "$have_bzip2" != no; then + CFLAGS="$CFLAGS $BZIP2_CFLAGS -DFT_CONFIG_OPTION_USE_BZIP2" + LDFLAGS="$LDFLAGS $BZIP2_LIBS" +fi +if test "$have_libpng" != no; then + CFLAGS="$CFLAGS $LIBPNG_CFLAGS -DFT_CONFIG_OPTION_USE_PNG" + LDFLAGS="$LDFLAGS $LIBPNG_LIBS" +fi +if test "$have_harfbuzz" != no; then + CFLAGS="$CFLAGS $HARFBUZZ_CFLAGS -DFT_CONFIG_OPTION_USE_HARFBUZZ" + LDFLAGS="$LDFLAGS $HARFBUZZ_LIBS" +fi + +AC_SUBST([CFLAGS]) +AC_SUBST([LDFLAGS]) + # configuration file -- stay in 8.3 limit # # since #undef doesn't survive in configuration header files we replace @@ -694,9 +1001,7 @@ AC_CONFIG_HEADERS([ftconfig.h:ftconfig.in], # and `builds/unix/unix-cc.mk' that will be used by the build system # AC_CONFIG_FILES([unix-cc.mk:unix-cc.in - unix-def.mk:unix-def.in - freetype-config - freetype2.pc:freetype2.in]) + unix-def.mk:unix-def.in]) # re-generate the Jamfile to use libtool now # @@ -704,4 +1009,13 @@ AC_CONFIG_FILES([unix-cc.mk:unix-cc.in AC_OUTPUT +AC_MSG_NOTICE([ + +Library configuration: + external zlib: $have_zlib + bzip2: $have_bzip2 + libpng: $have_libpng + harfbuzz: $have_harfbuzz +]) + # end of configure.raw diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw index 111dbab..72543cf 100644 --- a/builds/unix/configure.raw +++ b/builds/unix/configure.raw @@ -2,7 +2,7 @@ # # Process this file with autoconf to produce a configure script. # -# Copyright 2001-2012 by +# Copyright 2001-2014 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='14:1:8' +version_info='17:4:11' AC_SUBST([version_info]) ft_version=`echo $version_info | tr : .` AC_SUBST([ft_version]) @@ -34,6 +34,10 @@ AC_PROG_CC AC_PROG_CPP AC_SUBST(EXEEXT) +PKG_PROG_PKG_CONFIG([0.24]) + +LT_INIT(win32-dll) + # checks for native programs to generate building tool @@ -66,32 +70,8 @@ AC_SUBST(CC_BUILD) AC_SUBST(EXEEXT_BUILD) - -# get compiler flags right - -if test "x$GCC" = xyes; then - XX_CFLAGS="-Wall" - XX_ANSIFLAGS="-pedantic -ansi" -else - case "$host" in - *-dec-osf*) - CFLAGS= - XX_CFLAGS="-std1 -g3" - XX_ANSIFLAGS= - ;; - *) - XX_CFLAGS= - XX_ANSIFLAGS= - ;; - esac -fi -AC_SUBST([XX_CFLAGS]) -AC_SUBST([XX_ANSIFLAGS]) - - # auxiliary programs -AC_CHECK_PROG([RMF], [rm], [rm -f]) AC_CHECK_PROG([RMDIR], [rmdir], [rmdir]) @@ -127,8 +107,14 @@ AC_CHECK_SIZEOF([long]) AC_MSG_CHECKING([whether cpp computation of bit length in ftconfig.in works]) orig_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="-I${srcdir} -I. ${CPPFLAGS}" -ac_clean_files="ft2build.h ftoption.h ftstdlib.h" -touch ft2build.h ftoption.h ftstdlib.h + +ac_clean_files= +for f in ft2build.h ftoption.h ftstdlib.h; do + if test ! -f $f; then + ac_clean_files="$ac_clean_files $f" + touch $f + fi +done cat > conftest.c <<\_ACEOF #include @@ -147,7 +133,7 @@ echo >> conftest.c "#endif" ${CPP} ${CPPFLAGS} conftest.c | ${GREP} ac_cpp_ft > conftest.sh eval `cat conftest.sh` -${RMF} conftest.c conftest.sh confft2build.h ftoption.h ftstdlib.h +rm -f conftest.* $ac_clean_files if test x != "x${ac_cpp_ft_sizeof_int}" \ -a x != x"${ac_cpp_ft_sizeof_long}"; then @@ -180,7 +166,8 @@ case :${ft_use_autoconf_sizeof_types}:${enable_biarch_config}: in esac if test x"${ft_use_autoconf_sizeof_types}" = xyes; then - AC_DEFINE([FT_USE_AUTOCONF_SIZEOF_TYPES]) + AC_DEFINE([FT_USE_AUTOCONF_SIZEOF_TYPES], [], + [Define if autoconf sizeof types should be used.]) fi CPPFLAGS="${orig_CPPFLAGS}" @@ -222,35 +209,297 @@ AC_SUBST([FTSYS_SRC]) AC_CHECK_FUNCS([memcpy memmove]) +# get compiler flags right +# +# We try to make the compiler work for C89-strict source. Even if the +# C compiler is gcc and C89 flags are available, some system headers +# (e.g., Android Bionic libc) are broken in C89 mode. We have to check +# whether the compilation finishes successfully. +# +# Due to bugs in mingwrt 4.0.3 we don't use `-ansi' for MinGW. +# +# To avoid zillions of +# +# ISO C90 does not support 'long long' +# +# warnings, we disable `-pedantic' for gcc version < 4.6. +# +if test "x$GCC" = xyes; then + XX_CFLAGS="-Wall" + case "$host" in + *-*-mingw*) + XX_ANSIFLAGS="-pedantic" + ;; + *) + GCC_VERSION=`$CC -dumpversion` + GCC_MAJOR=`echo "$GCC_VERSION" | sed 's/\([[^.]][[^.]]*\).*/\1/'` + GCC_MINOR=`echo "$GCC_VERSION" | sed 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1/'` + + XX_PEDANTIC=-pedantic + if test $GCC_MAJOR -lt 4; then + XX_PEDANTIC= + else + if test $GCC_MAJOR -eq 4 -a $GCC_MINOR -lt 6; then + XX_PEDANTIC= + fi + fi + + XX_ANSIFLAGS="" + for a in $XX_PEDANTIC -ansi + do + AC_MSG_CHECKING([gcc compiler flag ${a} to assure ANSI C works correctly]) + orig_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} ${XX_ANSIFLAGS} ${a}" + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM([ + +#include + + ], + [ + + { + puts( "" ); + return 0; + } + + ])], + [AC_MSG_RESULT([ok, add it to XX_ANSIFLAGS]) + XX_ANSIFLAGS="${XX_ANSIFLAGS} ${a}" + ], + [AC_MSG_RESULT([no])]) + CFLAGS="${orig_CFLAGS}" + done + ;; + esac +else + case "$host" in + *-dec-osf*) + CFLAGS= + XX_CFLAGS="-std1 -g3" + XX_ANSIFLAGS= + ;; + *) + XX_CFLAGS= + XX_ANSIFLAGS= + ;; + esac +fi +AC_SUBST([XX_CFLAGS]) +AC_SUBST([XX_ANSIFLAGS]) + + +# All library tests below try `pkg-config' first. If that fails, a function +# from the library is tested in the traditional autoconf way (zlib, bzip2), +# or a config script is called (libpng). +# +# The `xxx_reqpriv' variables are for the `Requires.private' field in +# `freetype2.pc'. The `xxx_libpriv' variables are for the `Libs.private' +# field in `freetype2.pc' if pkg-config doesn't find a proper .pc file. +# +# The `xxx_libstaticconf' variables are for the `freetype-config' script. +# +# Note that a call to PKG_CHECK_MODULES(XXX, ...) sets and creates the +# output variables `XXX_CFLAGS' and `XXX_LIBS'. In case one or both are set +# for a library by the user, no entry for this library is added to +# `Requires.private'. Instead, it gets added to `Libs.private' + + # check for system zlib -# don't quote AS_HELP_STRING! AC_ARG_WITH([zlib], - AS_HELP_STRING([--without-zlib], - [use internal zlib instead of system-wide])) -if test x$with_zlib != xno && test -z "$LIBZ"; then - AC_CHECK_LIB([z], [gzsetparams], [AC_CHECK_HEADER([zlib.h], [LIBZ='-lz'])]) + [AS_HELP_STRING([--with-zlib=@<:@yes|no|auto@:>@], + [use system zlib instead of internal library @<:@default=auto@:>@])], + [], [with_zlib=auto]) + +have_zlib=no +if test x"$with_zlib" = xyes -o x"$with_zlib" = xauto; then + zlib_pkg="zlib" + have_zlib_pkg=no + + if test x"$ZLIB_CFLAGS" = x -a x"$ZLIB_LIBS" = x; then + PKG_CHECK_EXISTS([$zlib_pkg], [have_zlib_pkg=yes]) + fi + PKG_CHECK_MODULES([ZLIB], [$zlib_pkg], + [have_zlib="yes (pkg-config)"], [:]) + + if test $have_zlib_pkg = yes; then + # we have zlib.pc + zlib_reqpriv="$zlib_pkg" + zlib_libpriv= + zlib_libstaticconf=`$PKG_CONFIG --static --libs "$zlib_pkg"` + else + zlib_reqpriv= + + if test "$have_zlib" != no; then + # ZLIB_CFLAGS and ZLIB_LIBS are set by the user + zlib_libpriv="$ZLIB_LIBS" + zlib_libstaticconf="$ZLIB_LIBS" + have_zlib="yes (ZLIB_CFLAGS and ZLIB_LIBS)" + else + # fall back to standard autoconf test + AC_CHECK_LIB([z], + [gzsetparams], + [AC_CHECK_HEADER([zlib.h], + [have_zlib="yes (autoconf test)" + zlib_libpriv="-lz" + zlib_libstaticconf="$zlib_libpriv" + ZLIB_LIBS="$zlib_libpriv"])]) + fi + fi fi -if test x$with_zlib != xno && test -n "$LIBZ"; then - CFLAGS="$CFLAGS -DFT_CONFIG_OPTION_SYSTEM_ZLIB" - LDFLAGS="$LDFLAGS $LIBZ" - SYSTEM_ZLIB=yes + +if test x"$with_zlib" = xyes -a "$have_zlib" = no; then + AC_MSG_ERROR([external zlib support requested but library not found]) fi + # check for system libbz2 -# don't quote AS_HELP_STRING! AC_ARG_WITH([bzip2], - AS_HELP_STRING([--without-bzip2], - [do not support bzip2 compressed fonts])) -if test x$with_bzip2 != xno && test -z "$LIBBZ2"; then - AC_CHECK_LIB([bz2], [BZ2_bzDecompress], [AC_CHECK_HEADER([bzlib.h], [LIBBZ2='-lbz2'])]) + [AS_HELP_STRING([--with-bzip2=@<:@yes|no|auto@:>@], + [support bzip2 compressed fonts @<:@default=auto@:>@])], + [], [with_bzip2=auto]) + +have_bzip2=no +if test x"$with_bzip2" = xyes -o x"$with_bzip2" = xauto; then + bzip2_pkg="bzip2" + have_bzip2_pkg=no + + if test x"$BZIP2_CFLAGS" = x -a x"$BZIP2_LIBS" = x; then + PKG_CHECK_EXISTS([$bzip2_pkg], [have_bzip2_pkg=yes]) + fi + PKG_CHECK_MODULES([BZIP2], [$bzip2_pkg], + [have_bzip2="yes (pkg-config)"], [:]) + + if test $have_bzip2_pkg = yes; then + # we have bzip2.pc + bzip2_reqpriv="$bzip2_pkg" + bzip2_libpriv= + bzip2_libstaticconf=`$PKG_CONFIG --static --libs "$bzip2_pkg"` + else + bzip2_reqpriv= + + if test "$have_bzip2" != no; then + # BZIP2_CFLAGS and BZIP2_LIBS are set by the user + bzip2_libpriv="$BZIP2_LIBS" + bzip2_libstaticconf="$BZIP2_LIBS" + have_bzip2="yes (BZIP2_CFLAGS and BZIP2_LIBS)" + else + # fall back to standard autoconf test + AC_CHECK_LIB([bz2], + [BZ2_bzDecompress], + [AC_CHECK_HEADER([bzlib.h], + [have_bzip2="yes (autoconf test)" + bzip2_libpriv="-lbz2" + bzip2_libstaticconf="$bzip2_libpriv" + BZIP2_LIBS="$bzip2_libpriv"])]) + fi + fi +fi + +if test x"$with_bzip2" = xyes -a "$have_bzip2" = no; then + AC_MSG_ERROR([bzip2 support requested but library not found]) +fi + + +# check for system libpng + +AC_ARG_WITH([png], + [AS_HELP_STRING([--with-png=@<:@yes|no|auto@:>@], + [support png compressed OpenType embedded bitmaps @<:@default=auto@:>@])], + [], [with_png=auto]) + +have_libpng=no +if test x"$with_png" = xyes -o x"$with_png" = xauto; then + libpng_pkg="libpng" + have_libpng_pkg=no + + if test x"$LIBPNG_CFLAGS" = x -a x"$LIBPNG_LIBS" = x; then + PKG_CHECK_EXISTS([$libpng_pkg], [have_libpng_pkg=yes]) + fi + PKG_CHECK_MODULES([LIBPNG], [$libpng_pkg], + [have_libpng="yes (pkg-config)"], [:]) + + if test $have_libpng_pkg = yes; then + # we have libpng.pc + libpng_reqpriv="$libpng_pkg" + libpng_libpriv= + libpng_libstaticconf=`$PKG_CONFIG --static --libs "$libpng_pkg"` + else + libpng_reqpriv= + + if test "$have_libpng" != no; then + # LIBPNG_CFLAGS and LIBPNG_LIBS are set by the user + libpng_libpriv="$LIBPNG_LIBS" + libpng_libstaticconf="$LIBPNG_LIBS" + have_libpng="yes (LIBPNG_CFLAGS and LIBPNG_LIBS)" + else + # fall back to config script. + AC_MSG_CHECKING([for libpng-config]) + if which libpng-config > /dev/null 2>&1; then + LIBPNG_CFLAGS=`libpng-config --cflags` + LIBPNG_LIBS=`libpng-config --ldflags` + libpng_libpriv=`libpng-config --static --ldflags` + libpng_libstaticconf="$libpng_libpriv" + have_libpng="yes (libpng-config)" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + fi + fi fi -if test x$with_bzip2 != xno && test -n "$LIBBZ2"; then - CFLAGS="$CFLAGS -DFT_CONFIG_OPTION_USE_BZIP2" - LDFLAGS="$LDFLAGS $LIBBZ2" + +if test x"$with_png" = xyes -a "$have_libpng" = no; then + AC_MSG_ERROR([libpng support requested but library not found]) +fi + + +# check for system libharfbuzz + +AC_ARG_WITH([harfbuzz], + [AS_HELP_STRING([--with-harfbuzz=@<:@yes|no|auto@:>@], + [improve auto-hinting of OpenType fonts @<:@default=auto@:>@])], + [], [with_harfbuzz=auto]) + +have_harfbuzz=no +if test x"$with_harfbuzz" = xyes -o x"$with_harfbuzz" = xauto; then + harfbuzz_pkg="harfbuzz >= 0.9.19" + have_harfbuzz_pkg=no + + if test x"$HARFBUZZ_CFLAGS" = x -a x"$HARFBUZZ_LIBS" = x; then + PKG_CHECK_EXISTS([$harfbuzz_pkg], [have_harfbuzz_pkg=yes]) + fi + PKG_CHECK_MODULES([HARFBUZZ], [$harfbuzz_pkg], + [have_harfbuzz="yes (pkg-config)"], [:]) + + if test $have_harfbuzz_pkg = yes; then + # we have harfbuzz.pc + harfbuzz_reqpriv="$harfbuzz_pkg" + harfbuzz_libpriv= + harfbuzz_libstaticconf=`$PKG_CONFIG --static --libs "$harfbuzz_pkg"` + else + harfbuzz_reqpriv= + + if test "$have_harfbuzz" != no; then + # HARFBUZZ_CFLAGS and HARFBUZZ_LIBS are set by the user + harfbuzz_libpriv="$HARFBUZZ_LIBS" + harfbuzz_libstaticconf="$HARFBUZZ_LIBS" + have_harfbuzz="yes (HARFBUZZ_CFLAGS and HARFBUZZ_LIBS)" + else + # since HarfBuzz is quite a new library we don't fall back to a + # different test; additionally, it has too many dependencies + : + fi + fi +fi + +if test x"$with_harfbuzz" = xyes -a "$have_harfbuzz" = no; then + AC_MSG_ERROR([harfbuzz support requested but library not found]) fi + # Some options handling SDKs/archs in CFLAGS should be copied # to LDFLAGS. Apple TechNote 2137 recommends to include these # options in CFLAGS but not in LDFLAGS. @@ -276,7 +525,7 @@ do shift 1 ;; -m32|-m64|-march=*|-mcpu=*) # options taking no argument - AC_MSG_RESULT([whether CFLAGS and LDFLAGS share ${c}]) + AC_MSG_CHECKING([whether CFLAGS and LDFLAGS share ${c}]) if expr " ${LDFLAGS} " : ".* ${c} *${a}.*" > /dev/null then AC_MSG_RESULT([yes]) @@ -299,15 +548,14 @@ set ${save_config_args} ftmac_c="" # src/base/ftmac.c should not be included in makefiles by default -# don't quote AS_HELP_STRING! AC_ARG_WITH([old-mac-fonts], AS_HELP_STRING([--with-old-mac-fonts], [allow Mac resource-based fonts to be used])) if test x$with_old_mac_fonts = xyes; then orig_LDFLAGS="${LDFLAGS}" AC_MSG_CHECKING([CoreServices & ApplicationServices of Mac OS X]) - FT2_EXTRA_LIBS="-Wl,-framework,CoreServices -Wl,-framework,ApplicationServices" - LDFLAGS="$LDFLAGS $FT2_EXTRA_LIBS" + ft2_extra_libs="-Wl,-framework,CoreServices -Wl,-framework,ApplicationServices" + LDFLAGS="$LDFLAGS $ft2_extra_libs" AC_LINK_IFELSE([ AC_LANG_PROGRAM([ @@ -393,7 +641,7 @@ if test x$with_old_mac_fonts = xyes; then CFLAGS="$CFLAGS -DHAVE_TYPE_RESOURCE_INDEX=0" ])], [AC_MSG_RESULT([not found]) - FT2_EXTRA_LIBS="" + ft2_extra_libs="" LDFLAGS="${orig_LDFLAGS}" CFLAGS="$CFLAGS -DDARWIN_NO_CARBON"]) else @@ -408,7 +656,7 @@ else fi -# Whether to use FileManager which is deprecated since Mac OS X 10.4. +# Whether to use FileManager, which is deprecated since Mac OS X 10.4. AC_ARG_WITH([fsspec], AS_HELP_STRING([--with-fsspec], @@ -517,7 +765,7 @@ elif test x$with_old_mac_fonts = xyes -a x$with_fsref != x; then fi -# Whether to use QuickDraw API in ToolBox which is deprecated since +# Whether to use QuickDraw API in ToolBox, which is deprecated since # Mac OS X 10.4. AC_ARG_WITH([quickdraw-toolbox], @@ -559,7 +807,7 @@ elif test x$with_old_mac_fonts = xyes -a x$with_quickdraw_toolbox != x; then fi -# Whether to use QuickDraw API in Carbon which is deprecated since +# Whether to use QuickDraw API in Carbon, which is deprecated since # Mac OS X 10.4. AC_ARG_WITH([quickdraw-carbon], @@ -613,7 +861,6 @@ fi # Whether to use AppleTypeService since Mac OS X. -# don't quote AS_HELP_STRING! AC_ARG_WITH([ats], AS_HELP_STRING([--with-ats], [use AppleTypeService, if available (default=yes)])) @@ -664,22 +911,82 @@ case "$CFLAGS" in esac -AC_SUBST([ftmac_c]) -AC_SUBST([LIBZ]) -AC_SUBST([LIBBZ2]) -AC_SUBST([CFLAGS]) -AC_SUBST([LDFLAGS]) -AC_SUBST([FT2_EXTRA_LIBS]) -AC_SUBST([SYSTEM_ZLIB]) +# entries in Requires.private are separated by commas; +REQUIRES_PRIVATE="$zlib_reqpriv, \ + $bzip2_reqpriv, \ + $libpng_reqpriv, \ + $harfbuzz_reqpriv" +# beautify +REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVATE" \ + | sed -e 's/^ *//' \ + -e 's/ *$//' \ + -e 's/, */,/g' \ + -e 's/,,*/,/g' \ + -e 's/^,*//' \ + -e 's/,*$//' \ + -e 's/,/, /g'` + +LIBS_PRIVATE="$zlib_libpriv \ + $bzip2_libpriv \ + $libpng_libpriv \ + $harfbuzz_libpriv \ + $ft2_extra_libs" +# beautify +LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \ + | sed -e 's/^ *//' \ + -e 's/ *$//' \ + -e 's/ */ /g'` + +LIBSSTATIC_CONFIG="-lfreetype \ + $zlib_libstaticconf \ + $bzip2_libstaticconf \ + $libpng_libstaticconf \ + $harfbuzz_libstaticconf \ + $ft2_extra_libs" +# remove -L/usr/lib and -L/usr/lib64 since `freetype-config' adds them later +# on if necessary; also beautify +LIBSSTATIC_CONFIG=`echo "$LIBSSTATIC_CONFIG" \ + | sed -e 's|-L */usr/lib64/* | |g' \ + -e 's|-L */usr/lib/* | |g' \ + -e 's/^ *//' \ + -e 's/ *$//' \ + -e 's/ */ /g'` -LT_INIT(win32-dll) +AC_SUBST([ftmac_c]) +AC_SUBST([REQUIRES_PRIVATE]) +AC_SUBST([LIBS_PRIVATE]) +AC_SUBST([LIBSSTATIC_CONFIG]) AC_SUBST([hardcode_libdir_flag_spec]) AC_SUBST([wl]) AC_SUBST([build_libtool_libs]) +# changing LDFLAGS value should only be done after +# lt_cv_prog_compiler_static_works test + +if test "$have_zlib" != no; then + CFLAGS="$CFLAGS $ZLIB_CFLAGS -DFT_CONFIG_OPTION_SYSTEM_ZLIB" + LDFLAGS="$LDFLAGS $ZLIB_LIBS" +fi + +if test "$have_bzip2" != no; then + CFLAGS="$CFLAGS $BZIP2_CFLAGS -DFT_CONFIG_OPTION_USE_BZIP2" + LDFLAGS="$LDFLAGS $BZIP2_LIBS" +fi +if test "$have_libpng" != no; then + CFLAGS="$CFLAGS $LIBPNG_CFLAGS -DFT_CONFIG_OPTION_USE_PNG" + LDFLAGS="$LDFLAGS $LIBPNG_LIBS" +fi +if test "$have_harfbuzz" != no; then + CFLAGS="$CFLAGS $HARFBUZZ_CFLAGS -DFT_CONFIG_OPTION_USE_HARFBUZZ" + LDFLAGS="$LDFLAGS $HARFBUZZ_LIBS" +fi + +AC_SUBST([CFLAGS]) +AC_SUBST([LDFLAGS]) + # configuration file -- stay in 8.3 limit # # since #undef doesn't survive in configuration header files we replace @@ -694,9 +1001,7 @@ AC_CONFIG_HEADERS([ftconfig.h:ftconfig.in], # and `builds/unix/unix-cc.mk' that will be used by the build system # AC_CONFIG_FILES([unix-cc.mk:unix-cc.in - unix-def.mk:unix-def.in - freetype-config - freetype2.pc:freetype2.in]) + unix-def.mk:unix-def.in]) # re-generate the Jamfile to use libtool now # @@ -704,4 +1009,13 @@ AC_CONFIG_FILES([unix-cc.mk:unix-cc.in AC_OUTPUT +AC_MSG_NOTICE([ + +Library configuration: + external zlib: $have_zlib + bzip2: $have_bzip2 + libpng: $have_libpng + harfbuzz: $have_harfbuzz +]) + # end of configure.raw diff --git a/builds/unix/detect.mk b/builds/unix/detect.mk index b2ae4f4..0506e7d 100644 --- a/builds/unix/detect.mk +++ b/builds/unix/detect.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2000, 2002, 2003, 2004, 2006 by +# Copyright 1996-2000, 2002-2004, 2006, 2013 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -76,13 +76,14 @@ ifeq ($(PLATFORM),unix) have_Makefile := $(wildcard $(OBJ_DIR)/Makefile) + CONFIG_SHELL ?= /bin/sh setup: std_setup ifdef must_configure ifneq ($(have_Makefile),) # we are building FT2 not in the src tree - $(TOP_DIR)/builds/unix/configure $(value CFG) + $(CONFIG_SHELL) $(TOP_DIR)/builds/unix/configure $(value CFG) else - cd builds/unix; ./configure $(value CFG) + cd builds/unix; $(CONFIG_SHELL) ./configure $(value CFG) endif endif diff --git a/builds/unix/freetype-config.in b/builds/unix/freetype-config.in index 815367b..ebc311f 100644 --- a/builds/unix/freetype-config.in +++ b/builds/unix/freetype-config.in @@ -1,6 +1,6 @@ #! /bin/sh # -# Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009 by +# Copyright 2000-2005, 2008, 2009, 2013, 2014 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -9,14 +9,15 @@ # indicate that you have read the license and understand and accept it # fully. -prefix=@prefix@ -exec_prefix=@exec_prefix@ -exec_prefix_set=no -includedir=@includedir@ -libdir=@libdir@ -enable_shared=@build_libtool_libs@ -wl=@wl@ -hardcode_libdir_flag_spec='@hardcode_libdir_flag_spec@' +LC_ALL=C +export LC_ALL + +prefix="%prefix%" +exec_prefix="%exec_prefix%" +exec_prefix_set="no" +includedir="%includedir%" +libdir="%libdir%" +enable_shared="%build_libtool_libs%" usage() { @@ -37,6 +38,8 @@ Options: --libtool display library name for linking with libtool --cflags display flags for compiling with the FreeType library + --static make command line options display flags + for static linking EOF exit $1 } @@ -72,7 +75,7 @@ while test $# -gt 0 ; do echo_exec_prefix=yes ;; --version) - echo @ft_version@ + echo %ft_version% exit 0 ;; --ftversion) @@ -87,6 +90,9 @@ while test $# -gt 0 ; do --libtool) echo_libtool=yes ;; + --static) + show_static=yes + ;; *) usage 1 1>&2 ;; @@ -118,13 +124,13 @@ else fi if test "$echo_ft_version" = "yes" ; then - major=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \ + major=`grep define ${SYSROOT}$includedir/freetype2/freetype.h \ | grep FREETYPE_MAJOR \ | sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'` - minor=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \ + minor=`grep define ${SYSROOT}$includedir/freetype2/freetype.h \ | grep FREETYPE_MINOR \ | sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'` - patch=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \ + patch=`grep define ${SYSROOT}$includedir/freetype2/freetype.h \ | grep FREETYPE_PATCH \ | sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'` echo $major.$minor.$patch @@ -132,20 +138,17 @@ fi if test "$echo_cflags" = "yes" ; then cflags="-I${SYSROOT}$includedir/freetype2" - if test "${SYSROOT}$includedir" != "/usr/include" ; then - echo $cflags -I${SYSROOT}$includedir - else - echo $cflags - fi + echo $cflags fi if test "$echo_libs" = "yes" ; then - rpath= - if test "$enable_shared" = "yes" ; then - eval "rpath=\"$hardcode_libdir_flag_spec\"" + libs="-lfreetype" + staticlibs="%LIBSSTATIC_CONFIG%" + if test "$show_static" = "yes" ; then + libs="$staticlibs" fi - libs="-lfreetype @LIBZ@ @LIBBZ2@ @FT2_EXTRA_LIBS@" - if test "${SYSROOT}$libdir" != "/usr/lib" && test "${SYSROOT}$libdir" != "/usr/lib64"; then + if test "${SYSROOT}$libdir" != "/usr/lib" && + test "${SYSROOT}$libdir" != "/usr/lib64"; then echo -L${SYSROOT}$libdir $libs else echo $libs diff --git a/builds/unix/freetype2.in b/builds/unix/freetype2.in index b731800..a488d96 100644 --- a/builds/unix/freetype2.in +++ b/builds/unix/freetype2.in @@ -1,12 +1,14 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ +prefix=%prefix% +exec_prefix=%exec_prefix% +libdir=%libdir% +includedir=%includedir%/freetype2 Name: FreeType 2 +URL: http://freetype.org Description: A free, high-quality, and portable font engine. -Version: @ft_version@ +Version: %ft_version% Requires: +Requires.private: %REQUIRES_PRIVATE% Libs: -L${libdir} -lfreetype -Libs.private: @LIBZ@ @LIBBZ2@ @FT2_EXTRA_LIBS@ -Cflags: -I${includedir}/freetype2 -I${includedir} +Libs.private: %LIBS_PRIVATE% +Cflags: -I${includedir} diff --git a/builds/unix/freetype2.m4 b/builds/unix/freetype2.m4 index 3d0ecb3..3a806d9 100644 --- a/builds/unix/freetype2.m4 +++ b/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, 2003, 2007, 2009 by +# Copyright 2001, 2003, 2007, 2009, 2014 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -15,7 +15,7 @@ # generated by Autoconf, under the same distribution terms as the rest of # that program. # -# serial 3 +# serial 4 # AC_CHECK_FT2([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) # Test for FreeType 2, and define FT2_CFLAGS and FT2_LIBS. @@ -61,7 +61,7 @@ AC_DEFUN([AC_CHECK_FT2], fi if test "x$FT2_CONFIG" = x ; then - AC_PATH_PROG([FT2_CONFIG], [freetype-config], [no]) + AC_PATH_TOOL([FT2_CONFIG], [freetype-config], [no]) fi min_ft_version=m4_if([$1], [], [7.0.1], [$1]) diff --git a/builds/unix/ft2unix.h b/builds/unix/ft2unix.h deleted file mode 100644 index 6a3b8d9..0000000 --- a/builds/unix/ft2unix.h +++ /dev/null @@ -1,61 +0,0 @@ -/***************************************************************************/ -/* */ -/* ft2build.h */ -/* */ -/* Build macros of the FreeType 2 library. */ -/* */ -/* Copyright 1996-2001, 2003, 2006 by */ -/* David Turner, Robert Wilhelm, and Werner Lemberg. */ -/* */ -/* This file is part of the FreeType project, and may only be used, */ -/* modified, and distributed under the terms of the FreeType project */ -/* license, LICENSE.TXT. By continuing to use, modify, or distribute */ -/* this file you indicate that you have read the license and */ -/* understand and accept it fully. */ -/* */ -/***************************************************************************/ - - - /*************************************************************************/ - /* */ - /* This is a Unix-specific version of that should be used */ - /* exclusively *after* installation of the library. */ - /* */ - /* It assumes that `/usr/local/include/freetype2' (or whatever is */ - /* returned by the `freetype-config --cflags' or `pkg-config --cflags' */ - /* command) is in your compilation include path. */ - /* */ - /* We don't need to do anything special in this release. However, for */ - /* a future FreeType 2 release, the following installation changes will */ - /* be performed: */ - /* */ - /* - The contents of `freetype-2.x/include/freetype' will be installed */ - /* to `/usr/local/include/freetype2' instead of */ - /* `/usr/local/include/freetype2/freetype'. */ - /* */ - /* - This file will #include , instead */ - /* of . */ - /* */ - /* - The contents of `ftheader.h' will be processed with `sed' to */ - /* replace all `' with `'. */ - /* */ - /* - Adding `/usr/local/include/freetype2' to your compilation include */ - /* path will not be necessary anymore. */ - /* */ - /* These changes will be transparent to client applications which use */ - /* freetype-config (or pkg-config). No modifications will be necessary */ - /* to compile with the new scheme. */ - /* */ - /*************************************************************************/ - - -#ifndef __FT2_BUILD_UNIX_H__ -#define __FT2_BUILD_UNIX_H__ - - /* `/include/freetype2' must be in your current inclusion path */ -#include - -#endif /* __FT2_BUILD_UNIX_H__ */ - - -/* END */ diff --git a/builds/unix/ftconfig.in b/builds/unix/ftconfig.in index 9531afd..e66f3ea 100644 --- a/builds/unix/ftconfig.in +++ b/builds/unix/ftconfig.in @@ -4,7 +4,7 @@ /* */ /* UNIX-specific configuration file (specification only). */ /* */ -/* Copyright 1996-2004, 2006-2009, 2011 by */ +/* Copyright 1996-2004, 2006-2009, 2011, 2013, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -27,9 +27,9 @@ /* Note however that if some specific modifications are needed, we */ /* advise you to place a modified copy in your build directory. */ /* */ - /* The build directory is usually `freetype/builds/', and */ - /* contains system-specific files that are always included first when */ - /* building the library. */ + /* The build directory is usually `builds/', and contains */ + /* system-specific files that are always included first when building */ + /* the library. */ /* */ /*************************************************************************/ @@ -52,7 +52,7 @@ FT_BEGIN_HEADER /* These macros can be toggled to suit a specific system. The current */ /* ones are defaults used to compile FreeType in an ANSI C environment */ /* (16bit compilers are also supported). Copy this file to your own */ - /* `freetype/builds/' directory, and edit it to port the engine. */ + /* `builds/' directory, and edit it to port the engine. */ /* */ /*************************************************************************/ @@ -86,7 +86,7 @@ FT_BEGIN_HEADER #else /* !FT_USE_AUTOCONF_SIZEOF_TYPES */ /* Following cpp computation of the bit length of int and long */ - /* is copied from default include/freetype/config/ftconfig.h. */ + /* is copied from default include/config/ftconfig.h. */ /* If any improvement is required for this file, it should be */ /* applied to the original header file for the builders that */ /* does not use configure script. */ @@ -175,13 +175,89 @@ FT_BEGIN_HEADER /*************************************************************************/ /* */ - /* IntN types */ + /*
*/ + /* basic_types */ /* */ - /* Used to guarantee the size of some specific integers. */ + /*************************************************************************/ + + + /*************************************************************************/ + /* */ + /* */ + /* FT_Int16 */ + /* */ + /* */ + /* A typedef for a 16bit signed integer type. */ + /* */ + typedef signed short FT_Int16; + + + /*************************************************************************/ + /* */ + /* */ + /* FT_UInt16 */ + /* */ + /* */ + /* A typedef for a 16bit unsigned integer type. */ /* */ - typedef signed short FT_Int16; typedef unsigned short FT_UInt16; + /* */ + + + /* this #if 0 ... #endif clause is for documentation purposes */ +#if 0 + + /*************************************************************************/ + /* */ + /* */ + /* FT_Int32 */ + /* */ + /* */ + /* A typedef for a 32bit signed integer type. The size depends on */ + /* the configuration. */ + /* */ + typedef signed XXX FT_Int32; + + + /*************************************************************************/ + /* */ + /* */ + /* FT_UInt32 */ + /* */ + /* A typedef for a 32bit unsigned integer type. The size depends on */ + /* the configuration. */ + /* */ + typedef unsigned XXX FT_UInt32; + + + /*************************************************************************/ + /* */ + /* */ + /* FT_Int64 */ + /* */ + /* A typedef for a 64bit signed integer type. The size depends on */ + /* the configuration. Only defined if there is real 64bit support; */ + /* otherwise, it gets emulated with a structure (if necessary). */ + /* */ + typedef signed XXX FT_Int64; + + + /*************************************************************************/ + /* */ + /* */ + /* FT_UInt64 */ + /* */ + /* A typedef for a 64bit unsigned integer type. The size depends on */ + /* the configuration. Only defined if there is real 64bit support; */ + /* otherwise, it gets emulated with a structure (if necessary). */ + /* */ + typedef unsigned XXX FT_UInt64; + + /* */ + +#endif + #if FT_SIZEOF_INT == 4 typedef signed int FT_Int32; @@ -217,13 +293,24 @@ FT_BEGIN_HEADER /* FT_LONG64 must be defined if a 64-bit type is available */ #define FT_LONG64 -#define FT_INT64 long +#define FT_INT64 long +#define FT_UINT64 unsigned long -#elif defined( _MSC_VER ) && _MSC_VER >= 900 /* Visual C++ (and Intel C++) */ + /*************************************************************************/ + /* */ + /* A 64-bit data type may create compilation problems if you compile */ + /* in strict ANSI mode. To avoid them, we disable other 64-bit data */ + /* types if __STDC__ is defined. You can however ignore this rule */ + /* by defining the FT_CONFIG_OPTION_FORCE_INT64 configuration macro. */ + /* */ +#elif !defined( __STDC__ ) || defined( FT_CONFIG_OPTION_FORCE_INT64 ) + +#if defined( _MSC_VER ) && _MSC_VER >= 900 /* Visual C++ (and Intel C++) */ /* this compiler provides the __int64 type */ #define FT_LONG64 -#define FT_INT64 __int64 +#define FT_INT64 __int64 +#define FT_UINT64 unsigned __int64 #elif defined( __BORLANDC__ ) /* Borland C++ */ @@ -232,7 +319,8 @@ FT_BEGIN_HEADER /* this compiler provides the __int64 type */ #define FT_LONG64 -#define FT_INT64 __int64 +#define FT_INT64 __int64 +#define FT_UINT64 unsigned __int64 #elif defined( __WATCOMC__ ) /* Watcom C++ */ @@ -241,38 +329,24 @@ FT_BEGIN_HEADER #elif defined( __MWERKS__ ) /* Metrowerks CodeWarrior */ #define FT_LONG64 -#define FT_INT64 long long int +#define FT_INT64 long long int +#define FT_UINT64 unsigned long long int #elif defined( __GNUC__ ) /* GCC provides the `long long' type */ #define FT_LONG64 -#define FT_INT64 long long int - -#endif /* FT_SIZEOF_LONG == 8 */ - - - /*************************************************************************/ - /* */ - /* A 64-bit data type will create compilation problems if you compile */ - /* in strict ANSI mode. To avoid them, we disable its use if __STDC__ */ - /* is defined. You can however ignore this rule by defining the */ - /* FT_CONFIG_OPTION_FORCE_INT64 configuration macro. */ - /* */ -#if defined( FT_LONG64 ) && !defined( FT_CONFIG_OPTION_FORCE_INT64 ) +#define FT_INT64 long long int +#define FT_UINT64 unsigned long long int -#ifdef __STDC__ - - /* Undefine the 64-bit macros in strict ANSI compilation mode. */ - /* Since `#undef' doesn't survive in configuration header files */ - /* we use the postprocessing facility of AC_CONFIG_HEADERS to */ - /* replace the leading `/' with `#'. */ -/undef FT_LONG64 -/undef FT_INT64 +#endif /* _MSC_VER */ -#endif /* __STDC__ */ +#endif /* FT_SIZEOF_LONG == 8 */ -#endif /* FT_LONG64 && !FT_CONFIG_OPTION_FORCE_INT64 */ +#ifdef FT_LONG64 + typedef FT_INT64 FT_Int64; + typedef FT_UINT64 FT_UInt64; +#endif #define FT_BEGIN_STMNT do { @@ -280,147 +354,6 @@ FT_BEGIN_HEADER #define FT_DUMMY_STMNT FT_BEGIN_STMNT FT_END_STMNT -#ifndef FT_CONFIG_OPTION_NO_ASSEMBLER - /* Provide assembler fragments for performance-critical functions. */ - /* These must be defined `static __inline__' with GCC. */ - -#if defined( __CC_ARM ) || defined( __ARMCC__ ) /* RVCT */ -#define FT_MULFIX_ASSEMBLER FT_MulFix_arm - - /* documentation is in freetype.h */ - - static __inline FT_Int32 - FT_MulFix_arm( FT_Int32 a, - FT_Int32 b ) - { - register FT_Int32 t, t2; - - - __asm - { - smull t2, t, b, a /* (lo=t2,hi=t) = a*b */ - mov a, t, asr #31 /* a = (hi >> 31) */ - add a, a, #0x8000 /* a += 0x8000 */ - adds t2, t2, a /* t2 += a */ - adc t, t, #0 /* t += carry */ - mov a, t2, lsr #16 /* a = t2 >> 16 */ - orr a, a, t, lsl #16 /* a |= t << 16 */ - } - return a; - } - -#endif /* __CC_ARM || __ARMCC__ */ - - -#ifdef __GNUC__ - -#if defined( __arm__ ) && !defined( __thumb__ ) && \ - !( defined( __CC_ARM ) || defined( __ARMCC__ ) ) -#define FT_MULFIX_ASSEMBLER FT_MulFix_arm - - /* documentation is in freetype.h */ - - static __inline__ FT_Int32 - FT_MulFix_arm( FT_Int32 a, - FT_Int32 b ) - { - register FT_Int32 t, t2; - - - __asm__ __volatile__ ( - "smull %1, %2, %4, %3\n\t" /* (lo=%1,hi=%2) = a*b */ - "mov %0, %2, asr #31\n\t" /* %0 = (hi >> 31) */ - "add %0, %0, #0x8000\n\t" /* %0 += 0x8000 */ - "adds %1, %1, %0\n\t" /* %1 += %0 */ - "adc %2, %2, #0\n\t" /* %2 += carry */ - "mov %0, %1, lsr #16\n\t" /* %0 = %1 >> 16 */ - "orr %0, %0, %2, lsl #16\n\t" /* %0 |= %2 << 16 */ - : "=r"(a), "=&r"(t2), "=&r"(t) - : "r"(a), "r"(b) ); - return a; - } - -#endif /* __arm__ && !__thumb__ && !( __CC_ARM || __ARMCC__ ) */ - -#if defined( __i386__ ) -#define FT_MULFIX_ASSEMBLER FT_MulFix_i386 - - /* documentation is in freetype.h */ - - static __inline__ FT_Int32 - FT_MulFix_i386( FT_Int32 a, - FT_Int32 b ) - { - register FT_Int32 result; - - - __asm__ __volatile__ ( - "imul %%edx\n" - "movl %%edx, %%ecx\n" - "sarl $31, %%ecx\n" - "addl $0x8000, %%ecx\n" - "addl %%ecx, %%eax\n" - "adcl $0, %%edx\n" - "shrl $16, %%eax\n" - "shll $16, %%edx\n" - "addl %%edx, %%eax\n" - : "=a"(result), "=d"(b) - : "a"(a), "d"(b) - : "%ecx", "cc" ); - return result; - } - -#endif /* i386 */ - -#endif /* __GNUC__ */ - - -#ifdef _MSC_VER /* Visual C++ */ - -#ifdef _M_IX86 - -#define FT_MULFIX_ASSEMBLER FT_MulFix_i386 - - /* documentation is in freetype.h */ - - static __inline FT_Int32 - FT_MulFix_i386( FT_Int32 a, - FT_Int32 b ) - { - register FT_Int32 result; - - __asm - { - mov eax, a - mov edx, b - imul edx - mov ecx, edx - sar ecx, 31 - add ecx, 8000h - add eax, ecx - adc edx, 0 - shr eax, 16 - shl edx, 16 - add eax, edx - mov result, eax - } - return result; - } - -#endif /* _M_IX86 */ - -#endif /* _MSC_VER */ - -#endif /* !FT_CONFIG_OPTION_NO_ASSEMBLER */ - - -#ifdef FT_CONFIG_OPTION_INLINE_MULFIX -#ifdef FT_MULFIX_ASSEMBLER -#define FT_MULFIX_INLINED FT_MULFIX_ASSEMBLER -#endif -#endif - - #ifdef FT_MAKE_OPTION_SINGLE_OBJECT #define FT_LOCAL( x ) static x @@ -438,6 +371,9 @@ FT_BEGIN_HEADER #endif /* FT_MAKE_OPTION_SINGLE_OBJECT */ +#define FT_LOCAL_ARRAY( x ) extern const x +#define FT_LOCAL_ARRAY_DEF( x ) const x + #ifndef FT_BASE diff --git a/builds/unix/ftsystem.c b/builds/unix/ftsystem.c index 95f8271..7f7b3ac 100644 --- a/builds/unix/ftsystem.c +++ b/builds/unix/ftsystem.c @@ -4,7 +4,7 @@ /* */ /* Unix-specific FreeType low-level system interface (body). */ /* */ -/* Copyright 1996-2001, 2002, 2004, 2005, 2006, 2007, 2008 by */ +/* Copyright 1996-2002, 2004-2008, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -235,7 +235,7 @@ if ( !stream ) - return FT_Err_Invalid_Stream_Handle; + return FT_THROW( Invalid_Stream_Handle ); /* open the file */ file = open( filepathname, O_RDONLY ); @@ -243,7 +243,7 @@ { FT_ERROR(( "FT_Stream_Open:" )); FT_ERROR(( " could not open `%s'\n", filepathname )); - return FT_Err_Cannot_Open_Resource; + return FT_THROW( Cannot_Open_Resource ); } /* Here we ensure that a "fork" will _not_ duplicate */ @@ -268,9 +268,9 @@ /* XXX: TODO -- real 64bit platform support */ /* */ - /* `stream->size' is typedef'd to unsigned long (in */ - /* freetype/ftsystem.h); `stat_buf.st_size', however, is usually */ - /* typedef'd to off_t (in sys/stat.h). */ + /* `stream->size' is typedef'd to unsigned long (in `ftsystem.h'); */ + /* `stat_buf.st_size', however, is usually typedef'd to off_t */ + /* (in sys/stat.h). */ /* On some platforms, the former is 32bit and the latter is 64bit. */ /* To avoid overflow caused by fonts in huge files larger than */ /* 2GB, do a test. Temporary fix proposed by Sean McBride. */ @@ -317,7 +317,8 @@ } total_read_count = 0; - do { + do + { ssize_t read_count; @@ -365,7 +366,7 @@ stream->size = 0; stream->pos = 0; - return FT_Err_Cannot_Open_Stream; + return FT_THROW( Cannot_Open_Stream ); } diff --git a/builds/unix/install-sh b/builds/unix/install-sh index a9244eb..377bb86 100755 --- a/builds/unix/install-sh +++ b/builds/unix/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-01-19.21; # UTC +scriptversion=2011-11-20.07; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -35,7 +35,7 @@ scriptversion=2011-01-19.21; # UTC # FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it +# 'make' implicit rules from creating a file called install from it # when there is no Makefile. # # This script is compatible with the BSD install script, but was written @@ -156,7 +156,7 @@ while test $# -ne 0; do -s) stripcmd=$stripprog;; -t) dst_arg=$2 - # Protect names problematic for `test' and other utilities. + # Protect names problematic for 'test' and other utilities. case $dst_arg in -* | [=\(\)!]) dst_arg=./$dst_arg;; esac @@ -190,7 +190,7 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then fi shift # arg dst_arg=$arg - # Protect names problematic for `test' and other utilities. + # Protect names problematic for 'test' and other utilities. case $dst_arg in -* | [=\(\)!]) dst_arg=./$dst_arg;; esac @@ -202,7 +202,7 @@ if test $# -eq 0; then echo "$0: no input file specified." >&2 exit 1 fi - # It's OK to call `install-sh -d' without argument. + # It's OK to call 'install-sh -d' without argument. # This can happen when creating conditional directories. exit 0 fi @@ -240,7 +240,7 @@ fi for src do - # Protect names problematic for `test' and other utilities. + # Protect names problematic for 'test' and other utilities. case $src in -* | [=\(\)!]) src=./$src;; esac @@ -354,7 +354,7 @@ do if test -z "$dir_arg" || { # Check for POSIX incompatibilities with -m. # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writeable bit of parent directory when it shouldn't. + # other-writable bit of parent directory when it shouldn't. # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. ls_ld_tmpdir=`ls -ld "$tmpdir"` case $ls_ld_tmpdir in diff --git a/builds/unix/install.mk b/builds/unix/install.mk index 2e5ef08..83525ee 100644 --- a/builds/unix/install.mk +++ b/builds/unix/install.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2000, 2002, 2003, 2006 by +# Copyright 1996-2000, 2002, 2003, 2006, 2013, 2014 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -24,55 +24,55 @@ # Unix installation and deinstallation targets. # -# Note that we no longer install internal headers, and we remove any -# `internal' subdirectory found in `$(includedir)/freetype2/freetype'. +# Note that we remove any data in the `freetype' subdirectory found in +# `$(includedir)/freetype2', which was the previous location of the header +# files up to version 2.5.0. # install: $(PROJECT_LIBRARY) - $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ - $(DESTDIR)$(libdir)/pkgconfig \ - $(DESTDIR)$(includedir)/freetype2/freetype/config \ - $(DESTDIR)$(includedir)/freetype2/freetype/cache \ - $(DESTDIR)$(bindir) \ - $(DESTDIR)$(datadir)/aclocal + $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ + $(DESTDIR)$(libdir)/pkgconfig \ + $(DESTDIR)$(includedir)/freetype2/config \ + $(DESTDIR)$(bindir) \ + $(DESTDIR)$(datadir)/aclocal \ + $(DESTDIR)$(mandir)/man1 $(LIBTOOL) --mode=install $(INSTALL) \ $(PROJECT_LIBRARY) $(DESTDIR)$(libdir) - -for P in $(PUBLIC_H) ; do \ - $(INSTALL_DATA) \ - $$P $(DESTDIR)$(includedir)/freetype2/freetype ; \ + -for P in $(PUBLIC_H) ; do \ + $(INSTALL_DATA) \ + $$P $(DESTDIR)$(includedir)/freetype2 ; \ done - -for P in $(CONFIG_H) ; do \ - $(INSTALL_DATA) \ - $$P $(DESTDIR)$(includedir)/freetype2/freetype/config ; \ + -for P in $(CONFIG_H) ; do \ + $(INSTALL_DATA) \ + $$P $(DESTDIR)$(includedir)/freetype2/config ; \ done - -$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/cache/* - -$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype/cache - -$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/internal/* - -$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype/internal - $(INSTALL_DATA) $(BUILD_DIR)/ft2unix.h \ - $(DESTDIR)$(includedir)/ft2build.h - $(INSTALL_DATA) $(OBJ_BUILD)/ftconfig.h \ - $(DESTDIR)$(includedir)/freetype2/freetype/config/ftconfig.h - $(INSTALL_DATA) $(OBJ_DIR)/ftmodule.h \ - $(DESTDIR)$(includedir)/freetype2/freetype/config/ftmodule.h + -$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/config/* + -$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype/config + -$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/* + -$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype + $(INSTALL_DATA) $(OBJ_BUILD)/ftconfig.h \ + $(DESTDIR)$(includedir)/freetype2/config/ftconfig.h + $(INSTALL_DATA) $(OBJ_DIR)/ftmodule.h \ + $(DESTDIR)$(includedir)/freetype2/config/ftmodule.h $(INSTALL_SCRIPT) -m 755 $(OBJ_BUILD)/freetype-config \ $(DESTDIR)$(bindir)/freetype-config $(INSTALL_SCRIPT) -m 644 $(BUILD_DIR)/freetype2.m4 \ $(DESTDIR)$(datadir)/aclocal/freetype2.m4 $(INSTALL_SCRIPT) -m 644 $(OBJ_BUILD)/freetype2.pc \ $(DESTDIR)$(libdir)/pkgconfig/freetype2.pc + $(INSTALL_DATA) $(TOP_DIR)/docs/freetype-config.1 \ + $(DESTDIR)$(mandir)/man1/freetype-config.1 uninstall: -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/$(LIBRARY).$A - -$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/config/* - -$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype/config - -$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/* - -$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype + -$(DELETE) $(DESTDIR)$(includedir)/freetype2/config/* + -$(DELDIR) $(DESTDIR)$(includedir)/freetype2/config + -$(DELETE) $(DESTDIR)$(includedir)/freetype2/* -$(DELDIR) $(DESTDIR)$(includedir)/freetype2 - -$(DELETE) $(DESTDIR)$(includedir)/ft2build.h -$(DELETE) $(DESTDIR)$(bindir)/freetype-config -$(DELETE) $(DESTDIR)$(datadir)/aclocal/freetype2.m4 -$(DELETE) $(DESTDIR)$(libdir)/pkgconfig/freetype2.pc + -$(DELETE) $(DESTDIR)$(mandir)/man1/freetype-config.1 check: diff --git a/builds/unix/ltmain.sh b/builds/unix/ltmain.sh old mode 100755 new mode 100644 index 63ae69d..a356aca --- a/builds/unix/ltmain.sh +++ b/builds/unix/ltmain.sh @@ -70,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1 # automake: $automake_version # autoconf: $autoconf_version # @@ -80,7 +80,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION=2.4.2 +VERSION="2.4.2 Debian-2.4.2-1.7ubuntu1" TIMESTAMP="" package_revision=1.3337 @@ -6124,7 +6124,10 @@ func_mode_link () case $pass in dlopen) libs="$dlfiles" ;; dlpreopen) libs="$dlprefiles" ;; - link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; + link) + libs="$deplibs %DEPLIBS%" + test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" + ;; esac fi if test "$linkmode,$pass" = "lib,dlpreopen"; then @@ -6444,19 +6447,19 @@ func_mode_link () # It is a libtool convenience library, so add in its objects. func_append convenience " $ladir/$objdir/$old_library" func_append old_convenience " $ladir/$objdir/$old_library" + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + if $opt_preserve_dup_deps ; then + case "$tmp_libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi + func_append tmp_libs " $deplib" + done elif test "$linkmode" != prog && test "$linkmode" != lib; then func_fatal_error "\`$lib' is not a convenience library" fi - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps ; then - case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append tmp_libs " $deplib" - done continue fi # $pass = conv @@ -7349,6 +7352,9 @@ func_mode_link () revision="$number_minor" lt_irix_increment=no ;; + *) + func_fatal_configuration "$modename: unknown library version type \`$version_type'" + ;; esac ;; no) diff --git a/builds/unix/pkg.m4 b/builds/unix/pkg.m4 new file mode 100644 index 0000000..f26f84c --- /dev/null +++ b/builds/unix/pkg.m4 @@ -0,0 +1,199 @@ +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 1 (pkg-config-0.24) +# +# Copyright © 2004 Scott James Remnant . +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi +fi[]dnl +])# PKG_PROG_PKG_CONFIG + +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# Check to see whether a particular set of modules exists. Similar +# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +# only at the first occurence in configure.ac, so if the first place +# it's called might be skipped (such as if it is within an "if", you +# have to call PKG_CHECK_EXISTS manually +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_default([$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) + +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +m4_define([_PKG_CONFIG], +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], + [pkg_failed=yes]) + else + pkg_failed=untried +fi[]dnl +])# _PKG_CONFIG + +# _PKG_SHORT_ERRORS_SUPPORTED +# ----------------------------- +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])# _PKG_SHORT_ERRORS_SUPPORTED + + +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) +# +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES might not happen, you should be sure to include an +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +# +# +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl + +pkg_failed=no +AC_MSG_CHECKING([for $1]) + +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) + +if test $pkg_failed = yes; then + AC_MSG_RESULT([no]) + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + + m4_default([$4], [AC_MSG_ERROR( +[Package requirements ($2) were not met: + +$$1_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +_PKG_TEXT])[]dnl + ]) +elif test $pkg_failed = untried; then + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( +[The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +_PKG_TEXT + +To get pkg-config, see .])[]dnl + ]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + $3 +fi[]dnl +])# PKG_CHECK_MODULES + + +# PKG_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable pkgconfigdir as the location where a module +# should install pkg-config .pc files. By default the directory is +# $libdir/pkgconfig, but the default can be changed by passing +# DIRECTORY. The user can override through the --with-pkgconfigdir +# parameter. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_INSTALLDIR + + +# PKG_NOARCH_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable noarch_pkgconfigdir as the location where a +# module should install arch-independent pkg-config .pc files. By +# default the directory is $datadir/pkgconfig, but the default can be +# changed by passing DIRECTORY. The user can override through the +# --with-noarch-pkgconfigdir parameter. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_NOARCH_INSTALLDIR diff --git a/builds/unix/unix-def.in b/builds/unix/unix-def.in index e0a7a3a..4c06a05 100644 --- a/builds/unix/unix-def.in +++ b/builds/unix/unix-def.in @@ -3,7 +3,7 @@ # -# Copyright 1996-2000, 2002, 2004, 2006, 2008 by +# Copyright 1996-2000, 2002, 2004, 2006, 2008, 2013, 2014 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -12,13 +12,14 @@ # indicate that you have read the license and understand and accept it # fully. +SHELL := @SHELL@ TOP_DIR := $(shell cd $(TOP_DIR); pwd) -DELETE := @RMF@ -DELDIR := @RMDIR@ -CAT := cat -SEP := / +DELETE := rm -f +DELDIR := @RMDIR@ +CAT := cat +SEP := / # this is used for `make distclean' and `make install' OBJ_BUILD ?= $(BUILD_DIR) @@ -33,15 +34,16 @@ INSTALL_PROGRAM := @INSTALL_PROGRAM@ INSTALL_SCRIPT := @INSTALL_SCRIPT@ MKINSTALLDIRS := $(BUILD_DIR)/mkinstalldirs -DISTCLEAN += $(OBJ_BUILD)/config.cache \ - $(OBJ_BUILD)/config.log \ - $(OBJ_BUILD)/config.status \ - $(OBJ_BUILD)/unix-def.mk \ - $(OBJ_BUILD)/unix-cc.mk \ - $(OBJ_BUILD)/ftconfig.h \ - $(OBJ_BUILD)/freetype-config \ - $(OBJ_BUILD)/freetype2.pc \ - $(LIBTOOL) \ +CLEAN += $(OBJ_BUILD)/freetype-config \ + $(OBJ_BUILD)/freetype2.pc + +DISTCLEAN += $(OBJ_BUILD)/config.cache \ + $(OBJ_BUILD)/config.log \ + $(OBJ_BUILD)/config.status \ + $(OBJ_BUILD)/unix-def.mk \ + $(OBJ_BUILD)/unix-cc.mk \ + $(OBJ_BUILD)/ftconfig.h \ + $(LIBTOOL) \ $(OBJ_BUILD)/Makefile @@ -54,9 +56,17 @@ bindir := @bindir@ includedir := @includedir@ datarootdir := @datarootdir@ datadir := @datadir@ +mandir := @mandir@ version_info := @version_info@ +# Variables needed for `freetype-config' and `freetype.pc'. +# +REQUIRES_PRIVATE := @REQUIRES_PRIVATE@ +LIBS_PRIVATE := @LIBS_PRIVATE@ +LIBSSTATIC_CONFIG := @LIBSSTATIC_CONFIG@ +build_libtool_libs := @build_libtool_libs@ +ft_version := @ft_version@ # The directory where all library files are placed. # @@ -82,4 +92,57 @@ SYSTEM_ZLIB := @SYSTEM_ZLIB@ NO_OUTPUT := 2> /dev/null +# To support calls like +# +# configure --includedir='${libdir}'/freetype2/include +# +# we generate `freetype-config' and `freetype.pc' at compile time so that +# those variables are properly expanded. + +$(OBJ_BUILD)/freetype-config: $(TOP_DIR)/builds/unix/freetype-config.in + rm -f $@ $@.tmp + sed -e 's|%LIBSSTATIC_CONFIG%|$(LIBSSTATIC_CONFIG)|' \ + -e 's|%build_libtool_libs%|$(build_libtool_libs)|' \ + -e 's|%exec_prefix%|$(exec_prefix)|' \ + -e 's|%ft_version%|$(ft_version)|' \ + -e 's|%includedir%|$(includedir)|' \ + -e 's|%libdir%|$(libdir)|' \ + -e 's|%prefix%|$(prefix)|' \ + $< \ + > $@.tmp + chmod +x $@.tmp + chmod a-w $@.tmp + mv $@.tmp $@ + +# To support directory names with spaces (as might easily happen on Windows +# platforms), the right solution would be to surround the pkg-variables in +# `freetype2.pc' with double quotes. However, doing so ironically disables +# the prefix override mechanism especially written for Windows. This is a +# bug in pkg-config version 0.28 and earlier. +# +# For this reason, we escape spaces with backslashes. + +exec_prefix_x := $(subst $(space),\\$(space),$(exec_prefix)) +includedir_x := $(subst $(space),\\$(space),$(includedir)) +libdir_x := $(subst $(space),\\$(space),$(libdir)) +prefix_x := $(subst $(space),\\$(space),$(prefix)) + +$(OBJ_BUILD)/freetype2.pc: $(TOP_DIR)/builds/unix/freetype2.in + rm -f $@ $@.tmp + sed -e 's|%REQUIRES_PRIVATE%|$(REQUIRES_PRIVATE)|' \ + -e 's|%LIBS_PRIVATE%|$(LIBS_PRIVATE)|' \ + -e 's|%build_libtool_libs%|$(build_libtool_libs)|' \ + -e 's|%exec_prefix%|$(exec_prefix_x)|' \ + -e 's|%ft_version%|$(ft_version)|' \ + -e 's|%includedir%|$(includedir_x)|' \ + -e 's|%libdir%|$(libdir_x)|' \ + -e 's|%prefix%|$(prefix_x)|' \ + $< \ + > $@.tmp + chmod a-w $@.tmp + mv $@.tmp $@ + +all: $(OBJ_BUILD)/freetype-config \ + $(OBJ_BUILD)/freetype2.pc + # EOF diff --git a/builds/vms/ftconfig.h b/builds/vms/ftconfig.h index 62fadac..b309651 100644 --- a/builds/vms/ftconfig.h +++ b/builds/vms/ftconfig.h @@ -4,7 +4,7 @@ /* */ /* VMS-specific configuration file (specification only). */ /* */ -/* Copyright 1996-2004, 2006-2008, 2011 by */ +/* Copyright 1996-2004, 2006-2008, 2011, 2013, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -27,18 +27,15 @@ /* Note however that if some specific modifications are needed, we */ /* advise you to place a modified copy in your build directory. */ /* */ - /* The build directory is usually `freetype/builds/', and */ - /* contains system-specific files that are always included first when */ - /* building the library. */ + /* The build directory is usually `builds/', and contains */ + /* system-specific files that are always included first when building */ + /* the library. */ /* */ /*************************************************************************/ - #ifndef __FTCONFIG_H__ #define __FTCONFIG_H__ - - /* Include the header file containing all developer build options */ #include #include FT_CONFIG_OPTIONS_H #include FT_CONFIG_STANDARD_LIBRARY_H @@ -46,6 +43,7 @@ FT_BEGIN_HEADER + /*************************************************************************/ /* */ /* PLATFORM-SPECIFIC CONFIGURATION MACROS */ @@ -53,7 +51,7 @@ FT_BEGIN_HEADER /* These macros can be toggled to suit a specific system. The current */ /* ones are defaults used to compile FreeType in an ANSI C environment */ /* (16bit compilers are also supported). Copy this file to your own */ - /* `freetype/builds/' directory, and edit it to port the engine. */ + /* `builds/' directory, and edit it to port the engine. */ /* */ /*************************************************************************/ @@ -120,19 +118,95 @@ FT_BEGIN_HEADER /*************************************************************************/ /* */ - /* IntN types */ + /*
*/ + /* basic_types */ + /* */ + /*************************************************************************/ + + + /*************************************************************************/ + /* */ + /* */ + /* FT_Int16 */ + /* */ + /* */ + /* A typedef for a 16bit signed integer type. */ + /* */ + typedef signed short FT_Int16; + + + /*************************************************************************/ + /* */ + /* */ + /* FT_UInt16 */ /* */ - /* Used to guarantee the size of some specific integers. */ + /* */ + /* A typedef for a 16bit unsigned integer type. */ /* */ - typedef signed short FT_Int16; typedef unsigned short FT_UInt16; -#if FT_SIZEOF_INT == 4 + /* */ + + + /* this #if 0 ... #endif clause is for documentation purposes */ +#if 0 + + /*************************************************************************/ + /* */ + /* */ + /* FT_Int32 */ + /* */ + /* */ + /* A typedef for a 32bit signed integer type. The size depends on */ + /* the configuration. */ + /* */ + typedef signed XXX FT_Int32; + + + /*************************************************************************/ + /* */ + /* */ + /* FT_UInt32 */ + /* */ + /* A typedef for a 32bit unsigned integer type. The size depends on */ + /* the configuration. */ + /* */ + typedef unsigned XXX FT_UInt32; + + + /*************************************************************************/ + /* */ + /* */ + /* FT_Int64 */ + /* */ + /* A typedef for a 64bit signed integer type. The size depends on */ + /* the configuration. Only defined if there is real 64bit support; */ + /* otherwise, it gets emulated with a structure (if necessary). */ + /* */ + typedef signed XXX FT_Int64; + + + /*************************************************************************/ + /* */ + /* */ + /* FT_UInt64 */ + /* */ + /* A typedef for a 64bit unsigned integer type. The size depends on */ + /* the configuration. Only defined if there is real 64bit support; */ + /* otherwise, it gets emulated with a structure (if necessary). */ + /* */ + typedef unsigned XXX FT_UInt64; + + /* */ + +#endif + +#if FT_SIZEOF_INT == (32 / FT_CHAR_BIT) typedef signed int FT_Int32; typedef unsigned int FT_UInt32; -#elif FT_SIZEOF_LONG == 4 +#elif FT_SIZEOF_LONG == (32 / FT_CHAR_BIT) typedef signed long FT_Int32; typedef unsigned long FT_UInt32; @@ -141,13 +215,14 @@ FT_BEGIN_HEADER #error "no 32bit type found -- please check your configuration files" #endif + /* look up an integer type that is at least 32 bits */ -#if FT_SIZEOF_INT >= 4 +#if FT_SIZEOF_INT >= (32 / FT_CHAR_BIT) typedef int FT_Fast; typedef unsigned int FT_UFast; -#elif FT_SIZEOF_LONG >= 4 +#elif FT_SIZEOF_LONG >= (32 / FT_CHAR_BIT) typedef long FT_Fast; typedef unsigned long FT_UFast; @@ -157,17 +232,28 @@ FT_BEGIN_HEADER /* determine whether we have a 64-bit int type for platforms without */ /* Autoconf */ -#if FT_SIZEOF_LONG == 8 +#if FT_SIZEOF_LONG == (64 / FT_CHAR_BIT) /* FT_LONG64 must be defined if a 64-bit type is available */ #define FT_LONG64 -#define FT_INT64 long +#define FT_INT64 long +#define FT_UINT64 unsigned long -#elif defined( _MSC_VER ) && _MSC_VER >= 900 /* Visual C++ (and Intel C++) */ + /*************************************************************************/ + /* */ + /* A 64-bit data type may create compilation problems if you compile */ + /* in strict ANSI mode. To avoid them, we disable other 64-bit data */ + /* types if __STDC__ is defined. You can however ignore this rule */ + /* by defining the FT_CONFIG_OPTION_FORCE_INT64 configuration macro. */ + /* */ +#elif !defined( __STDC__ ) || defined( FT_CONFIG_OPTION_FORCE_INT64 ) + +#if defined( _MSC_VER ) && _MSC_VER >= 900 /* Visual C++ (and Intel C++) */ /* this compiler provides the __int64 type */ #define FT_LONG64 -#define FT_INT64 __int64 +#define FT_INT64 __int64 +#define FT_UINT64 unsigned __int64 #elif defined( __BORLANDC__ ) /* Borland C++ */ @@ -176,7 +262,8 @@ FT_BEGIN_HEADER /* this compiler provides the __int64 type */ #define FT_LONG64 -#define FT_INT64 __int64 +#define FT_INT64 __int64 +#define FT_UINT64 unsigned __int64 #elif defined( __WATCOMC__ ) /* Watcom C++ */ @@ -185,15 +272,24 @@ FT_BEGIN_HEADER #elif defined( __MWERKS__ ) /* Metrowerks CodeWarrior */ #define FT_LONG64 -#define FT_INT64 long long int +#define FT_INT64 long long int +#define FT_UINT64 unsigned long long int #elif defined( __GNUC__ ) /* GCC provides the `long long' type */ #define FT_LONG64 -#define FT_INT64 long long int +#define FT_INT64 long long int +#define FT_UINT64 unsigned long long int + +#endif /* _MSC_VER */ + +#endif /* FT_SIZEOF_LONG == (64 / FT_CHAR_BIT) */ -#endif /* FT_SIZEOF_LONG == 8 */ +#ifdef FT_LONG64 + typedef FT_INT64 FT_Int64; + typedef FT_UINT64 FT_UInt64; +#endif #define FT_BEGIN_STMNT do { @@ -201,26 +297,6 @@ FT_BEGIN_HEADER #define FT_DUMMY_STMNT FT_BEGIN_STMNT FT_END_STMNT - /*************************************************************************/ - /* */ - /* A 64-bit data type will create compilation problems if you compile */ - /* in strict ANSI mode. To avoid them, we disable their use if */ - /* __STDC__ is defined. You can however ignore this rule by */ - /* defining the FT_CONFIG_OPTION_FORCE_INT64 configuration macro. */ - /* */ -#if defined( FT_LONG64 ) && !defined( FT_CONFIG_OPTION_FORCE_INT64 ) - -#ifdef __STDC__ - - /* undefine the 64-bit macros in strict ANSI compilation mode */ -#undef FT_LONG64 -#undef FT_INT64 - -#endif /* __STDC__ */ - -#endif /* FT_LONG64 && !FT_CONFIG_OPTION_FORCE_INT64 */ - - #ifdef FT_MAKE_OPTION_SINGLE_OBJECT #define FT_LOCAL( x ) static x @@ -238,6 +314,9 @@ FT_BEGIN_HEADER #endif /* FT_MAKE_OPTION_SINGLE_OBJECT */ +#define FT_LOCAL_ARRAY( x ) extern const x +#define FT_LOCAL_ARRAY_DEF( x ) const x + #ifndef FT_BASE @@ -253,9 +332,9 @@ FT_BEGIN_HEADER #ifndef FT_BASE_DEF #ifdef __cplusplus -#define FT_BASE_DEF( x ) extern "C" x +#define FT_BASE_DEF( x ) x #else -#define FT_BASE_DEF( x ) extern x +#define FT_BASE_DEF( x ) x #endif #endif /* !FT_BASE_DEF */ diff --git a/builds/vms/ftsystem.c b/builds/vms/ftsystem.c index fb35967..5c2819e 100644 --- a/builds/vms/ftsystem.c +++ b/builds/vms/ftsystem.c @@ -4,7 +4,7 @@ /* */ /* VMS-specific FreeType low-level system interface (body). */ /* */ -/* Copyright 1996-2001, 2002, 2005, 2010 by */ +/* Copyright 1996-2002, 2005, 2010, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -212,7 +212,7 @@ if ( !stream ) - return FT_Err_Invalid_Stream_Handle; + return FT_THROW( Invalid_Stream_Handle ); /* open the file */ file = open( filepathname, O_RDONLY ); @@ -220,7 +220,7 @@ { FT_ERROR(( "FT_Stream_Open:" )); FT_ERROR(( " could not open `%s'\n", filepathname )); - return FT_Err_Cannot_Open_Resource; + return FT_THROW( Cannot_Open_Resource ); } if ( fstat( file, &stat_buf ) < 0 ) @@ -274,7 +274,7 @@ stream->size = 0; stream->pos = 0; - return FT_Err_Cannot_Open_Stream; + return FT_THROW( Cannot_Open_Stream ); } diff --git a/builds/win32/vc2010/freetype.vcxproj b/builds/win32/vc2010/freetype.vcxproj deleted file mode 100644 index e88c45f..0000000 --- a/builds/win32/vc2010/freetype.vcxproj +++ /dev/null @@ -1,832 +0,0 @@ - - - - - Debug Multithreaded - Win32 - - - Debug Singlethreaded - Win32 - - - Debug - Win32 - - - Release Multithreaded - Win32 - - - Release Singlethreaded - Win32 - - - Release - Win32 - - - - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} - - - - StaticLibrary - false - MultiByte - - - StaticLibrary - false - MultiByte - - - StaticLibrary - false - MultiByte - - - StaticLibrary - false - MultiByte - - - StaticLibrary - false - MultiByte - - - StaticLibrary - false - MultiByte - - - - - - <_ProjectFileVersion>10.0.30319.1 - .\..\..\..\objs\win32\vc2010\ - .\..\..\..\objs\release\ - .\..\..\..\objs\win32\vc2010\ - .\..\..\..\objs\release_mt\ - .\..\..\..\objs\win32\vc2010\ - .\..\..\..\objs\release_st\ - .\..\..\..\objs\win32\vc2010\ - .\..\..\..\objs\debug\ - .\..\..\..\objs\win32\vc2010\ - .\..\..\..\objs\debug_st\ - .\..\..\..\objs\win32\vc2010\ - .\..\..\..\objs\debug_mt\ - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - freetype249_D - freetype249MT_D - freetype249ST_D - freetype249 - freetype249MT - freetype249ST - - - - MaxSpeed - OnlyExplicitInline - ..\..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - true - Level4 - - - Default - 4001 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - true - - - - - MaxSpeed - OnlyExplicitInline - ..\..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions) - true - MultiThreaded - true - true - Level4 - - - Default - 4001 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - true - - - - - MaxSpeed - OnlyExplicitInline - ..\..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions) - true - MultiThreaded - true - true - Level4 - - - Default - 4001 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - - - Disabled - ..\..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - true - Level4 - ProgramDatabase - Default - 4001 - true - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - true - - - - - Disabled - ..\..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - true - Level4 - ProgramDatabase - Default - 4001 - true - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - true - - - - - Disabled - ..\..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - false - false - EnableFastChecks - MultiThreadedDebug - true - Level4 - ProgramDatabase - Default - 4001 - true - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - true - - - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - false - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - false - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - false - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - false - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - false - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - false - - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - - - - - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - - - - - - - - - - diff --git a/builds/win32/vc2010/index.html b/builds/win32/vc2010/index.html deleted file mode 100644 index 1d492fb..0000000 --- a/builds/win32/vc2010/index.html +++ /dev/null @@ -1,37 +0,0 @@ - -
- - FreeType 2 Project Files for VS.NET 2010 - - - -

- FreeType 2 Project Files for VS.NET 2010 -

- -

This directory contains a project file for Visual C++, named -freetype.vcxproj, and Visual Studio, called freetype.sln. It -compiles the following libraries from the FreeType 2.4.9 sources:

- -
    - 
    -    freetype249.lib     - release build; single threaded
-    freetype249_D.lib   - debug build;   single threaded
-    freetype249MT.lib   - release build; multi-threaded
-    freetype249MT_D.lib - debug build;   multi-threaded
    -
- -

Be sure to extract the files with the Windows (CR+LF) line endings. ZIP -archives are already stored this way, so no further action is required. If -you use some .tar.*z archives, be sure to configure your extracting -tool to convert the line endings. For example, with WinZip, you should activate the TAR -file smart CR/LF Conversion option. Alternatively, you may consider -using the unix2dos or u2d utilities that are floating -around, which specifically deal with this particular problem. - -

Build directories are placed in the top-level objs -directory.

- - - diff --git a/builds/wince/ftdebug.c b/builds/wince/ftdebug.c index 272415d..24f9658 100644 --- a/builds/wince/ftdebug.c +++ b/builds/wince/ftdebug.c @@ -4,7 +4,7 @@ /* */ /* Debugging and logging component for WinCE (body). */ /* */ -/* Copyright 1996-2001, 2002, 2005, 2008, 2009 by */ +/* Copyright 1996-2002, 2005, 2008, 2009, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -71,7 +71,8 @@ FT_BASE_DEF( void ) - FT_Message( const char* fmt, ... ) + FT_Message( const char* fmt, + ... ) { static char buf[8192]; va_list ap; @@ -87,7 +88,8 @@ FT_BASE_DEF( void ) - FT_Panic( const char* fmt, ... ) + FT_Panic( const char* fmt, + ... ) { static char buf[8192]; va_list ap; @@ -102,6 +104,20 @@ } + /* documentation is in ftdebug.h */ + + FT_BASE_DEF( int ) + FT_Throw( FT_Error error, + int line, + const char* file ) + { + FT_UNUSED( error ); + FT_UNUSED( line ); + FT_UNUSED( file ); + + return 0; + } + #ifdef FT_DEBUG_LEVEL_TRACE @@ -132,8 +148,8 @@ /* for the memory and stream components which are set to 6 and 5, */ /* respectively. */ /* */ - /* See the file for details of the */ - /* available toggle names. */ + /* See the file for details of the available toggle */ + /* names. */ /* */ /* The level must be between 0 and 6; 0 means quiet (except for serious */ /* runtime errors), and 6 means _very_ verbose. */ @@ -168,9 +184,12 @@ while ( *p && *p != ':' ) p++; + if ( !*p ) + break; + if ( *p == ':' && p > q ) { - int n, i, len = p - q; + int n, i, len = (int)( p - q ); int level = -1, found = -1; @@ -196,7 +215,7 @@ p++; if ( *p ) { - level = *p++ - '0'; + level = *p - '0'; if ( level < 0 || level > 7 ) level = -1; } diff --git a/builds/wince/vc2005-ce/freetype.vcproj b/builds/wince/vc2005-ce/freetype.vcproj index fa0e986..5614235 100644 --- a/builds/wince/vc2005-ce/freetype.vcproj +++ b/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 @@ - + @@ -3822,15 +3822,15 @@ - + - + - + - + - + diff --git a/builds/wince/vc2005-ce/index.html b/builds/wince/vc2005-ce/index.html index cffa8cb..e2160f6 100644 --- a/builds/wince/vc2005-ce/index.html +++ b/builds/wince/vc2005-ce/index.html @@ -21,14 +21,14 @@ the following targets:
  • PPC/SP WM6 (Windows Mobile 6)
    • -It compiles the following libraries from the FreeType 2.4.9 sources:

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

      -    freetype249.lib     - release build; single threaded
-    freetype249_D.lib   - debug build;   single threaded
-    freetype249MT.lib   - release build; multi-threaded
-    freetype249MT_D.lib - debug build;   multi-threaded
      + freetype255.lib - release build; single threaded + freetype255_D.lib - debug build; single threaded + freetype255MT.lib - release build; multi-threaded + freetype255MT_D.lib - debug build; multi-threaded

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/builds/wince/vc2008-ce/freetype.vcproj b/builds/wince/vc2008-ce/freetype.vcproj index 1f052c1..e36ccb0 100644 --- a/builds/wince/vc2008-ce/freetype.vcproj +++ b/builds/wince/vc2008-ce/freetype.vcproj @@ -88,7 +88,7 @@ /> diff --git a/builds/wince/vc2008-ce/index.html b/builds/wince/vc2008-ce/index.html index 0c636b6..469baef 100644 --- a/builds/wince/vc2008-ce/index.html +++ b/builds/wince/vc2008-ce/index.html @@ -21,14 +21,14 @@ the following targets:

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

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

      -    freetype249.lib     - release build; single threaded
-    freetype249_D.lib   - debug build;   single threaded
-    freetype249MT.lib   - release build; multi-threaded
-    freetype249MT_D.lib - debug build;   multi-threaded
      + freetype255.lib - release build; single threaded + freetype255_D.lib - debug build; single threaded + freetype255MT.lib - release build; multi-threaded + freetype255MT_D.lib - debug build; multi-threaded

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/builds/windows/.gitignore b/builds/windows/.gitignore new file mode 100644 index 0000000..41456a4 --- /dev/null +++ b/builds/windows/.gitignore @@ -0,0 +1,5 @@ +# user-specific cache/settings files +*.opensdf +*.sdf +*.suo +*.user diff --git a/builds/win32/detect.mk b/builds/windows/detect.mk similarity index 95% rename from builds/win32/detect.mk rename to builds/windows/detect.mk index 1906539..9dca261 100644 --- a/builds/win32/detect.mk +++ b/builds/windows/detect.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2000, 2003, 2004, 2006, 2007 by +# Copyright 1996-2000, 2003, 2004, 2006, 2007, 2014 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -23,7 +23,7 @@ ifeq ($(PLATFORM),ansi) # ifeq ($(OS),Windows_NT) - PLATFORM := win32 + PLATFORM := windows else @@ -44,7 +44,8 @@ ifeq ($(PLATFORM),ansi) # # A better test is to check whether there are both the environment # variables `winbootdir' and `windir'. The first indicates an - # underlying DOS 7.x, while the second is set only if win32 is available. + # underlying DOS 7.x, while the second is set only if windows is + # available. # # Note that on Windows NT, such an environment variable will not be seen # from DOS-based tools like DJGPP's make; this is not actually a problem @@ -53,7 +54,7 @@ ifeq ($(PLATFORM),ansi) ifdef winbootdir ifdef windir - PLATFORM := win32 + PLATFORM := windows endif endif @@ -62,7 +63,7 @@ ifeq ($(PLATFORM),ansi) endif # test PLATFORM ansi -ifeq ($(PLATFORM),win32) +ifeq ($(PLATFORM),windows) DELETE := del CAT := type @@ -177,7 +178,7 @@ ifeq ($(PLATFORM),win32) .PHONY: devel-gcc endif -endif # test PLATFORM win32 +endif # test PLATFORM windows # EOF diff --git a/builds/win32/ftdebug.c b/builds/windows/ftdebug.c similarity index 90% rename from builds/win32/ftdebug.c rename to builds/windows/ftdebug.c index d1ca15a..dd2c2ad 100644 --- a/builds/win32/ftdebug.c +++ b/builds/windows/ftdebug.c @@ -4,7 +4,7 @@ /* */ /* Debugging and logging component for Win32 (body). */ /* */ -/* Copyright 1996-2001, 2002, 2005, 2008, 2009 by */ +/* Copyright 1996-2002, 2005, 2008, 2009, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -47,7 +47,6 @@ #ifdef FT_DEBUG_LEVEL_ERROR - #include #include #include @@ -55,8 +54,11 @@ #include + /* documentation is in ftdebug.h */ + FT_BASE_DEF( void ) - FT_Message( const char* fmt, ... ) + FT_Message( const char* fmt, + ... ) { static char buf[8192]; va_list ap; @@ -71,8 +73,11 @@ } + /* documentation is in ftdebug.h */ + FT_BASE_DEF( void ) - FT_Panic( const char* fmt, ... ) + FT_Panic( const char* fmt, + ... ) { static char buf[8192]; va_list ap; @@ -87,6 +92,21 @@ } + /* documentation is in ftdebug.h */ + + FT_BASE_DEF( int ) + FT_Throw( FT_Error error, + int line, + const char* file ) + { + FT_UNUSED( error ); + FT_UNUSED( line ); + FT_UNUSED( file ); + + return 0; + } + + #ifdef FT_DEBUG_LEVEL_TRACE @@ -117,8 +137,8 @@ /* for the memory and stream components which are set to 6 and 5, */ /* respectively. */ /* */ - /* See the file for details of the */ - /* available toggle names. */ + /* See the file for details of the available toggle */ + /* names. */ /* */ /* The level must be between 0 and 6; 0 means quiet (except for serious */ /* runtime errors), and 6 means _very_ verbose. */ @@ -146,9 +166,12 @@ while ( *p && *p != ':' ) p++; + if ( !*p ) + break; + if ( *p == ':' && p > q ) { - int n, i, len = p - q; + int n, i, len = (int)( p - q ); int level = -1, found = -1; @@ -174,7 +197,7 @@ p++; if ( *p ) { - level = *p++ - '0'; + level = *p - '0'; if ( level < 0 || level > 7 ) level = -1; } diff --git a/builds/win32/vc2005/freetype.sln b/builds/windows/vc2005/freetype.sln similarity index 100% rename from builds/win32/vc2005/freetype.sln rename to builds/windows/vc2005/freetype.sln diff --git a/builds/win32/vc2005/freetype.vcproj b/builds/windows/vc2005/freetype.vcproj similarity index 97% rename from builds/win32/vc2005/freetype.vcproj rename to builds/windows/vc2005/freetype.vcproj index 6f17352..5880b7d 100644 --- a/builds/win32/vc2005/freetype.vcproj +++ b/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 @@ - + @@ -629,15 +629,15 @@ - + - + - + - + - + diff --git a/builds/win32/vc2005/index.html b/builds/windows/vc2005/index.html similarity index 76% rename from builds/win32/vc2005/index.html rename to builds/windows/vc2005/index.html index bc4291c..4929dcd 100644 --- a/builds/win32/vc2005/index.html +++ b/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.4.9 sources:

    +compiles the following libraries from the FreeType 2.5.5 sources:

      -    freetype249.lib     - release build; single threaded
-    freetype249_D.lib   - debug build;   single threaded
-    freetype249MT.lib   - release build; multi-threaded
-    freetype249MT_D.lib - debug build;   multi-threaded
      + freetype255.lib - release build; single threaded + freetype255_D.lib - debug build; single threaded + freetype255MT.lib - release build; multi-threaded + freetype255MT_D.lib - debug build; multi-threaded

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/builds/win32/vc2008/freetype.sln b/builds/windows/vc2008/freetype.sln similarity index 100% rename from builds/win32/vc2008/freetype.sln rename to builds/windows/vc2008/freetype.sln diff --git a/builds/win32/vc2008/freetype.vcproj b/builds/windows/vc2008/freetype.vcproj similarity index 94% rename from builds/win32/vc2008/freetype.vcproj rename to builds/windows/vc2008/freetype.vcproj index 897c5e5..95d722b 100644 --- a/builds/win32/vc2008/freetype.vcproj +++ b/builds/windows/vc2008/freetype.vcproj @@ -70,7 +70,7 @@ /> diff --git a/builds/win32/vc2008/index.html b/builds/windows/vc2008/index.html similarity index 76% rename from builds/win32/vc2008/index.html rename to builds/windows/vc2008/index.html index 9ad33ea..7e0d154 100644 --- a/builds/win32/vc2008/index.html +++ b/builds/windows/vc2008/index.html @@ -11,14 +11,14 @@

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

    +compiles the following libraries from the FreeType 2.5.5 sources:

      -    freetype249.lib     - release build; single threaded
-    freetype249_D.lib   - debug build;   single threaded
-    freetype249MT.lib   - release build; multi-threaded
-    freetype249MT_D.lib - debug build;   multi-threaded
      + freetype255.lib - release build; single threaded + freetype255_D.lib - debug build; single threaded + freetype255MT.lib - release build; multi-threaded + freetype255MT_D.lib - debug build; multi-threaded

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/builds/win32/vc2010/freetype.sln b/builds/windows/vc2010/freetype.sln similarity index 56% rename from builds/win32/vc2010/freetype.sln rename to builds/windows/vc2010/freetype.sln index 3439f62..3bd176a 100644 --- a/builds/win32/vc2010/freetype.sln +++ b/builds/windows/vc2010/freetype.sln @@ -1,30 +1,48 @@  Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 +# Visual Studio Express 2012 for Windows Desktop Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "freetype.vcxproj", "{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Debug Multithreaded|Win32 = Debug Multithreaded|Win32 + Debug Multithreaded|x64 = Debug Multithreaded|x64 Debug Singlethreaded|Win32 = Debug Singlethreaded|Win32 - Debug|Win32 = Debug|Win32 + Debug Singlethreaded|x64 = Debug Singlethreaded|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 Release Multithreaded|Win32 = Release Multithreaded|Win32 + Release Multithreaded|x64 = Release Multithreaded|x64 Release Singlethreaded|Win32 = Release Singlethreaded|Win32 - Release|Win32 = Release|Win32 + Release Singlethreaded|x64 = Release Singlethreaded|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|Win32.ActiveCfg = Debug|Win32 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|Win32.Build.0 = Debug|Win32 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|x64.ActiveCfg = Debug|x64 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|x64.Build.0 = Debug|x64 {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Multithreaded|Win32.ActiveCfg = Debug Multithreaded|Win32 {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Multithreaded|Win32.Build.0 = Debug Multithreaded|Win32 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Multithreaded|x64.ActiveCfg = Debug Multithreaded|x64 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Multithreaded|x64.Build.0 = Debug Multithreaded|x64 {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Singlethreaded|Win32.ActiveCfg = Debug Singlethreaded|Win32 {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Singlethreaded|Win32.Build.0 = Debug Singlethreaded|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|Win32.ActiveCfg = Debug|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|Win32.Build.0 = Debug|Win32 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Singlethreaded|x64.ActiveCfg = Debug Singlethreaded|x64 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Singlethreaded|x64.Build.0 = Debug Singlethreaded|x64 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|Win32.ActiveCfg = Release|Win32 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|Win32.Build.0 = Release|Win32 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.ActiveCfg = Release|x64 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.Build.0 = Release|x64 {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Multithreaded|Win32.ActiveCfg = Release Multithreaded|Win32 {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Multithreaded|Win32.Build.0 = Release Multithreaded|Win32 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Multithreaded|x64.ActiveCfg = Release Multithreaded|x64 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Multithreaded|x64.Build.0 = Release Multithreaded|x64 {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Singlethreaded|Win32.ActiveCfg = Release Singlethreaded|Win32 {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Singlethreaded|Win32.Build.0 = Release Singlethreaded|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|Win32.ActiveCfg = Release|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|Win32.Build.0 = Release|Win32 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Singlethreaded|x64.ActiveCfg = Release Singlethreaded|x64 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Singlethreaded|x64.Build.0 = Release Singlethreaded|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/builds/windows/vc2010/freetype.user.props b/builds/windows/vc2010/freetype.user.props new file mode 100644 index 0000000..234dd5d --- /dev/null +++ b/builds/windows/vc2010/freetype.user.props @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/builds/windows/vc2010/freetype.vcxproj b/builds/windows/vc2010/freetype.vcxproj new file mode 100644 index 0000000..7cafe45 --- /dev/null +++ b/builds/windows/vc2010/freetype.vcxproj @@ -0,0 +1,1718 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Debug Multithreaded + Win32 + + + Debug Multithreaded + x64 + + + Debug Singlethreaded + Win32 + + + Debug Singlethreaded + x64 + + + Release + Win32 + + + Release + x64 + + + Release Multithreaded + Win32 + + + Release Multithreaded + x64 + + + Release Singlethreaded + Win32 + + + Release Singlethreaded + x64 + + + + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} + + + + StaticLibrary + false + MultiByte + v100 + + + StaticLibrary + false + MultiByte + v100 + + + StaticLibrary + false + MultiByte + v100 + + + StaticLibrary + false + MultiByte + v100 + + + StaticLibrary + false + MultiByte + v100 + + + StaticLibrary + false + MultiByte + v100 + + + StaticLibrary + false + MultiByte + v100 + + + StaticLibrary + false + MultiByte + v100 + + + StaticLibrary + false + MultiByte + v100 + + + StaticLibrary + false + MultiByte + v100 + + + StaticLibrary + false + MultiByte + v100 + + + StaticLibrary + false + MultiByte + v100 + + + + + + <_ProjectFileVersion>10.0.30319.1 + .\..\..\..\objs\vc2010\$(Platform)\ + .\..\..\..\objs\vc2010\$(Platform)\$(Configuration)\ + .\..\..\..\objs\vc2010\$(Platform)\ + .\..\..\..\objs\vc2010\$(Platform)\$(Configuration)\ + .\..\..\..\objs\vc2010\$(Platform)\ + .\..\..\..\objs\vc2010\$(Platform)\$(Configuration)\ + .\..\..\..\objs\vc2010\$(Platform)\ + .\..\..\..\objs\vc2010\$(Platform)\$(Configuration)\ + .\..\..\..\objs\vc2010\$(Platform)\ + .\..\..\..\objs\vc2010\$(Platform)\$(Configuration)\ + .\..\..\..\objs\vc2010\$(Platform)\ + .\..\..\..\objs\vc2010\$(Platform)\$(Configuration)\ + .\..\..\..\objs\vc2010\$(Platform)\ + .\..\..\..\objs\vc2010\$(Platform)\$(Configuration)\ + .\..\..\..\objs\vc2010\$(Platform)\ + .\..\..\..\objs\vc2010\$(Platform)\$(Configuration)\ + .\..\..\..\objs\vc2010\$(Platform)\ + .\..\..\..\objs\vc2010\$(Platform)\$(Configuration)\ + .\..\..\..\objs\vc2010\$(Platform)\ + .\..\..\..\objs\vc2010\$(Platform)\$(Configuration)\ + .\..\..\..\objs\vc2010\$(Platform)\ + .\..\..\..\objs\vc2010\$(Platform)\$(Configuration)\ + .\..\..\..\objs\vc2010\$(Platform)\ + .\..\..\..\objs\vc2010\$(Platform)\$(Configuration)\ + AllRules.ruleset + AllRules.ruleset + + + + + AllRules.ruleset + AllRules.ruleset + + + + + AllRules.ruleset + AllRules.ruleset + + + + + AllRules.ruleset + AllRules.ruleset + + + + + AllRules.ruleset + AllRules.ruleset + + + + + AllRules.ruleset + AllRules.ruleset + + + + + freetype255d + freetype255d + freetype255MTd + freetype255MTd + freetype255STd + freetype255STd + freetype255 + freetype255 + freetype255MT + freetype255MT + freetype255ST + freetype255ST + + + + + Disabled + $(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;$(UserDefines);%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + true + Level4 + ProgramDatabase + Default + 4001 + true + false + $(OutDir)$(TargetName).pdb + Disabled + + + _DEBUG;$(UserDefines);%(PreprocessorDefinitions) + 0x0409 + + + true + MachineX86 + $(UserLibraryDirectories);%(AdditionalLibraryDirectories) + $(UserDependencies);%(AdditionalDependencies) + + + + + Disabled + $(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;$(UserDefines);%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + true + Level4 + ProgramDatabase + Default + 4001 + true + false + $(OutDir)$(TargetName).pdb + Disabled + + + _DEBUG;$(UserDefines);%(PreprocessorDefinitions) + 0x0409 + + + true + MachineX64 + $(UserLibraryDirectories);%(AdditionalLibraryDirectories) + $(UserDependencies);%(AdditionalDependencies) + + + + + Disabled + $(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;_CRT_SECURE_NO_DEPRECATE;$(UserDefines);%(PreprocessorDefinitions) + false + false + EnableFastChecks + MultiThreadedDebug + true + Level4 + ProgramDatabase + Default + 4001 + true + false + $(OutDir)$(TargetName).pdb + Disabled + + + _DEBUG;$(UserDefines);%(PreprocessorDefinitions) + 0x0409 + + + true + MachineX86 + $(UserLibraryDirectories);%(AdditionalLibraryDirectories) + $(UserDependencies);%(AdditionalDependencies) + + + + + Disabled + $(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;_CRT_SECURE_NO_DEPRECATE;$(UserDefines);%(PreprocessorDefinitions) + false + false + EnableFastChecks + MultiThreadedDebug + true + Level4 + ProgramDatabase + Default + 4001 + true + false + $(OutDir)$(TargetName).pdb + Disabled + + + _DEBUG;$(UserDefines);%(PreprocessorDefinitions) + 0x0409 + + + true + MachineX64 + $(UserLibraryDirectories);%(AdditionalLibraryDirectories) + $(UserDependencies);%(AdditionalDependencies) + + + + + Disabled + $(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;$(UserDefines);%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + true + Level4 + ProgramDatabase + Default + 4001 + true + false + $(OutDir)$(TargetName).pdb + Disabled + + + _DEBUG;$(UserDefines);%(PreprocessorDefinitions) + 0x0409 + + + true + MachineX86 + $(UserLibraryDirectories);%(AdditionalLibraryDirectories) + $(UserDependencies);%(AdditionalDependencies) + + + + + Disabled + $(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;$(UserDefines);%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + true + Level4 + ProgramDatabase + Default + 4001 + true + false + $(OutDir)$(TargetName).pdb + Disabled + + + _DEBUG;$(UserDefines);%(PreprocessorDefinitions) + 0x0409 + + + true + MachineX64 + $(UserLibraryDirectories);%(AdditionalLibraryDirectories) + $(UserDependencies);%(AdditionalDependencies) + + + + + Full + AnySuitable + $(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;$(UserDefines);%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + true + Level4 + Default + 4001 + true + false + StreamingSIMDExtensions2 + false + false + false + + + true + + + true + Neither + true + + + NDEBUG;$(UserDefines);%(PreprocessorDefinitions) + 0x0409 + + + true + true + MachineX86 + $(UserLibraryDirectories);%(AdditionalLibraryDirectories) + $(UserDependencies);%(AdditionalDependencies) + + + + + Full + AnySuitable + $(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;$(UserDefines);%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + true + Level4 + Default + 4001 + true + false + StreamingSIMDExtensions2 + false + false + false + + + true + + + true + Neither + true + + + NDEBUG;$(UserDefines);%(PreprocessorDefinitions) + 0x0409 + + + true + true + MachineX64 + $(UserLibraryDirectories);%(AdditionalLibraryDirectories) + $(UserDependencies);%(AdditionalDependencies) + + + + + Full + AnySuitable + $(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;$(UserDefines);%(PreprocessorDefinitions) + true + MultiThreaded + true + true + Level4 + Default + 4001 + true + false + StreamingSIMDExtensions2 + false + false + false + false + + + true + + + true + Neither + true + + + NDEBUG;$(UserDefines);%(PreprocessorDefinitions) + 0x0409 + + + true + true + MachineX86 + $(UserLibraryDirectories);%(AdditionalLibraryDirectories) + $(UserDependencies);%(AdditionalDependencies) + + + + + Full + AnySuitable + $(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;$(UserDefines);%(PreprocessorDefinitions) + true + MultiThreaded + true + true + Level4 + Default + 4001 + true + false + StreamingSIMDExtensions2 + false + false + false + false + + + true + + + true + Neither + true + + + NDEBUG;$(UserDefines);%(PreprocessorDefinitions) + 0x0409 + + + true + true + MachineX64 + $(UserLibraryDirectories);%(AdditionalLibraryDirectories) + $(UserDependencies);%(AdditionalDependencies) + + + + + Full + AnySuitable + $(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;$(UserDefines);%(PreprocessorDefinitions) + true + MultiThreaded + true + true + Level4 + Default + 4001 + true + false + StreamingSIMDExtensions2 + false + false + false + + + true + + + true + Neither + true + + + NDEBUG;$(UserDefines);%(PreprocessorDefinitions) + 0x0409 + + + + true + MachineX86 + $(UserLibraryDirectories);%(AdditionalLibraryDirectories) + $(UserDependencies);%(AdditionalDependencies) + + + + + Full + AnySuitable + $(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;$(UserDefines);%(PreprocessorDefinitions) + true + MultiThreaded + true + true + Level4 + Default + 4001 + true + false + StreamingSIMDExtensions2 + false + false + false + + + true + + + true + Neither + true + + + NDEBUG;$(UserDefines);%(PreprocessorDefinitions) + 0x0409 + + + + true + MachineX64 + $(UserLibraryDirectories);%(AdditionalLibraryDirectories) + $(UserDependencies);%(AdditionalDependencies) + + + + + + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + false + false + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + false + false + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + false + false + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + false + false + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + false + false + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + false + false + + + + + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + + + + + + + + + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/win32/vc2010/freetype.vcxproj.filters b/builds/windows/vc2010/freetype.vcxproj.filters similarity index 91% rename from builds/win32/vc2010/freetype.vcxproj.filters rename to builds/windows/vc2010/freetype.vcxproj.filters index a3a9f19..99fc43f 100644 --- a/builds/win32/vc2010/freetype.vcxproj.filters +++ b/builds/windows/vc2010/freetype.vcxproj.filters @@ -136,19 +136,19 @@ Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files diff --git a/builds/windows/vc2010/index.html b/builds/windows/vc2010/index.html new file mode 100644 index 0000000..cb205aa --- /dev/null +++ b/builds/windows/vc2010/index.html @@ -0,0 +1,52 @@ + +

    + + FreeType 2 Project Files for VS.NET 2010 or newer + + + +

    + FreeType 2 Project Files for VS.NET 2010 or newer +

    + +

    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.5.5 sources:

    + +
      + 
      +freetype255.lib     - release build
+freetype255d.lib    - debug build
+freetype255ST.lib   - release build; single threaded
+freetype255STd.lib  - debug build;   single threaded
+freetype255MT.lib   - release build; multi-threaded
+freetype255MTd.lib  - debug build;   multi-threaded
      +
    + +

    Both Win32 and x64 builds are supported.

    + +

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP +archives are already stored this way, so no further action is required. If +you use some .tar.*z archives, be sure to configure your extracting +tool to convert the line endings. For example, with WinZip, you should activate the TAR +file smart CR/LF Conversion option. Alternatively, you may consider +using the unix2dos or u2d utilities that are floating +around, which specifically deal with this particular problem. + +

    Build directories are placed in the top-level objs\vc2010 +directory.

    + +

    Customization of the FreeType library is done by editing the +ftoptions.h header file in the top-level devel path. +Alternatively, you may copy the file to another directory and change the +include directory in freetype.users.props.

    + +

    To configure library dependencies like zlib and libpng, +edit the freetype.users.props file in this directory. It also +simplifies automated (command-line) builds using msbuild.

    + + + diff --git a/builds/win32/visualc/freetype.dsp b/builds/windows/visualc/freetype.dsp similarity index 86% rename from builds/win32/visualc/freetype.dsp rename to builds/windows/visualc/freetype.dsp index 274a763..cf76f7c 100644 --- a/builds/win32/visualc/freetype.dsp +++ b/builds/windows/visualc/freetype.dsp @@ -7,23 +7,23 @@ CFG=freetype - Win32 Debug Singlethreaded !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run -!MESSAGE +!MESSAGE !MESSAGE NMAKE /f "freetype.mak". -!MESSAGE +!MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE +!MESSAGE !MESSAGE NMAKE /f "freetype.mak" CFG="freetype - Win32 Debug Singlethreaded" -!MESSAGE +!MESSAGE !MESSAGE Possible choices for configuration are: -!MESSAGE +!MESSAGE !MESSAGE "freetype - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "freetype - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "freetype - Win32 Debug Multithreaded" (based on "Win32 (x86) Static Library") !MESSAGE "freetype - Win32 Release Multithreaded" (based on "Win32 (x86) Static Library") !MESSAGE "freetype - Win32 Release Singlethreaded" (based on "Win32 (x86) Static Library") !MESSAGE "freetype - Win32 Debug Singlethreaded" (based on "Win32 (x86) Static Library") -!MESSAGE +!MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype249.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype255.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\freetype249_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype255_D.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Debug Multithreaded" @@ -92,7 +92,7 @@ LIB32=link.exe -lib # PROP Output_Dir "..\..\..\objs\debug_mt" # PROP Intermediate_Dir "..\..\..\objs\debug_mt" # PROP Target_Dir "" -# ADD BASE CPP /nologo /Za /W3 /Gm /GX /ZI /Od /I "..\freetype\include\\" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT_FLAT_COMPILE" /YX /FD /GZ /c +# ADD BASE CPP /nologo /Za /W3 /Gm /GX /ZI /Od /I "..\include\\" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT_FLAT_COMPILE" /YX /FD /GZ /c # SUBTRACT BASE CPP /X # ADD CPP /MTd /Za /W4 /GX /Z7 /Od /I "..\..\..\include" /D "_DEBUG" /D "FT_DEBUG_LEVEL_ERROR" /D "FT_DEBUG_LEVEL_TRACE" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT2_BUILD_LIBRARY" /FD /GZ /c # SUBTRACT CPP /nologo /X /YX @@ -102,8 +102,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"lib\freetype249_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype249MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype255_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype255MT_D.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Release Multithreaded" @@ -117,7 +117,7 @@ LIB32=link.exe -lib # PROP Output_Dir "..\..\..\objs\release_mt" # PROP Intermediate_Dir "..\..\..\objs\release_mt" # PROP Target_Dir "" -# ADD BASE CPP /nologo /Za /W3 /GX /O2 /I "..\freetype\include\\" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT_FLAT_COMPILE" /YX /FD /c +# ADD BASE CPP /nologo /Za /W3 /GX /O2 /I "..\include\\" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT_FLAT_COMPILE" /YX /FD /c # ADD CPP /MT /Za /W4 /GX /O2 /I "..\..\..\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT2_BUILD_LIBRARY" /FD /c # SUBTRACT CPP /nologo /Z /YX # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -126,8 +126,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"lib\freetype249.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype249MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype255.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype255MT.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\freetype249.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype249ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype255.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype255ST.lib" # SUBTRACT LIB32 /nologo !ELSEIF "$(CFG)" == "freetype - Win32 Debug Singlethreaded" @@ -177,10 +177,10 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype249_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype249ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype255_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype255ST_D.lib" -!ENDIF +!ENDIF # Begin Target @@ -377,23 +377,23 @@ SOURCE=..\..\..\include\ft2build.h # End Source File # Begin Source File -SOURCE=..\..\..\include\freetype\config\ftconfig.h +SOURCE=..\..\..\include\config\ftconfig.h # End Source File # Begin Source File -SOURCE=..\..\..\include\freetype\config\ftheader.h +SOURCE=..\..\..\include\config\ftheader.h # End Source File # Begin Source File -SOURCE=..\..\..\include\freetype\config\ftmodule.h +SOURCE=..\..\..\include\config\ftmodule.h # End Source File # Begin Source File -SOURCE=..\..\..\include\freetype\config\ftoption.h +SOURCE=..\..\..\include\config\ftoption.h # End Source File # Begin Source File -SOURCE=..\..\..\include\freetype\config\ftstdlib.h +SOURCE=..\..\..\include\config\ftstdlib.h # End Source File # End Group # End Target diff --git a/builds/win32/visualce/freetype.dsw b/builds/windows/visualc/freetype.dsw similarity index 100% rename from builds/win32/visualce/freetype.dsw rename to builds/windows/visualc/freetype.dsw diff --git a/builds/win32/visualc/freetype.sln b/builds/windows/visualc/freetype.sln similarity index 100% rename from builds/win32/visualc/freetype.sln rename to builds/windows/visualc/freetype.sln diff --git a/builds/win32/visualc/freetype.vcproj b/builds/windows/visualc/freetype.vcproj similarity index 94% rename from builds/win32/visualc/freetype.vcproj rename to builds/windows/visualc/freetype.vcproj index f0638da..a71a0e9 100644 --- a/builds/win32/visualc/freetype.vcproj +++ b/builds/windows/visualc/freetype.vcproj @@ -69,7 +69,7 @@ /> diff --git a/builds/win32/visualc/index.html b/builds/windows/visualc/index.html similarity index 77% rename from builds/win32/visualc/index.html rename to builds/windows/visualc/index.html index a32c95f..751d7ad 100644 --- a/builds/win32/visualc/index.html +++ b/builds/windows/visualc/index.html @@ -11,14 +11,14 @@

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

    +compiles the following libraries from the FreeType 2.5.5 sources:

      -    freetype249.lib     - release build; single threaded
-    freetype249_D.lib   - debug build;   single threaded
-    freetype249MT.lib   - release build; multi-threaded
-    freetype249MT_D.lib - debug build;   multi-threaded
      + freetype255.lib - release build; single threaded + freetype255_D.lib - debug build; single threaded + freetype255MT.lib - release build; multi-threaded + freetype255MT_D.lib - debug build; multi-threaded

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/builds/win32/visualce/freetype.dsp b/builds/windows/visualce/freetype.dsp similarity index 86% rename from builds/win32/visualce/freetype.dsp rename to builds/windows/visualce/freetype.dsp index 274a763..cf76f7c 100644 --- a/builds/win32/visualce/freetype.dsp +++ b/builds/windows/visualce/freetype.dsp @@ -7,23 +7,23 @@ CFG=freetype - Win32 Debug Singlethreaded !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run -!MESSAGE +!MESSAGE !MESSAGE NMAKE /f "freetype.mak". -!MESSAGE +!MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE +!MESSAGE !MESSAGE NMAKE /f "freetype.mak" CFG="freetype - Win32 Debug Singlethreaded" -!MESSAGE +!MESSAGE !MESSAGE Possible choices for configuration are: -!MESSAGE +!MESSAGE !MESSAGE "freetype - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "freetype - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "freetype - Win32 Debug Multithreaded" (based on "Win32 (x86) Static Library") !MESSAGE "freetype - Win32 Release Multithreaded" (based on "Win32 (x86) Static Library") !MESSAGE "freetype - Win32 Release Singlethreaded" (based on "Win32 (x86) Static Library") !MESSAGE "freetype - Win32 Debug Singlethreaded" (based on "Win32 (x86) Static Library") -!MESSAGE +!MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype249.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype255.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\freetype249_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype255_D.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Debug Multithreaded" @@ -92,7 +92,7 @@ LIB32=link.exe -lib # PROP Output_Dir "..\..\..\objs\debug_mt" # PROP Intermediate_Dir "..\..\..\objs\debug_mt" # PROP Target_Dir "" -# ADD BASE CPP /nologo /Za /W3 /Gm /GX /ZI /Od /I "..\freetype\include\\" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT_FLAT_COMPILE" /YX /FD /GZ /c +# ADD BASE CPP /nologo /Za /W3 /Gm /GX /ZI /Od /I "..\include\\" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT_FLAT_COMPILE" /YX /FD /GZ /c # SUBTRACT BASE CPP /X # ADD CPP /MTd /Za /W4 /GX /Z7 /Od /I "..\..\..\include" /D "_DEBUG" /D "FT_DEBUG_LEVEL_ERROR" /D "FT_DEBUG_LEVEL_TRACE" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT2_BUILD_LIBRARY" /FD /GZ /c # SUBTRACT CPP /nologo /X /YX @@ -102,8 +102,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"lib\freetype249_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype249MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype255_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype255MT_D.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Release Multithreaded" @@ -117,7 +117,7 @@ LIB32=link.exe -lib # PROP Output_Dir "..\..\..\objs\release_mt" # PROP Intermediate_Dir "..\..\..\objs\release_mt" # PROP Target_Dir "" -# ADD BASE CPP /nologo /Za /W3 /GX /O2 /I "..\freetype\include\\" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT_FLAT_COMPILE" /YX /FD /c +# ADD BASE CPP /nologo /Za /W3 /GX /O2 /I "..\include\\" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT_FLAT_COMPILE" /YX /FD /c # ADD CPP /MT /Za /W4 /GX /O2 /I "..\..\..\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT2_BUILD_LIBRARY" /FD /c # SUBTRACT CPP /nologo /Z /YX # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -126,8 +126,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"lib\freetype249.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype249MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype255.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype255MT.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\freetype249.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype249ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype255.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype255ST.lib" # SUBTRACT LIB32 /nologo !ELSEIF "$(CFG)" == "freetype - Win32 Debug Singlethreaded" @@ -177,10 +177,10 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype249_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype249ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype255_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype255ST_D.lib" -!ENDIF +!ENDIF # Begin Target @@ -377,23 +377,23 @@ SOURCE=..\..\..\include\ft2build.h # End Source File # Begin Source File -SOURCE=..\..\..\include\freetype\config\ftconfig.h +SOURCE=..\..\..\include\config\ftconfig.h # End Source File # Begin Source File -SOURCE=..\..\..\include\freetype\config\ftheader.h +SOURCE=..\..\..\include\config\ftheader.h # End Source File # Begin Source File -SOURCE=..\..\..\include\freetype\config\ftmodule.h +SOURCE=..\..\..\include\config\ftmodule.h # End Source File # Begin Source File -SOURCE=..\..\..\include\freetype\config\ftoption.h +SOURCE=..\..\..\include\config\ftoption.h # End Source File # Begin Source File -SOURCE=..\..\..\include\freetype\config\ftstdlib.h +SOURCE=..\..\..\include\config\ftstdlib.h # End Source File # End Group # End Target diff --git a/builds/win32/visualc/freetype.dsw b/builds/windows/visualce/freetype.dsw similarity index 100% rename from builds/win32/visualc/freetype.dsw rename to builds/windows/visualce/freetype.dsw diff --git a/builds/win32/visualce/freetype.vcproj b/builds/windows/visualce/freetype.vcproj similarity index 95% rename from builds/win32/visualce/freetype.vcproj rename to builds/windows/visualce/freetype.vcproj index 89a416a..e4cddfb 100644 --- a/builds/win32/visualce/freetype.vcproj +++ b/builds/windows/visualce/freetype.vcproj @@ -87,7 +87,7 @@ /> diff --git a/builds/win32/visualce/index.html b/builds/windows/visualce/index.html similarity index 80% rename from builds/win32/visualce/index.html rename to builds/windows/visualce/index.html index eec6d61..68d15fd 100644 --- a/builds/win32/visualce/index.html +++ b/builds/windows/visualce/index.html @@ -21,14 +21,14 @@ the following targets:

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

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

      -    freetype249.lib     - release build; single threaded
-    freetype249_D.lib   - debug build;   single threaded
-    freetype249MT.lib   - release build; multi-threaded
-    freetype249MT_D.lib - debug build;   multi-threaded
      + freetype255.lib - release build; single threaded + freetype255_D.lib - debug build; single threaded + freetype255MT.lib - release build; multi-threaded + freetype255MT_D.lib - debug build; multi-threaded

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/builds/win32/w32-bcc.mk b/builds/windows/w32-bcc.mk similarity index 88% rename from builds/win32/w32-bcc.mk rename to builds/windows/w32-bcc.mk index a9f48fc..87d8ea3 100644 --- a/builds/win32/w32-bcc.mk +++ b/builds/windows/w32-bcc.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2000, 2003, 2005 by +# Copyright 1996-2000, 2003, 2005, 2013 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -18,7 +18,7 @@ EXPORTS_LIST = $(OBJ_DIR)/freetype.def EXPORTS_OPTIONS = /DEF:$(EXPORTS_LIST) APINAMES_OPTIONS := -dfreetype.dll -wB -include $(TOP_DIR)/builds/win32/win32-def.mk +include $(TOP_DIR)/builds/windows/win32-def.mk include $(TOP_DIR)/builds/compiler/bcc.mk # include linking instructions diff --git a/builds/win32/w32-bccd.mk b/builds/windows/w32-bccd.mk similarity index 86% rename from builds/win32/w32-bccd.mk rename to builds/windows/w32-bccd.mk index 51b15d9..dd21edd 100644 --- a/builds/win32/w32-bccd.mk +++ b/builds/windows/w32-bccd.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2000, 2003, 2006 by +# Copyright 1996-2000, 2003, 2006, 2013 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -15,7 +15,7 @@ DEVEL_DIR := $(TOP_DIR)/devel -include $(TOP_DIR)/builds/win32/win32-def.mk +include $(TOP_DIR)/builds/windows/win32-def.mk include $(TOP_DIR)/builds/compiler/bcc-dev.mk diff --git a/builds/win32/w32-dev.mk b/builds/windows/w32-dev.mk similarity index 88% rename from builds/win32/w32-dev.mk rename to builds/windows/w32-dev.mk index 00cacb0..3561229 100644 --- a/builds/win32/w32-dev.mk +++ b/builds/windows/w32-dev.mk @@ -5,7 +5,7 @@ # -# Copyright 1996-2000, 2003, 2006 by +# Copyright 1996-2000, 2003, 2006, 2013 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -21,7 +21,7 @@ DEVEL_DIR := $(TOP_DIR)/devel -include $(TOP_DIR)/builds/win32/win32-def.mk +include $(TOP_DIR)/builds/windows/win32-def.mk include $(TOP_DIR)/builds/compiler/gcc-dev.mk diff --git a/builds/win32/w32-gcc.mk b/builds/windows/w32-gcc.mk similarity index 89% rename from builds/win32/w32-gcc.mk rename to builds/windows/w32-gcc.mk index 580afc5..3bbdd3c 100644 --- a/builds/win32/w32-gcc.mk +++ b/builds/windows/w32-gcc.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2000, 2003, 2005 by +# Copyright 1996-2000, 2003, 2005, 2013 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -19,7 +19,7 @@ EXPORTS_OPTIONS = $(EXPORTS_LIST) APINAMES_OPTIONS := -dfreetype.dll -w # include Win32-specific definitions -include $(TOP_DIR)/builds/win32/win32-def.mk +include $(TOP_DIR)/builds/windows/win32-def.mk # include gcc-specific definitions include $(TOP_DIR)/builds/compiler/gcc.mk diff --git a/builds/win32/w32-icc.mk b/builds/windows/w32-icc.mk similarity index 89% rename from builds/win32/w32-icc.mk rename to builds/windows/w32-icc.mk index 8819a1f..44d26bd 100644 --- a/builds/win32/w32-icc.mk +++ b/builds/windows/w32-icc.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2000, 2005 by +# Copyright 1996-2000, 2005, 2013 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -18,7 +18,7 @@ EXPORTS_LIST = $(OBJ_DIR)/freetype.def EXPORTS_OPTIONS = /DEF:$(EXPORTS_LIST) APINAMES_OPTIONS := -dfreetype.dll -w -include $(TOP_DIR)/builds/win32/win32-def.mk +include $(TOP_DIR)/builds/windows/win32-def.mk include $(TOP_DIR)/builds/compiler/visualage.mk # include linking instructions diff --git a/builds/win32/w32-intl.mk b/builds/windows/w32-intl.mk similarity index 88% rename from builds/win32/w32-intl.mk rename to builds/windows/w32-intl.mk index ae62e1b..0f3e22b 100644 --- a/builds/win32/w32-intl.mk +++ b/builds/windows/w32-intl.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2000, 2003, 2005 by +# Copyright 1996-2000, 2003, 2005, 2013 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -18,7 +18,7 @@ EXPORTS_LIST = $(OBJ_DIR)/freetype.def EXPORTS_OPTIONS = /DEF:$(EXPORTS_LIST) APINAMES_OPTIONS := -dfreetype.dll -w -include $(TOP_DIR)/builds/win32/win32-def.mk +include $(TOP_DIR)/builds/windows/win32-def.mk include $(TOP_DIR)/builds/compiler/intelc.mk # include linking instructions diff --git a/builds/win32/w32-lcc.mk b/builds/windows/w32-lcc.mk similarity index 87% rename from builds/win32/w32-lcc.mk rename to builds/windows/w32-lcc.mk index a147c4c..8bd5b56 100644 --- a/builds/win32/w32-lcc.mk +++ b/builds/windows/w32-lcc.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2000 by +# Copyright 1996-2000, 2013 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -14,7 +14,7 @@ SEP := / -include $(TOP_DIR)/builds/win32/win32-def.mk +include $(TOP_DIR)/builds/windows/win32-def.mk include $(TOP_DIR)/builds/compiler/win-lcc.mk # include linking instructions diff --git a/builds/win32/w32-mingw32.mk b/builds/windows/w32-mingw32.mk similarity index 89% rename from builds/win32/w32-mingw32.mk rename to builds/windows/w32-mingw32.mk index 04e9e21..b35dbb0 100644 --- a/builds/win32/w32-mingw32.mk +++ b/builds/windows/w32-mingw32.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2000, 2003, 2005 by +# Copyright 1996-2000, 2003, 2005, 2013 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -19,7 +19,7 @@ EXPORTS_OPTIONS = $(EXPORTS_LIST) APINAMES_OPTIONS := -dfreetype.dll -w # include Win32-specific definitions -include $(TOP_DIR)/builds/win32/win32-def.mk +include $(TOP_DIR)/builds/windows/win32-def.mk LIBRARY := lib$(PROJECT) diff --git a/builds/win32/w32-vcc.mk b/builds/windows/w32-vcc.mk similarity index 88% rename from builds/win32/w32-vcc.mk rename to builds/windows/w32-vcc.mk index 7fb8794..95f7685 100644 --- a/builds/win32/w32-vcc.mk +++ b/builds/windows/w32-vcc.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2000, 2003, 2005 by +# Copyright 1996-2000, 2003, 2005, 2013 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -18,7 +18,7 @@ EXPORTS_LIST = $(OBJ_DIR)/freetype.def EXPORTS_OPTIONS = /DEF:$(EXPORTS_LIST) APINAMES_OPTIONS := -dfreetype.dll -w -include $(TOP_DIR)/builds/win32/win32-def.mk +include $(TOP_DIR)/builds/windows/win32-def.mk include $(TOP_DIR)/builds/compiler/visualc.mk # include linking instructions diff --git a/builds/win32/w32-wat.mk b/builds/windows/w32-wat.mk similarity index 88% rename from builds/win32/w32-wat.mk rename to builds/windows/w32-wat.mk index 820b817..e1ddf66 100644 --- a/builds/win32/w32-wat.mk +++ b/builds/windows/w32-wat.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2000, 2003, 2005 by +# Copyright 1996-2000, 2003, 2005, 2013 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -18,7 +18,7 @@ EXPORTS_LIST = $(OBJ_DIR)/watcom-ftexports.lbc EXPORTS_OPTIONS = -\"export @$(EXPORTS_LIST)\"- APINAMES_OPTIONS := -wW -include $(TOP_DIR)/builds/win32/win32-def.mk +include $(TOP_DIR)/builds/windows/win32-def.mk include $(TOP_DIR)/builds/compiler/watcom.mk # include linking instructions diff --git a/builds/win32/win32-def.mk b/builds/windows/win32-def.mk similarity index 89% rename from builds/win32/win32-def.mk rename to builds/windows/win32-def.mk index e6ae31c..61af5df 100644 --- a/builds/win32/win32-def.mk +++ b/builds/windows/win32-def.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2000, 2003, 2005, 2006 by +# Copyright 1996-2000, 2003, 2005, 2006, 2013, 2014 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -16,8 +16,8 @@ DELETE := del CAT := type SEP := $(strip \ ) -BUILD_DIR := $(TOP_DIR)/builds/win32 -PLATFORM := win32 +BUILD_DIR := $(TOP_DIR)/builds/windows +PLATFORM := windows # The executable file extension (for tools). NOTE: WE INCLUDE THE DOT HERE !! # diff --git a/configure b/configure index 55a24fd..4d8a945 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010 by +# Copyright 2002-2006, 2008-2010, 2013 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -15,19 +15,29 @@ rm -f config.mk builds/unix/unix-def.mk builds/unix/unix-cc.mk +# respect GNUMAKE environment variable for backwards compatibility if test "x$GNUMAKE" = x; then - GNUMAKE=make + if test "x$MAKE" = x; then + if test "x`make -v 2>/dev/null | egrep 'GNU|makepp'`" = x; then + MAKE=gmake + else + MAKE=make + fi + fi +else + MAKE=$GNUMAKE fi -if test -z "`$GNUMAKE -v 2>/dev/null | grep GNU`"; then - if test -z "`$GNUMAKE -v 2>/dev/null | grep makepp`"; then - echo "GNU make (>= 3.80) or makepp (>= 1.19) is required to build FreeType2." >&2 - echo "Please try" >&2 - echo " \`GNUMAKE= $0'." >&2 - echo "or >&2" - echo " \`GNUMAKE=\"makepp --norc-substitution\" $0'." >&2 - exit 1 - fi +if test "x`$MAKE -v 2>/dev/null | egrep 'GNU|makepp'`" = x; then + echo "GNU make (>= 3.80) or makepp (>= 1.19) is required to build FreeType2." >&2 + echo "Please try" >&2 + echo >&2 + echo " MAKE= $0" >&2 + echo >&2 + echo "or" >&2 + echo >&2 + echo " MAKE=\"makepp --norc-substitution\" $0" >&2 + exit 1 fi # Get `dirname' functionality. This is taken and adapted from autoconf's @@ -120,6 +130,6 @@ case $# in esac done ;; esac -CFG=$CFG $GNUMAKE setup unix +CFG=$CFG $MAKE setup unix # eof diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index 13476fd..0000000 --- a/debian/changelog +++ /dev/null @@ -1,104 +0,0 @@ -freetype (2.4.9-slp2+1) unstable; urgency=low - - * FT2 version upgrade from 2.4.3 to 2.4.9 - * Git: 165.213.180.234:/slp/unmodified/freetype - * Tag: freetype_2.4.9-slp2+1 - -- Deokjin Kim Wed, 30 May 2012 15:18:41 +0900 - -freetype (2.4.3-6slp2+1) unstable; urgency=low - - * Fix text display bug in m.etnews.com - * Git: 165.213.180.234:/slp/unmodified/freetype - * Tag: freetype_2.4.3-6slp2+1 - - -- Deokjin Kim Thu, 20 Oct 2011 16:17:50 +0900 - -freetype (2.4.3-5slp4) unstable; urgency=low - - * Packag Rollback - * Git: 165.213.180.234:/slp/unmodified/freetype - * Tag: freetype_2.4.3-5slp4 - - -- WooHyun Jung Mon, 11 Apr 2011 12:16:22 +0900 - -freetype (2.4.3-5slp3) unstable; urgency=low - - * Rollback pkgs - * Git: 165.213.180.234:/slp/unmodified/freetype - * Tag: freetype_2.4.3-5slp3 - - -- WooHyun Jung Mon, 11 Apr 2011 11:56:46 +0900 - -freetype (2.4.3-5slp2) unstable; urgency=low - - * Removed unused modules - * Git: 165.213.180.234:slp/unmodified/freetype - * Tag: freetype_2.4.3-5slp2 - - -- Deokjin Kim Tue, 05 Apr 2011 10:51:07 +0900 - -freetype (2.4.3-4slp2) unstable; urgency=low - - * Rollback removing API - * Git: 165.213.180.234:slp/unmodified/freetype - * Tag: freetype_2.4.3-4slp2 - - -- Deokjin Kim Wed, 02 Mar 2011 14:11:53 +0900 - -freetype (2.4.3-3slp2) unstable; urgency=low - - * Reduce amount of memory usage - * Git: 165.213.180.234:slp/unmodified/freetype - * Tag: freetype_2.4.3-3slp2 - - -- Deokjin Kim Fri, 18 Feb 2011 11:14:20 +0900 - -freetype (2.4.3-2slp2) unstable; urgency=low - - * Add debug package - * Git: 165.213.180.234:/git/slp/unmodified/freetype - * Tag: freetype_2.4.3-2slp2 - - -- Deokjin Kim Thu, 18 Nov 2010 14:58:43 +0900 - -freetype (2.4.3-1slp2) unstable; urgency=low - - * Freetype version upgrade (from 2.3.5 to 2.4.3) - * Git: 165.213.180.234:/git/slp/unmodified/freetype - * Tag: freetype_2.4.3-1slp2 - - -- Deokjin Kim Tue, 09 Nov 2010 16:54:10 +0900 - -freetype (2.3.5-5slp2) unstable; urgency=low - - * Change maintainer - - -- Jihoon Kim Tue, 20 Apr 2010 11:06:10 +0900 - -freetype (2.3.5-4slp2) unstable; urgency=low - - * Change revision - - -- Sung-Jin Park Thu, 25 Mar 2010 19:34:16 +0900 - -freetype (2.3.5-3) unstable; urgency=low - - [ Kyu Young Kim ] - * modify debian files - - [ root ] - * - - - -- root Thu, 25 Mar 2010 19:34:13 +0900 - -freetype (2.3.5-2) unstable; urgency=low - - * install modify - - -- Kyu Young Kim Thu, 12 Nov 2009 15:45:39 +0900 - -freetype (2.3.5) unstable; urgency=low - - * Initial Release. - - -- Kyu Young Kim Thu, 12 Nov 2009 13:27:46 +0900 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 7ed6ff8..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/debian/control b/debian/control deleted file mode 100644 index f14499e..0000000 --- a/debian/control +++ /dev/null @@ -1,68 +0,0 @@ -Source: freetype -Section: libs -Priority: optional -Uploaders: Deokjin Kim -Maintainer: Deokjin Kim , Inpyo Kang -Build-Depends: debhelper (>= 5), autotools-dev -Standards-Version: 3.7.2 - -Package: libfreetype6 -Architecture: any -Section: libs -Depends: ${shlibs:Depends}, ${misc:Depends} -Conflicts: freetype, xpdf-reader (<< 1.00-4) -Description: FreeType 2 font engine, shared library files - The FreeType project is a team of volunteers who develop free, - portable and high-quality software solutions for digital typography. - They specifically target embedded systems and focus on bringing small, - efficient and ubiquitous products. - . - The FreeType 2 library is their new software font engine. It has been - designed to provide the following important features: - * A universal and simple API to manage font files - * Support for several font formats through loadable modules - * High-quality anti-aliasing - * High portability & performance - . - Supported font formats include: - * TrueType files (.ttf) and collections (.ttc) - * Type 1 font files both in ASCII (.pfa) or binary (.pfb) format - * Type 1 Multiple Master fonts. The FreeType 2 API also provides - routines to manage design instances easily - * Type 1 CID-keyed fonts - * OpenType/CFF (.otf) fonts - * CFF/Type 2 fonts - * Adobe CEF fonts (.cef), used to embed fonts in SVG documents with - the Adobe SVG viewer plugin. - * Windows FNT/FON bitmap fonts - -Package: libfreetype6-dev -Architecture: any -Section: libdevel -Depends: libfreetype6 (= ${binary:Version}), libc6-dev | libc-dev, zlib1g-dev | libz-dev -Conflicts: freetype0-dev, freetype1 (<= 1.0.0.1998-03-22-1), freetype1-dev -Replaces: freetype0-dev, freetype1-dev -Description: FreeType 2 font engine, development files - The FreeType project is a team of volunteers who develop free, - portable and high-quality software solutions for digital typography. - They specifically target embedded systems and focus on bringing small, - efficient and ubiquitous products. - . - This package contains all supplementary files (static library, headers - and documentation) you need to develop your own programs using the - FreeType 2 library. - -Package: libfreetype6-dbg -Section: debug -Priority: extra -Architecture: any -Depends: ${misc:Depends}, - libfreetype6 (= ${binary:Version}) -Conflicts: libfreetype6-dbg -Replaces: libfreetype6-dbg -Description: FreeType 2 font engine, debugging symbols - The FreeType project is a team of volunteers who develop free, - portable and high-quality software solutions for digital typography. - They specifically target embedded systems and focus on bringing small, - efficient and ubiquitous products. - . diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index 761470d..0000000 --- a/debian/copyright +++ /dev/null @@ -1,22 +0,0 @@ -This is libfreetype6, written and maintained by Se Mun Lee -on Fri, 13 Nov 2009 14:08:22 +0900. - -The original source can always be found at: - ftp://slp.samsung.net/dists/unstable/main/source/ - -Copyright Holder: Se Mun Lee - -License: - samsung - -/* - * SLP2.0 - * Copyright (c) 2008 Samsung Electronics, Inc. - * All rights reserved. - * - * This software is a confidential and proprietary information - * of Samsung Electronics, Inc. ("Confidential Information"). You - * shall not disclose such Confidential Information and shall use - * it only in accordance with the terms of the license agreement - * you entered into with Samsung Electronics. - */ diff --git a/debian/dirs b/debian/dirs deleted file mode 100644 index ca882bb..0000000 --- a/debian/dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin -usr/sbin diff --git a/debian/docs b/debian/docs deleted file mode 100644 index cb7384d..0000000 --- a/debian/docs +++ /dev/null @@ -1,6 +0,0 @@ -README -README.git -ChangeLog.20 -ChangeLog.21 -ChangeLog.22 -ChangeLog.23 diff --git a/debian/libfreetype6-dev.install.in b/debian/libfreetype6-dev.install.in deleted file mode 100644 index fa49e27..0000000 --- a/debian/libfreetype6-dev.install.in +++ /dev/null @@ -1,7 +0,0 @@ -@PREFIX@/bin/freetype-config -@PREFIX@/include/ -@PREFIX@/lib/*.so -@PREFIX@/lib/*.la -@PREFIX@/lib/*.a -@PREFIX@/lib/pkgconfig/ -@PREFIX@/share/aclocal/ diff --git a/debian/libfreetype6.install.in b/debian/libfreetype6.install.in deleted file mode 100644 index a7c24c5..0000000 --- a/debian/libfreetype6.install.in +++ /dev/null @@ -1 +0,0 @@ -@PREFIX@/lib/*.so.* diff --git a/debian/rules b/debian/rules deleted file mode 100755 index c88e6cc..0000000 --- a/debian/rules +++ /dev/null @@ -1,119 +0,0 @@ -#!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - - -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - -CFLAGS ?= -Wall -g -LDFLAGS ?= -PREFIX ?= /usr -DATADIR ?= /opt - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - -LDFLAGS += -Wl,--rpath=$(PREFIX)/lib -Wl,--as-needed - -config.status: configure - dh_testdir - # Add here commands to configure the package. - CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --prefix=$(PREFIX) - -build: build-stamp - -build-stamp: config.status - dh_testdir - - # Add here commands to compile the package. - $(MAKE) - #docbook-to-man debian/ncurses.sgml > ncurses.1 - - for f in `find $(CURDIR)/debian/ -name "*.in"`; do \ - cat $$f > $${f%.in}; \ - sed -i -e "s#@PREFIX@#$(PREFIX)#g" $${f%.in}; \ - sed -i -e "s#@DATADIR@#$(DATADIR)#g" $${f%.in}; \ - done - - touch $@ - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - - # Add here commands to clean up after the build process. - -$(MAKE) distclean -ifneq "$(wildcard /usr/share/misc/config.sub)" "" - cp -f /usr/share/misc/config.sub config.sub -endif -ifneq "$(wildcard /usr/share/misc/config.guess)" "" - cp -f /usr/share/misc/config.guess config.guess -endif - - for f in `find $(CURDIR)/debian/ -name "*.in"`; do \ - rm -f $${f%.in}; \ - done - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Add here commands to install the package into debian/ncurses. - $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install - - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installexamples - dh_install --sourcedir=debian/tmp -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_python -# dh_installinit -# dh_installcron -# dh_installinfo - dh_installman - dh_link - dh_strip --dbg-package=libfreetype6-dbg - dh_compress - dh_fixperms -# dh_perl - dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install diff --git a/devel/ft2build.h b/devel/ft2build.h index c1d38c3..6cc34b7 100644 --- a/devel/ft2build.h +++ b/devel/ft2build.h @@ -2,10 +2,9 @@ /* */ /* ft2build.h */ /* */ -/* FreeType 2 build and setup macros. */ -/* (Generic version) */ +/* FreeType 2 build and setup macros (development version). */ /* */ -/* Copyright 1996-2001, 2003, 2006 by */ +/* Copyright 1996-2001, 2003, 2006, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -18,24 +17,24 @@ /* - * This is a development version of that is used - * to build the library in debug mode. Its only difference with - * the reference is that it forces the use of the local `ftoption.h' - * which contains different settings for all configuration macros. + * This is a development version of to build the library in + * debug mode. Its only difference to the default version is that it + * includes a local `ftoption.h' header file with different settings for + * many configuration macros. + * + * To use it, simply ensure that the directory containing this file is + * scanned by the compiler before the default FreeType header directory. * - * To use it, you must define the environment variable FT2_BUILD_INCLUDE - * to point to the directory containing these two files (`ft2build.h' and - * `ftoption.h'), then invoke Jam as usual. */ -#ifndef __FT2_BUILD_DEVEL_H__ -#define __FT2_BUILD_DEVEL_H__ +#ifndef __FT2BUILD_H__ +#define __FT2BUILD_H__ -#define FT_CONFIG_OPTIONS_H +#define FT_CONFIG_OPTIONS_H -#include +#include -#endif /* __FT2_BUILD_DEVEL_H__ */ +#endif /* __FT2BUILD_H__ */ /* END */ diff --git a/devel/ftoption.h b/devel/ftoption.h index 4da0221..10027bb 100644 --- a/devel/ftoption.h +++ b/devel/ftoption.h @@ -4,7 +4,7 @@ /* */ /* User-selectable configuration macros (specification only). */ /* */ -/* Copyright 1996-2011 by */ +/* Copyright 1996-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -38,9 +38,9 @@ FT_BEGIN_HEADER /* library from a single source directory. */ /* */ /* - You can put a copy of this file in your build directory, more */ - /* precisely in `$BUILD/freetype/config/ftoption.h', where `$BUILD' */ - /* is the name of a directory that is included _before_ the FreeType */ - /* include path during compilation. */ + /* precisely in `$BUILD/config/ftoption.h', where `$BUILD' is the */ + /* name of a directory that is included _before_ the FreeType include */ + /* path during compilation. */ /* */ /* The default FreeType Makefiles and Jamfiles use the build */ /* directory `builds/' by default, but you can easily change */ @@ -51,7 +51,7 @@ FT_BEGIN_HEADER /* locate this file during the build. For example, */ /* */ /* #define FT_CONFIG_OPTIONS_H */ - /* #include */ + /* #include */ /* */ /* will use `$BUILD/myftoptions.h' instead of this file for macro */ /* definitions. */ @@ -59,9 +59,9 @@ FT_BEGIN_HEADER /* Note also that you can similarly pre-define the macro */ /* FT_CONFIG_MODULES_H used to locate the file listing of the modules */ /* that are statically linked to the library at compile time. By */ - /* default, this file is . */ + /* default, this file is . */ /* */ - /* We highly recommend using the third method whenever possible. */ + /* We highly recommend using the third method whenever possible. */ /* */ /*************************************************************************/ @@ -205,6 +205,33 @@ FT_BEGIN_HEADER /*************************************************************************/ /* */ + /* PNG bitmap support. */ + /* */ + /* FreeType now handles loading color bitmap glyphs in the PNG format. */ + /* This requires help from the external libpng library. Uncompressed */ + /* color bitmaps do not need any external libraries and will be */ + /* supported regardless of this configuration. */ + /* */ + /* Define this macro if you want to enable this `feature'. */ + /* */ +#define FT_CONFIG_OPTION_USE_PNG + + + /*************************************************************************/ + /* */ + /* HarfBuzz support. */ + /* */ + /* FreeType uses the HarfBuzz library to improve auto-hinting of */ + /* OpenType fonts. If available, many glyphs not directly addressable */ + /* by a font's character map will be hinted also. */ + /* */ + /* Define this macro if you want to enable this `feature'. */ + /* */ +#define FT_CONFIG_OPTION_USE_HARFBUZZ + + + /*************************************************************************/ + /* */ /* Define to disable the use of file stream functions and types, FILE, */ /* fopen() etc. Enables the use of smaller system libraries on embedded */ /* systems that have multiple system libraries, some with or without */ @@ -514,7 +541,7 @@ FT_BEGIN_HEADER /* does not contain any glyph name though. */ /* */ /* Accessing SFNT names is done through the functions declared in */ - /* `freetype/ftsnames.h'. */ + /* `ftsnames.h'. */ /* */ #define TT_CONFIG_OPTION_SFNT_NAMES @@ -560,6 +587,28 @@ FT_BEGIN_HEADER /*************************************************************************/ /* */ + /* Define TT_CONFIG_OPTION_SUBPIXEL_HINTING if you want to compile */ + /* EXPERIMENTAL subpixel hinting support into the TrueType driver. This */ + /* replaces the native TrueType hinting mechanism when anything but */ + /* FT_RENDER_MODE_MONO is requested. */ + /* */ + /* Enabling this causes the TrueType driver to ignore instructions under */ + /* certain conditions. This is done in accordance with the guide here, */ + /* with some minor differences: */ + /* */ + /* http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */ + /* */ + /* By undefining this, you only compile the code necessary to hint */ + /* TrueType glyphs with native TT hinting. */ + /* */ + /* This option requires TT_CONFIG_OPTION_BYTECODE_INTERPRETER to be */ + /* defined. */ + /* */ +#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 */ @@ -669,7 +718,7 @@ FT_BEGIN_HEADER /*************************************************************************/ /* */ - /* T1_MAX_DICT_DEPTH is the maximal depth of nest dictionaries and */ + /* T1_MAX_DICT_DEPTH is the maximum depth of nest dictionaries and */ /* arrays in the Type 1 stream (see t1load.c). A minimum of 4 is */ /* required. */ /* */ @@ -716,6 +765,49 @@ FT_BEGIN_HEADER /*************************************************************************/ /*************************************************************************/ /**** ****/ + /**** C F F D R I V E R C O N F I G U R A T I O N ****/ + /**** ****/ + /*************************************************************************/ + /*************************************************************************/ + + + /*************************************************************************/ + /* */ + /* Using CFF_CONFIG_OPTION_DARKENING_PARAMETER_{X,Y}{1,2,3,4} it is */ + /* possible to set up the default values of the four control points that */ + /* define the stem darkening behaviour of the (new) CFF engine. For */ + /* more details please read the documentation of the */ + /* `darkening-parameters' property of the cff driver module (file */ + /* `ftcffdrv.h'), which allows the control at run-time. */ + /* */ + /* Do *not* undefine these macros! */ + /* */ +#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_X1 500 +#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y1 400 + +#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_X2 1000 +#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y2 275 + +#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_X3 1667 +#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y3 275 + +#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_X4 2333 +#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y4 0 + + + /*************************************************************************/ + /* */ + /* CFF_CONFIG_OPTION_OLD_ENGINE controls whether the pre-Adobe CFF */ + /* engine gets compiled into FreeType. If defined, it is possible to */ + /* switch between the two engines using the `hinting-engine' property of */ + /* the cff driver module. */ + /* */ +#define CFF_CONFIG_OPTION_OLD_ENGINE + + + /*************************************************************************/ + /*************************************************************************/ + /**** ****/ /**** A U T O F I T M O D U L E C O N F I G U R A T I O N ****/ /**** ****/ /*************************************************************************/ @@ -752,37 +844,10 @@ FT_BEGIN_HEADER /* - * Define this variable if you want to keep the layout of internal - * structures that was used prior to FreeType 2.2. This also compiles in - * a few obsolete functions to avoid linking problems on typical Unix - * distributions. - * - * For embedded systems or building a new distribution from scratch, it - * is recommended to disable the macro since it reduces the library's code - * size and activates a few memory-saving optimizations as well. - */ -#define FT_CONFIG_OPTION_OLD_INTERNALS - - - /* - * To detect legacy cache-lookup call from a rogue client (<= 2.1.7), - * we restrict the number of charmaps in a font. The current API of - * FTC_CMapCache_Lookup() takes cmap_index & charcode, but old API - * takes charcode only. To determine the passed value is for cmap_index - * or charcode, the possible cmap_index is restricted not to exceed - * the minimum possible charcode by a rogue client. It is also very - * unlikely that a rogue client is interested in Unicode values 0 to 15. - * - * NOTE: The original threshold was 4 deduced from popular number of - * cmap subtables in UCS-4 TrueType fonts, but now it is not - * irregular for OpenType fonts to have more than 4 subtables, - * because variation selector subtables are available for Apple - * and Microsoft platforms. + * This macro is obsolete. Support has been removed in FreeType + * version 2.5. */ - -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS -#define FT_MAX_CHARMAP_CACHEABLE 15 -#endif +/* #define FT_CONFIG_OPTION_OLD_INTERNALS */ /* @@ -796,6 +861,35 @@ FT_BEGIN_HEADER #define TT_USE_BYTECODE_INTERPRETER #endif + + /* + * Check CFF darkening parameters. The checks are the same as in function + * `cff_property_set' in file `cffdrivr.c'. + */ +#if CFF_CONFIG_OPTION_DARKENING_PARAMETER_X1 < 0 || \ + CFF_CONFIG_OPTION_DARKENING_PARAMETER_X2 < 0 || \ + CFF_CONFIG_OPTION_DARKENING_PARAMETER_X3 < 0 || \ + CFF_CONFIG_OPTION_DARKENING_PARAMETER_X4 < 0 || \ + \ + CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y1 < 0 || \ + CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y2 < 0 || \ + CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y3 < 0 || \ + CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y4 < 0 || \ + \ + CFF_CONFIG_OPTION_DARKENING_PARAMETER_X1 > \ + CFF_CONFIG_OPTION_DARKENING_PARAMETER_X2 || \ + CFF_CONFIG_OPTION_DARKENING_PARAMETER_X2 > \ + CFF_CONFIG_OPTION_DARKENING_PARAMETER_X3 || \ + CFF_CONFIG_OPTION_DARKENING_PARAMETER_X3 > \ + CFF_CONFIG_OPTION_DARKENING_PARAMETER_X4 || \ + \ + CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y1 > 500 || \ + CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y2 > 500 || \ + CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y3 > 500 || \ + CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y4 > 500 +#error "Invalid CFF darkening parameters!" +#endif + FT_END_HEADER diff --git a/docs/CHANGES b/docs/CHANGES index ae57932..bbc3110 100644 --- a/docs/CHANGES +++ b/docs/CHANGES @@ -1,4 +1,534 @@ +CHANGES BETWEEN 2.5.4 and 2.5.5 + + I. IMPORTANT BUG FIXES + + - Handling of uncompressed PCF files works again (bug introduced + in version 2.5.4). + + +====================================================================== + +CHANGES BETWEEN 2.5.3 and 2.5.4 + + I. IMPORTANT BUG FIXES + + - A variant of vulnerability CVE-2014-2240 was identified + (cf. http://savannah.nongnu.org/bugs/?43661) and fixed in the + new CFF driver. All users should upgrade. + + - The new auto-hinter code using HarfBuzz crashed for some invalid + fonts. + + - Many fixes to better protect against malformed input. + + + II. IMPORTANT CHANGES + + - Full auto-hinter support of the Devanagari script. + + - Experimental auto-hinter support of the Telugu script. + + - CFF stem darkening behaviour can now be controlled at build time + using the eight macros + + CFF_CONFIG_OPTION_DARKENING_PARAMETER_{X,Y}{1,2,3,4} . + + - Some fields in the `FT_Bitmap' structure have been changed from + signed to unsigned type, which better reflects the actual usage. + It is also an additional means to protect against malformed + input. + + This change doesn't break the ABI; however, it might cause + compiler warnings. + + + III. MISCELLANEOUS + + - Improvements to the auto-hinter's algorithm to recognize stems + and local extrema. + + - Function `FT_Get_SubGlyph_Info' always returned an error even in + case of success. + + - Version 2.5.1 introduced major bugs in the cjk part of the + auto-hinter, which are now fixed. + + - The `FT_Sfnt_Tag' enumeration values have been changed to + uppercase, e.g. `FT_SFNT_HEAD'. The lowercase variants are + deprecated. This is for orthogonality with all other + enumeration (and enumeration-like) values in FreeType. + + - `cmake' now supports builds of FreeType as an OS X framework and + for iOS. + + - Improved project files for vc2010, introducing a property file. + + - The documentation generator for the API reference has been + updated to produce better HTML code (with proper CSS). At the + same time, the documentation got a better structure. + + - The FT_LOAD_BITMAP_CROP flag is obsolete; it is not used by any + driver. + + - The TrueType DELTAP[123] bytecode instructions now work in + subpixel hinting mode as described in the ClearType whitepaper + (i.e., for touched points in the non-subpixel direction). + + - Many small improvements to the internal arithmetic routines. + + +====================================================================== + +CHANGES BETWEEN 2.5.2 and 2.5.3 + + I. IMPORTANT BUG FIXES + + - A vulnerability (CVE-2014-2240) was identified and fixed in the + new CFF driver (cf. http://savannah.nongnu.org/bugs/?41697). + All users should upgrade. + + - More bug fixes related to correct positioning of composite + glyphs. + + - Many fixes to better protect against malformed input. + + + II. IMPORTANT CHANGES + + - FreeType can now use the HarfBuzz library to greatly improve the + auto-hinting of fonts that use OpenType features: Many glyphs + that are part of such features but don't have cmap entries are + now handled properly, for example small caps or superscripts. + Define the configuration macro FT_CONFIG_OPTION_USE_HARFBUZZ to + activate HarfBuzz support. + + You need HarfBuzz version 0.9.19 or newer. + + Note that HarfBuzz depends on FreeType; this currently causes a + chicken-and-egg problem that can be solved as follows in case + HarfBuzz is not yet installed on your system. + + 1. Compile and install FreeType without the configuration + macro FT_CONFIG_OPTION_USE_HARFBUZZ. + + 2. Compile and install HarfBuzz. + + 3. Define macro FT_CONFIG_OPTION_USE_HARFBUZZ, then compile + and install FreeType again. + + With FreeType's `configure' script the procedure boils down to + configure, build, and install Freetype, then configure, compile, + and install HarfBuzz, then configure, compile, and install + FreeType again (after executing `make distclean'). + + - All libraries FreeType depends on are now checked using the + `pkg-config' configuration files first, followed by alternative + methods. + + - The new value `auto' for the various `--with-XXX' library + options (for example `--with-harfbuzz=auto') makes the + `configure' script automatically link to the libraries it finds. + This is now the default. + + - In case FreeType's `configure' script can't find a library, you + can pass environment variables to circumvent pkg-config, and + those variables have been harmonized as a consequence of the + changes mentioned above: + + LIBZ -> removed; use LIBZ_CFLAGS and LIBZ_LIBS + LIBBZ2 -> removed; use BZIP2_CFLAGS and BZIP2_LIBS + LIBPNG_LDFLAGS -> LIBPNG_LIBS + + `./configure --help' shows all available environment variables. + + - The `freetype-config' script now understands option `--static' + to emit static linking information. + + +====================================================================== + +CHANGES BETWEEN 2.5.1 and 2.5.2 + + I. IMPORTANT BUG FIXES + + - Improving the display of some broken TrueType fonts introduced a + bug that made FreeType crash on some popular (but not fully + conformant) fonts like `ahronbd.ttf'. + + - Another round of improvements to correct positioning and hinting + of composite glyphs in TrueType fonts. + + + II. MISCELLANEOUS + + - Version 2.5.1 introduced a bug in handling embedded bitmap + strikes of TrueType fonts, causing garbage display under some + circumstances. + + - The `ftgrid' demo program couldn't be compiled in + non-development builds. + + +====================================================================== + +CHANGES BETWEEN 2.5 and 2.5.1 + + I. IMPORTANT BUG FIXES + + - For some WinFNT files, the last glyph wasn't displayed but + incorrectly marked as invalid. + + - The vertical size of glyphs was incorrectly set after a call to + `FT_GlyphSlot_Embolden', resulting in clipped glyphs. + + - Many fields of the `PCLT' table in SFNT based fonts (if accessed + with `FT_Get_Sfnt_Table') were computed incorrectly. + + - In TrueType fonts, hinting of composite glyphs could sometimes + deliver incorrect positions of components or even distorted + shapes. + + + II. IMPORTANT CHANGES + + - WOFF font format support has been added. + + - The auto-hinter now supports Hebrew. Greek and Cyrillic support + has been improved. + + - Support for the forthcoming `OS/2' SFNT table version 5, as can + be found e.g. in the `Sitka' font family for Windows 8.1. + + - The header file layout has been changed. After installation, + all files are now located in `/include/freetype2'. + + Applications that use (a) `freetype-config' or FreeType's + `pkg-config' file to get the include directory for the compiler, + and (b) the documented way for header inclusion like + + #include + #include FT_FREETYPE_H + ... + + don't need any change to the source code. + + + III. MISCELLANEOUS + + - The stem darkening feature of the new CFF engine can now be + fine-tuned with the new `darkening-parameters' property. + + - `ftgrid' has been updated to toggle various engines with the `H' + key, similar to `ftview' and `ftdiff'. + + - The functionality of `ttdebug' has been greatly enhanced. + + . It now displays twilight, storage, and control value data; key + `T' shows the twilight point table, key `S' the storage data, + and key `C' the control value table. + + . Some keys have been reassigned from lowercase to their + uppercase equivalents; for example `q' to quit the program is + now `Q'. + + . Key `f' finishes the current function. + + . Key `R' restarts the debugger. + + . Keys `b' and `p' set a breakpoint. + + . Key `B' provides a function call backtrace. + + - Better support of ARMv7 and x86_64 processors. + + - Apple's `sbix' color bitmap format is now supported. + + - Improved auto-hinter rendering for many TrueType fonts, + especially in the range 20-40ppem. + + - A new face flag `FT_FACE_FLAG_COLOR' has been added (to be + accessed with the macro `FT_HAS_COLOR'). + + - `FT_Gzip_Uncompress' (modeled after zlib's `uncompress' + function) has been added; this is a by-product of the newly + added WOFF support. + + - Support for a build with `cmake' has been contributed by John + Cary . + + - Support for x64 builds with Visual C++ has been contributed by + Kenneth Miller + + - Manual pages for most demo programs have been added. + + - The GETINFO bytecode instruction for TrueType fonts was buggy if + used to retrieve subpixel hinting information. It was necessary + to set selector bit 6 to get results for selector bits 7-10, + which is wrong. + + - Improved computation of emulated vertical metrics for TrueType + fonts. + + - Fixed horizontal start-up position of vertical phantom points in + TrueType bytecode. + + +====================================================================== + +CHANGES BETWEEN 2.4.12 and 2.5 + + I. IMPORTANT BUG FIXES + + - The cache manager function `FTC_Manager_Reset' didn't flush the + cache. + + + II. IMPORTANT CHANGES + + - Behdad Esfahbod (on behalf of Google) contributed support for + color embedded bitmaps (eg. color emoji). + + A new load flag, FT_LOAD_COLOR, makes FreeType load color + embedded-bitmaps, following this draft specification + + https://color-emoji.googlecode.com/git/specification/v1.html + + which defines two new SFNT tables, `CBDT' and `CBLC' (named and + modeled after `EBDT' and `EBLC', respectively). The color + bitmaps are stored in the new FT_PIXEL_MODE_BGRA format to + represent BGRA pre-multiplied sRGB images. If PNG support is + available, PNG color images as defined in the same proposed + specification are supported also. + + Note that color bitmaps are converted to grayscale if client + didn't ask for color. + + - As announced in the previous release, the old FreeType CFF + engine is now disabled by default. It can be conditionally + compiled by defining the configuration macro + CFF_CONFIG_OPTION_OLD_ENGINE. + + - As announced in the previous release, all code related to macro + FT_CONFIG_OPTION_OLD_INTERNALS has been removed, thus becoming + obsolete. + + + III. MISCELLANEOUS + + - The property API (`FT_Property_Get' and `FT_Property_Set') is + now declared as stable. + + The exception, however, are the experimental auto-hinter + properties `glyph-to-script-map' and `fallback-script' which are + subject to change in a forthcoming release. + + - `ftview' has been updated to support color embedded bitmaps; it + can be toggled on and off with key `c'. The small cache toggle + is now key `K'. + + - It is now possible to control the version of the TrueType + hinting engine using the new `interpreter-version' property of + the `truetype' module: Versions 35 and 38 (the default) are + supported, which roughly corresponds to disable and enable + subpixel hinting support, respectively. + + In both `ftview' and `ftdiff', switching between the two + versions can be done with key `H'. In the `ftbench' demo + program, command line option `-H' has been extended to activate + the non-default interpreter version. + + - The `ttdebug' program has been further improved. In particular, + it accepts a new command line option `-H' to select the hinting + engine. + + - `ftdump's verbose option has been renamed to `-V'. For all demo + programs, `-v' now shows version information. + + - Another round of TrueType subpixel hinting fixes. + + - The `apinames' tool can now create an import file for NetWare. + + - 64bit compilation of the new CFF engine was buggy. + + - Some fixes to improve robustness in memory-tight situations. + + +====================================================================== + +CHANGES BETWEEN 2.4.11 and 2.4.12 + + - We have another CFF parsing and hinting engine! Written by Dave + Arnold , this work has been contributed by + Adobe in collaboration with Google. It is vastly superior to + the old CFF engine, and it will replace it in the next release. + Right now, it is still off by default, and you have to + explicitly select it using the new `hinting-engine' property of + the cff driver: + + ... + #include FT_MODULE_H + #include FT_CFF_DRIVER_H + + FT_Library library; + int engine = FT_CFF_HINTING_ADOBE; + + + ... + FT_Property_Set( library, "cff", "hinting-engine", &engine ); + + The code has a (mature) beta status; we encourage all users to + test it and report any problems. + + In case you want to activate the new CFF engine unconditionally, + apply this patch: + +--- snip --- +diff --git a/src/cff/cffobjs.c b/src/cff/cffobjs.c +index ebcf189..3f2ce6b 100644 +--- a/src/cff/cffobjs.c ++++ b/src/cff/cffobjs.c +@@ -1056,7 +1056,7 @@ + + + /* set default property values */ +- driver->hinting_engine = FT_CFF_HINTING_FREETYPE; ++ driver->hinting_engine = FT_CFF_HINTING_ADOBE; + driver->no_stem_darkening = FALSE; + + return FT_Err_Ok; +--- snip --- + + - The macro FT_CONFIG_OPTION_OLD_INTERNALS is no longer set by + default. In the next release, we will completely remove the + associated code. Please update your programs in case you are + still using this macro. + + + II. MISCELLANEOUS + + - The (top-level) `configure' script now respects the MAKE + environment variable to specify a `make' binary. For backwards + compatibility, GNUMAKE still overrides MAKE, though. + + - The `ftview' and `ftdiff' demo programs have been redesigned, + showing more options permanently on the screen, among other + minor improvements. + + - Using the `H' key, it is now possible to select the CFF engine + in both `ftview' and `ftdiff'. + + - The new command line option `-H' for `ftbench' selects the Adobe + CFF engine. + + - It is now possible to directly select the LCD rendering mode + with the keys `A'-`F' in `ftview'. The key mapping for cycling + through LCD modes has been changed from `K' and `L' to `k' and + `l', and toggling custom LCD filtering is no longer mapped to + key `F' but to key `L'. + + - In `ftdiff', key `x' toggles between layout modes: Either use + the advance width (this is new and now the default) or the + bounding box information to determine line breaks. + + - For all demo tools, the new command line option `-v' shows the + version. + + - For the demo tools with a GUI, the new command line options `-w' + and `-h' select the width and the height of the output window, + respectively. + + - The `ttdebug' program was broken and has been reactivated. Note + that this program is not compiled by default. + + +====================================================================== + +CHANGES BETWEEN 2.4.10 and 2.4.11 + + I. IMPORTANT BUG FIXES + + - Some vulnerabilities in the BDF implementation have been fixed. + Users of this font format should upgrade. + + + II. IMPORTANT CHANGES + + - Subpixel hinting support has been contributed by Infinality, + based on Greg Hitchcock's whitepaper at + + http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx + + Originally, it was a separate patch available from + + http://www.infinality.net/blog/ + + and which has been integrated. + + Note that ClearType support is not completely implemented! In + particular, full support for the options `compatible_widths', + `symmetrical_smoothing, and `bgr' (via the GETINFO bytecode + instruction) is missing. + + Activation of subpixel hinting support can be controlled with + the `TT_CONFIG_OPTION_SUBPIXEL_HINTING' configuration option; it + is switched off by default. This feature is still experimental; + we welcome test reports! + + - Support for OpenType collections (OTC) has been added. + + - Pure CFF fonts within an SFNT wrapper are now supported. + + + III. MISCELLANEOUS + + - Minor rendering improvements to the auto-hinter. + + - `FT_GlyphSlot_Oblique' now uses a shear angle of 12°. + + - Experimental support to handle `property modules', for example + to control the behaviour of the auto-hinter. The API consists + of two new functions, `FT_Property_Set' and `FT_Property_Get'. + + The code is still subject to change and should not be used for + production. + + - The `ftdiff' demo program now supports UTF-8 encoded input files + for option `-f'. + + - Using keys `r' and `R', you can now adjust the stroker radius in + the `ftview' demo program. + + - Other, minor fixes and improvements. + + +====================================================================== + +CHANGES BETWEEN 2.4.9 and 2.4.10 + + I. IMPORTANT BUG FIXES + + - Incremental glyph loading as needed by ghostscript was broken. + + + II. MISCELLANEOUS + + - A new function `FT_Outline_EmboldenXY', contributed by Alexei + Podtelezhnikov. + + - In the `ftview' demo program, key `e' has been replaced with `x' + and `y' to embolden in the horizontal and vertical direction, + respectively. + + - The glyph spacing computation in `FT_GlyphSlot_Embolden' (and + similar code in `ftview') has been improved. + + - Minor improvements to the TrueType bytecode interpreter and + glyph loader, the auto-hinter, and the B/W rasterizer. + + +====================================================================== + CHANGES BETWEEN 2.4.8 and 2.4.9 I. IMPORTANT BUG FIXES @@ -22,7 +552,7 @@ CHANGES BETWEEN 2.4.8 and 2.4.9 - The demo programs no longer recognize and handle default suffixes; you now have to always specify the complete font name. - - Better rendering and LCD mode cycling added to ftview. + - Better rendering and LCD mode cycling added to `ftview'. ====================================================================== @@ -209,7 +739,7 @@ CHANGES BETWEEN 2.4.1 and 2.4.2 The two new functions increment the respective counter. `FT_Done_Library' and `FT_Done_Face' then only destroy a library or face if the counter is 1, otherwise they simply decrement the - counter. + counter. ====================================================================== @@ -2401,7 +2931,7 @@ CHANGES BETWEEN 2.0.3 and 2.0.2 number. see for details. - A new public header file has been introduced, named - FT_TRIGONOMETRY_H (include/freetype/fttrig.h), providing + FT_TRIGONOMETRY_H (include/freetype/fttrigon.h), providing trigonometric functions to compute sines, cosines, arctangents, etc. with 16.16 fixed precision. The implementation is based on the CORDIC algorithm and is very fast while being sufficiently @@ -3629,7 +4159,7 @@ Extensions support: ------------------------------------------------------------------------ -Copyright 2000-2012 by +Copyright 2000-2013 by David Turner, Robert Wilhelm, and Werner Lemberg. This file is part of the FreeType project, and may only be used, diff --git a/docs/CMAKE b/docs/CMAKE new file mode 100644 index 0000000..31237ae --- /dev/null +++ b/docs/CMAKE @@ -0,0 +1,2 @@ +Support for a cmake build has been contributed. See the remarks in the +top-level `CMakeLists.txt' file for more. diff --git a/docs/CUSTOMIZE b/docs/CUSTOMIZE index 7d7d474..dfadb46 100644 --- a/docs/CUSTOMIZE +++ b/docs/CUSTOMIZE @@ -8,10 +8,9 @@ How to customize the compilation of the library I. Configuration macros - The file found in `include/freetype/config/ftoption.h' contains a - list of commented configuration macros that can be toggled by - developers to indicate which features should be active while - building the library. + The file found in `include/config/ftoption.h' contains a list of + commented configuration macros that can be toggled by developers to + indicate which features should be active while building the library. These options range from debug level to availability of certain features, like native TrueType hinting through a bytecode @@ -31,10 +30,14 @@ II. Modules list make uses `modules.cfg' to generate `ftmodule.h' (in the object directory). + If you build FreeType in a directory separate from the source files, + put your customized `modules.cfg' in that directory; that way you + can keep the source files `clean'. + If you don't use GNU make you have to manually edit the file - `include/freetype/config/ftmodule.h' (which is *not* used with if - compiled with GNU make) to add or remove the drivers and components - you want to compile into the library. See `INSTALL.ANY' for more + `include/config/ftmodule.h' (which is *not* used with if compiled + with GNU make) to add or remove the drivers and components you want + to compile into the library. See `INSTALL.ANY' for more information. @@ -77,11 +80,12 @@ IV. Overriding default configuration and module headers [This is actually a combination of method 2 and 3.] - Just put your custom `ftoption.h' file into the objects directory - (normally `/objs'), which GNU make prefers over the - standard location. No action is needed for `ftmodule.h' because - it is generated automatically in the objects directory. - + Just put your custom `ftoption.h' file into the objects directory + (normally `/objs' if you build in the source tree, or the + directory where you invoke configure if you build in a separate + directory), which GNU make prefers over the standard location. No + action is needed for `ftmodule.h' because it is generated + automatically in the objects directory. 2. Using the C include path @@ -91,19 +95,16 @@ IV. Overriding default configuration and module headers #include FT_CONFIG_OPTIONS_H #include FT_CONFIG_MODULES_H - are compiled. Their default values being - and , you - can do something like: + are compiled. Their default values being and + , you can do something like: custom/ - freetype/ - config/ - ftoption.h => custom options header - ftmodule.h => custom modules list + config/ + ftoption.h => custom options header + ftmodule.h => custom modules list include/ => normal FreeType 2 include - freetype/ - ... + ... then change the C include path to always give the path to `custom' before the FreeType 2 `include'. @@ -121,7 +122,7 @@ IV. Overriding default configuration and module headers #define FT_CONFIG_OPTIONS_H #define FT_CONFIG_MODULES_H - #include + #include #endif /* __FT2_BUILD_MY_PLATFORM_H__ */ @@ -137,7 +138,7 @@ IV. Overriding default configuration and module headers ---------------------------------------------------------------------- -Copyright 2003, 2005, 2006 by +Copyright 2003, 2005, 2006, 2012, 2013 by David Turner, Robert Wilhelm, and Werner Lemberg. This file is part of the FreeType project, and may only be used, diff --git a/docs/DEBUG b/docs/DEBUG index 3d6acd3..d8c79d1 100644 --- a/docs/DEBUG +++ b/docs/DEBUG @@ -4,63 +4,63 @@ Debugging within the FreeType sources I. Configuration macros ----------------------- -There are several ways to enable debugging features in a FreeType 2 -builds. This is controlled through the definition of special macros +There are several ways to enable debugging features in a FreeType 2 +builds. This is controlled through the definition of special macros located in the file `ftoptions.h'. The macros are: FT_DEBUG_LEVEL_ERROR - #define this macro if you want to compile the FT_ERROR macro calls - to print error messages during program execution. This will not - stop the program. Very useful to spot invalid fonts during + #define this macro if you want to compile the FT_ERROR macro calls + to print error messages during program execution. This will not + stop the program. Very useful to spot invalid fonts during development and to code workarounds for them. FT_DEBUG_LEVEL_TRACE - #define this macro if you want to compile both macros FT_ERROR and - FT_TRACE. This also includes the variants FT_TRACE0, FT_TRACE1, + #define this macro if you want to compile both macros FT_ERROR and + FT_TRACE. This also includes the variants FT_TRACE0, FT_TRACE1, FT_TRACE2, ..., FT_TRACE7. - The trace macros are used to send debugging messages when an - appropriate `debug level' is configured at runtime through the + The trace macros are used to send debugging messages when an + appropriate `debug level' is configured at runtime through the FT2_DEBUG environment variable (more on this later). FT_DEBUG_MEMORY - If this macro is #defined, the FreeType engine is linked with a - small but effective debugging memory manager that tracks all + If this macro is #defined, the FreeType engine is linked with a + small but effective debugging memory manager that tracks all allocations and frees that are performed within the font engine. - When the FT2_DEBUG_MEMORY environment variable is defined at - runtime, a call to FT_Done_FreeType will dump memory statistics, - including the list of leaked memory blocks with the source locations - where these were allocated. It is always a very good idea to define - this in development builds. This works with _any_ program linked to - FreeType, but requires a big deal of memory (the debugging memory - manager never frees the blocks to the heap in order to detect double - frees). + When the FT2_DEBUG_MEMORY environment variable is defined at + runtime, a call to FT_Done_FreeType will dump memory statistics, + including the list of leaked memory blocks with the source + locations where these were allocated. It is always a very good + idea to define this in development builds. This works with _any_ + program linked to FreeType, but requires a big deal of memory (the + debugging memory manager never frees the blocks to the heap in + order to detect double frees). - When FT2_DEBUG_MEMORY isn't defined at runtime, the debugging memory - manager is ignored, and performance is unaffected. + When FT2_DEBUG_MEMORY isn't defined at runtime, the debugging + memory manager is ignored, and performance is unaffected. II. Debugging macros -------------------- -Several macros can be used within the FreeType sources to help debugging -its code: +Several macros can be used within the FreeType sources to help +debugging its code: 1. FT_ERROR(( ... )) - This macro is used to send debug messages that indicate relatively - serious errors (like broken font files), but will not stop the - execution of the running program. Its code is compiled only when - either FT_DEBUG_LEVEL_ERROR or FT_DEBUG_LEVEL_TRACE are defined in + This macro is used to send debug messages that indicate relatively + serious errors (like broken font files), but will not stop the + execution of the running program. Its code is compiled only when + either FT_DEBUG_LEVEL_ERROR or FT_DEBUG_LEVEL_TRACE are defined in `ftoption.h'. - Note that you have to use a printf-like signature, but with double + Note that you have to use a printf-like signature, but with double parentheses, like in FT_ERROR(( "your %s is not %s\n", "foo", "bar" )); @@ -68,128 +68,130 @@ its code: 2. FT_ASSERT( condition ) - This macro is used to check strong assertions at runtime. If its - condition isn't TRUE, the program will abort with a panic message. - Its code is compiled when either FT_DEBUG_LEVEL_ERROR or - FT_DEBUG_LEVEL_TRACE are defined. You don't need double parentheses - here. For example + This macro is used to check strong assertions at runtime. If its + condition isn't TRUE, the program will abort with a panic message. + Its code is compiled when either FT_DEBUG_LEVEL_ERROR or + FT_DEBUG_LEVEL_TRACE are defined. You don't need double + parentheses here. For example FT_ASSERT( ptr != NULL ); 3. FT_TRACE( level, (message...) ) - The FT_TRACE macro is used to send general-purpose debugging - messages during program execution. This macro uses an *implicit* - macro named FT_COMPONENT used to name the current FreeType component - being run. + The FT_TRACE macro is used to send general-purpose debugging + messages during program execution. This macro uses an *implicit* + macro named FT_COMPONENT used to name the current FreeType + component being run. - The developer should always define FT_COMPONENT as appropriate, for - example as in + The developer should always define FT_COMPONENT as appropriate, + for example as in #undef FT_COMPONENT #define FT_COMPONENT trace_io - The value of the FT_COMPONENT macro is an enumeration named - trace_XXXX where XXXX is one of the component names defined in the - internal file `freetype/internal/fttrace.h'. If you modify FreeType - source and insert new trace_XXXX macro, you must register it in - fttrace.h. If you insert or remove many trace macros, you can check - the undefined or the unused trace macro by src/tools/chktrcmp.py. + The value of the FT_COMPONENT macro is an enumeration named + `trace_XXXX' where `XXXX' is one of the component names defined in + the internal file `internal/fttrace.h'. If you modify FreeType + source and insert new `trace_XXXX' macro, you must register it in + `fttrace.h'. If you insert or remove many trace macros, you can + check the undefined or the unused trace macro by + `src/tools/chktrcmp.py'. - Each such component is assigned a `debug level', ranging from 0 - to 7, through the use of the FT2_DEBUG environment variable + Each such component is assigned a `debug level', ranging from 0 to + 7, through the use of the FT2_DEBUG environment variable (described below) when a program linked with FreeType starts. - When FT_TRACE is called, its level is compared to the one of the - corresponding component. Messages with trace levels *higher* than + When FT_TRACE is called, its level is compared to the one of the + corresponding component. Messages with trace levels *higher* than the corresponding component level are filtered and never printed. - This means that trace messages with level 0 are always printed, - those with level 2 are only printed when the component level is *at - least* 2. + This means that trace messages with level 0 are always printed, + those with level 2 are only printed when the component level is + *at least* 2. - The second parameter to FT_TRACE must contain parentheses and + The second parameter to FT_TRACE must contain parentheses and correspond to a printf-like call, as in FT_TRACE( 2, ( "your %s is not %s\n", "foo", "bar" ) ) - The shortcut macros FT_TRACE0, FT_TRACE1, FT_TRACE2, ..., FT_TRACE7 - can be used with constant level indices, and are much cleaner to - use, as in + The shortcut macros FT_TRACE0, FT_TRACE1, FT_TRACE2, ..., + FT_TRACE7 can be used with constant level indices, and are much + cleaner to use, as in - FT_TRACE2(( "your %s is not %s\n", "foo", "bar" )); + FT_TRACE2(( "your %s is not %s\n", "foo", "bar" )); III. Environment variables -------------------------- -The following environment variables control debugging output and +The following environment variables control debugging output and behaviour of FreeType at runtime. FT2_DEBUG - This variable is only used when FreeType is built with - FT_DEBUG_LEVEL_TRACE defined. It contains a list of component level - definitions, following this format: + This variable is only used when FreeType is built with + FT_DEBUG_LEVEL_TRACE defined. It contains a list of component + level definitions, following this format: - component1:level1 component2:level2 component3:level3 ... + component1:level1 component2:level2 component3:level3 ... - where `componentX' is the name of a tracing component, as defined in - `fttrace.h', but without the `trace_' prefix. `levelX' is the + where `componentX' is the name of a tracing component, as defined + in `fttrace.h', but without the `trace_' prefix. `levelX' is the corresponding level to use at runtime. - `any' is a special component name that will be interpreted as + `any' is a special component name that will be interpreted as `any/all components'. For example, the following definitions - set FT2_DEBUG=any:2 memory:5 io:4 (on Windows) - export FT2_DEBUG="any:2 memory:5 io:4" (on Linux with bash) + set FT2_DEBUG=any:2 memory:5 io:4 (on Windows) + export FT2_DEBUG="any:2 memory:5 io:4" (on Linux with bash) - both stipulate that all components should have level 2, except for - the memory and io components which will be set to trace levels 5 and - 4, respectively. + both stipulate that all components should have level 2, except for + the memory and io components which will be set to trace levels 5 + and 4, respectively. FT2_DEBUG_MEMORY - This environment variable, when defined, tells FreeType to use a - debugging memory manager that will track leaking memory blocks as - well as other common errors like double frees. It is also capable - of reporting _where_ the leaking blocks were allocated, which - considerably saves time when debugging new additions to the library. + This environment variable, when defined, tells FreeType to use a + debugging memory manager that will track leaking memory blocks as + well as other common errors like double frees. It is also capable + of reporting _where_ the leaking blocks were allocated, which + considerably saves time when debugging new additions to the + library. - This code is only compiled when FreeType is built with the - FT_DEBUG_MEMORY macro #defined in `ftoption.h' though, it will be + This code is only compiled when FreeType is built with the + FT_DEBUG_MEMORY macro #defined in `ftoption.h' though, it will be ignored in other builds. FT2_ALLOC_TOTAL_MAX - This variable is ignored if FT2_DEBUG_MEMORY is not defined. It - allows you to specify a maximum heap size for all memory allocations - performed by FreeType. This is very useful to test the robustness - of the font engine and programs that use it in tight memory - conditions. + This variable is ignored if FT2_DEBUG_MEMORY is not defined. It + allows you to specify a maximum heap size for all memory + allocations performed by FreeType. This is very useful to test + the robustness of the font engine and programs that use it in + tight memory conditions. - If it is undefined, or if its value is not strictly positive, then + If it is undefined, or if its value is not strictly positive, then no allocation bounds are checked at runtime. FT2_ALLOC_COUNT_MAX - This variable is ignored if FT2_DEBUG_MEMORY is not defined. It - allows you to specify a maximum number of memory allocations - performed by FreeType before returning the error - FT_Err_Out_Of_Memory. This is useful for debugging and testing the - engine's robustness. + This variable is ignored if FT2_DEBUG_MEMORY is not defined. It + allows you to specify a maximum number of memory allocations + performed by FreeType before returning the error + FT_Err_Out_Of_Memory. This is useful for debugging and testing + the engine's robustness. - If it is undefined, or if its value is not strictly positive, then + If it is undefined, or if its value is not strictly positive, then no allocation bounds are checked at runtime. ------------------------------------------------------------------------ -Copyright 2002, 2003, 2004, 2005, 2009 by +Copyright 2002-2005, 2009, 2013 by David Turner, Robert Wilhelm, and Werner Lemberg. This file is part of the FreeType project, and may only be used, diff --git a/docs/INSTALL b/docs/INSTALL index fc699a8..456b76d 100644 --- a/docs/INSTALL +++ b/docs/INSTALL @@ -43,7 +43,12 @@ I. Normal installation and upgrades directory, where stands for your OS or environment. - 5. From you own IDE, or own Makefiles + 5. Using cmake + + See the top-level `CMakeLists.txt' file for more information. + + + 6. From you own IDE, or own Makefiles If you want to create your own project file, follow the instructions given in the `INSTALL.ANY' document of this @@ -70,7 +75,7 @@ II. Custom builds of the library ---------------------------------------------------------------------- -Copyright 2000-2008, 2010-2011 +Copyright 2000-2008, 2010-2011, 2013 by David Turner, Robert Wilhelm, and Werner Lemberg. This file is part of the FreeType project, and may only be used, diff --git a/docs/INSTALL.ANY b/docs/INSTALL.ANY index 80f161c..8aa394f 100644 --- a/docs/INSTALL.ANY +++ b/docs/INSTALL.ANY @@ -33,25 +33,25 @@ I. Standard procedure src/base/ftbase.c - src/base/ftbbox.c -- recommended, see - src/base/ftglyph.c -- recommended, see + src/base/ftbbox.c -- recommended, see + src/base/ftglyph.c -- recommended, see - src/base/ftbdf.c -- optional, see - src/base/ftbitmap.c -- optional, see - src/base/ftcid.c -- optional, see + src/base/ftbdf.c -- optional, see + src/base/ftbitmap.c -- optional, see + src/base/ftcid.c -- optional, see src/base/ftfstype.c -- optional - src/base/ftgasp.c -- optional, see - src/base/ftgxval.c -- optional, see - src/base/ftlcdfil.c -- optional, see - src/base/ftmm.c -- optional, see - src/base/ftotval.c -- optional, see + src/base/ftgasp.c -- optional, see + src/base/ftgxval.c -- optional, see + src/base/ftlcdfil.c -- optional, see + src/base/ftmm.c -- optional, see + src/base/ftotval.c -- optional, see src/base/ftpatent.c -- optional - src/base/ftpfr.c -- optional, see - src/base/ftstroke.c -- optional, see - src/base/ftsynth.c -- optional, see - src/base/fttype1.c -- optional, see - src/base/ftwinfnt.c -- optional, see - src/base/ftxf86.c -- optional, see + src/base/ftpfr.c -- optional, see + src/base/ftstroke.c -- optional, see + src/base/ftsynth.c -- optional, see + src/base/fttype1.c -- optional, see + src/base/ftwinfnt.c -- optional, see + src/base/ftxf86.c -- optional, see src/base/ftmac.c -- only on the Macintosh @@ -143,7 +143,7 @@ II. Support for flat-directory compilation ---------------------------------------------------------------------- -Copyright 2003, 2005, 2006, 2009, 2010 by +Copyright 2003, 2005, 2006, 2009, 2010, 2013 by David Turner, Robert Wilhelm, and Werner Lemberg. This file is part of the FreeType project, and may only be used, diff --git a/docs/INSTALL.CROSS b/docs/INSTALL.CROSS index 3def12c..d372adc 100644 --- a/docs/INSTALL.CROSS +++ b/docs/INSTALL.CROSS @@ -1,26 +1,27 @@ This document contains instructions on how to cross-build the FreeType library on Unix systems, for example, building binaries for Linux/MIPS -on FreeBSD/i386. Before reading this document, please consult -INSTALL.UNIX for required tools and the basic self-building procedure. +on FreeBSD/i386. Before reading this document, please consult the +file `INSTALL.UNIX' for required tools and the basic self-building +procedure. 1. Required Tools ----------------- For self-building the FreeType library on a Unix system, GNU Make - 3.80 or newer is required. INSTALL.UNIX contains hints how to + 3.80 or newer is required. `INSTALL.UNIX' contains hints how to check the installed `make'. The GNU C compiler to cross-build the target system is required. - At present, using non-GNU cross compiler is not tested. The cross + Currently, using a non-GNU cross compiler is untested. The cross compiler is expected to be installed with a system prefix. For example, if your building system is FreeBSD/i386 and the target - system is Linux/MIPS, the cross compiler should be installed with + system is Linux/MIPS, the cross compiler should be installed with the name `mips-ip22-linuxelf-gcc'. A C compiler for a self-build is required also, to build a tool - that is executed during the building procedure. Non-GNU self - compilers are acceptable, but such a setup is not tested yet. + (`apinames') that is executed during the build procedure. Non-GNU + self compilers are acceptable, but such a setup is untested. 2. Configuration @@ -28,10 +29,10 @@ INSTALL.UNIX for required tools and the basic self-building procedure. 2.1. Building and target system - To configure for cross-build, the options `--host=' and - `--build=' must be passed to configure. For example, if - your building system is FreeBSD/i386 and the target system is - Linux/MIPS, say + To configure a cross-build, the options `--host=' and + `--build=' must be passed to the `configure' script. + For example, if your build system is FreeBSD/i386 and the target + system is Linux/MIPS, say ./configure \ --build=i386-unknown-freebsd \ @@ -44,11 +45,11 @@ INSTALL.UNIX for required tools and the basic self-building procedure. the option pair `--host=' and `--target='. This is broken and doesn't work. Similarly, an explicit CC specification like - env CC=mips-ip22-linux-gcc ./configure + env CC=mips-ip22-linux-gcc ./configure # BAD or - env CC=/usr/local/mips-ip22-linux/bin/gcc ./configure + env CC=/usr/local/mips-ip22-linux/bin/gcc ./configure # BAD doesn't work either; such a configuration confuses the `configure' script while trying to find the cross and native C @@ -58,22 +59,63 @@ INSTALL.UNIX for required tools and the basic self-building procedure. 2.2. The prefix to install FreeType2 Setting `--prefix=' properly is important. The prefix - to install FreeType2 is written into the freetype-config script - and freetype2.pc configuration file. + to install FreeType2 is written into the `freetype-config' + script and `freetype2.pc' configuration file. If the built FreeType 2 library is used as a part of the cross-building system, the prefix is expected to be different - from the self-building system. For example, configuration with - `--prefix=/usr/local' installs binaries into the system wide - `/usr/local' directory which then can't be executed. This - causes confusion in configuration of all applications which use - FreeType2. Instead, use a prefix to install the cross-build - into a separate system tree, for example, - `--prefix=/usr/local/mips-ip22-linux/'. - - On the other hand, if the built FreeType2 is used as a part of - the target system, the prefix to install should reflect the file - system structure of the target system. + from the self-building system. For example, a configuration + with `--prefix=/usr/local' installs binaries into the + system-wide `/usr/local' directory, which then can't be executed + due to the incorrect architecture. This causes confusion in + configuration of all applications that use FreeType2. Instead, + use a prefix to install the cross-build into a separate system + tree, for example, `--prefix=/usr/local/mips-ip22-linux/'. + + On the other hand, if the built FreeType 2 library is used as a + part of the target system, the prefix to install should reflect + the file system structure of the target system. + + + 2.3. Library dependencies + + FreeType normally depends on external libraries like `libpng' or + `libharfbuzz'. The easiest case is to deactivate all such + dependencies using the `--without-XXX' configuration options. + However, if you want to use those libraries, you should ensure + that they are available both on the target system and as + (cross-compiled) libraries on the build system. + + FreeType uses `pkg-config' to find most of the libraries; the + other libraries it links to are expected in the standard system + directories. Since the default pkg-config's meta-information + files (like `harfbuzz.pc') of the build platform don't work, use + one of the two possible solutions below. + + o Use pkg-config's meta-information files that are adjusted to + cross-compile and cross-link with the target platform's + libraries. Make sure those files are found before the build + system's default files. Example: + + ./configure \ + --build=i386-unknown-freebsd \ + --host=mips-ip22-linuxelf \ + PKG_CONFIG_LIBDIR="/usr/local/mips-ip22-linux/lib/pkgconfig" \ + [other options] + + See the manpage of `pkg-config' for more details. + + o Set variables like LIBPNG_LIBS as additional options to the + `configure' script, overriding the values `pkg-config' would + provide. `configure --help' shows the available environment + variables. Example: + + ./configure \ + --build=i386-unknown-freebsd \ + --host=mips-ip22-linuxelf \ + LIBPNG_CFLAGS="-I/usr/local/mips-ip22-linux/include" \ + LIBPNG_LIBS="-L/usr/local/mips-ip22-linux/lib -lpng12" \ + [other options] 3. Building command @@ -121,7 +163,7 @@ INSTALL.UNIX for required tools and the basic self-building procedure. ---------------------------------------------------------------------- -Copyright 2006, 2008 by suzuki toshiya +Copyright 2006, 2008, 2012, 2014 by suzuki toshiya David Turner, Robert Wilhelm, and Werner Lemberg. diff --git a/docs/INSTALL.GNU b/docs/INSTALL.GNU index 72df50a..3b9e0a2 100644 --- a/docs/INSTALL.GNU +++ b/docs/INSTALL.GNU @@ -1,7 +1,7 @@ -This document contains instructions how to build the FreeType library -on non-Unix systems with the help of GNU Make. Note that if you are -running Cygwin or MSys in Windows, you should follow the instructions -in the file INSTALL.UNIX instead. +This document contains instructions how to build the FreeType library +on non-Unix systems with the help of GNU Make. Note that if you are +running Cygwin or MinGW/MSYS in Windows, you should follow the +instructions in the file `INSTALL.UNIX' instead. FreeType 2 includes a powerful and flexible build system that allows @@ -52,10 +52,10 @@ in the file INSTALL.UNIX instead. The following settings are used: - platform win32 + platform windows compiler gcc - configuration directory .\builds\win32 - configuration rules .\builds\win32\w32-gcc.mk + configuration directory .\builds\windows + configuration rules .\builds\windows\w32-gcc.mk If this does not correspond to your system or settings please remove the file 'config.mk' from this directory then read the @@ -138,15 +138,17 @@ in the file INSTALL.UNIX instead. Final note - The build system builds a statically linked library of the font - engine in the `objs' directory. It does _not_ support the build - of DLLs on Windows and OS/2. If you need these, you have to - either use an IDE-specific project file, or follow the + The above instructions build a _statically_ linked library of the + font engine in the `objs' directory. On Windows, you can build a + DLL either with MinGW (within an MSYS shell, following the + instructions in `INSTALL.UNIX'), or you use one of the Visual C++ + project files; see the subdirectories of `builds/windows'. For + everything else, you are on your own, and you might follow the instructions in `INSTALL.ANY' to create your own Makefiles. ---------------------------------------------------------------------- -Copyright 2003, 2004, 2005, 2006, 2008 by +Copyright 2003-2006, 2008, 2013, 2014 by David Turner, Robert Wilhelm, and Werner Lemberg. This file is part of the FreeType project, and may only be used, diff --git a/docs/INSTALL.UNIX b/docs/INSTALL.UNIX index 5dc0764..251c749 100644 --- a/docs/INSTALL.UNIX +++ b/docs/INSTALL.UNIX @@ -23,7 +23,7 @@ or MSys on Win32: fail. It is also fine to have GNU Make under another name (e.g. 'gmake') - if you use the GNUMAKE variable as described below. + if you use the MAKE variable as described below. As a special exception, 'makepp' can also be used to build FreeType 2. See the file docs/MAKEPP for details. @@ -61,11 +61,11 @@ or MSys on Win32: ./configure --prefix=/usr - When using a different command to invoke GNU Make, use the GNUMAKE + When using a different command to invoke GNU Make, use the MAKE variable. For example, if `gmake' is the command to use on your system, do something like: - GNUMAKE=gmake ./configure [options] + MAKE=gmake ./configure [options] gmake gmake install (as root) @@ -81,9 +81,28 @@ or MSys on Win32: make make install + + 3.1 Interdependency with HarfBuzz + ................................. + + Note that there is a chicken-and-egg problem currently since the + HarfBuzz library (used by the auto-hinter to improve support of + OpenType fonts) depends on FreeType, which can be solved as + follows in case HarfBuzz is not yet installed on your system. + + 1. Call FreeType's `configure' script with option + `--without-harfbuzz', then compile and install FreeType. + + 2. Compile and install HarfBuzz. + + 3. Call FreeType's `configure' script without option + `--without-harfbuzz' (after executing `make distclean'), then + compile and install FreeType again. + + ---------------------------------------------------------------------- -Copyright 2003, 2004, 2005, 2006, 2007 by +Copyright 2003-2007, 2013, 2014 by David Turner, Robert Wilhelm, and Werner Lemberg. This file is part of the FreeType project, and may only be used, diff --git a/docs/LICENSE.TXT b/docs/LICENSE.TXT index 62945c8..99dc342 100644 --- a/docs/LICENSE.TXT +++ b/docs/LICENSE.TXT @@ -30,5 +30,8 @@ file src/bdf/README and src/pcf/README). The gzip module uses the zlib license (see src/gzip/zlib.h) which too is compatible to the above two licenses. +The MD5 checksum support (only used for debugging in development builds) +is in the public domain. + --- end of LICENSE.TXT --- diff --git a/docs/VERSION.DLL b/docs/VERSION.DLL index 1dfc8c1..dd49261 100644 --- a/docs/VERSION.DLL +++ b/docs/VERSION.DLL @@ -1,5 +1,5 @@ Due to our use of `libtool' to generate and install the FreeType 2 -libraries on Unix systems, as well as other historical events, it is +libraries on Unix systems, as well as other historical events, it is generally very difficult to know precisely which release of the font engine is installed on a given system. @@ -10,16 +10,16 @@ FreeType on Unix. 1. Version and Release numbers ------------------------------ -For each new public release of FreeType 2, there are generally *three* +For each new public release of FreeType 2, there are generally *three* distinct `version' numbers to consider: - * The official FreeType 2 release number, like 2.0.9 or 2.1.3. + * The official FreeType 2 release number, like 2.3.1 or 2.4.10. - * The libtool (and Unix) specific version number, like 9.2.3. This is - what `freetype-config --version' returns. + * The libtool (and Unix) specific version number, like 13.0.7. This + is what `freetype-config --version' returns. * The platform-specific shared object number, used for example when - the library is installed as `/usr/lib/libfreetype.so.6.3.2'. + the library is installed as `/usr/lib/libfreetype.so.6.7.1'. The platform-specific number is, unsurprisingly, platform-specific and varies with the operating system you are using (several variants of @@ -38,21 +38,29 @@ macros defined in FT_FREETYPE_H: See below for a small autoconf fragment. -The release number is also available at *runtime* through the -`FT_Library_Version' API. Unfortunately, this one wasn't available or -working correctly before the 2.1.3 official release. +The release number is also available at *runtime* through the +`FT_Library_Version' API. 2. History ---------- -The following table gives, for each official release, the corresponding -libtool number, as well as the shared object number found on _most_ -systems, but not all of them: +The following table gives, for all releases since 2.3.0, the +corresponding libtool number, as well as the shared object number found +on _most_ systems, but not all of them: - release libtool so + release libtool so ------------------------------- + 2.5.5 17.4.11 6.11.4 + 2.5.4 17.3.11 6.11.3 + 2.5.3 17.2.11 6.11.2 + 2.5.2 17.1.11 6.11.1 + 2.5.1 17.0.11 6.11.0 + 2.5.0 16.2.10 6.10.2 + 2.4.12 16.1.10 6.10.1 + 2.4.11 16.0.10 6.10.0 + 2.4.10 15.0.9 6.9.0 2.4.9 14.1.8 6.8.1 2.4.8 14.0.8 6.8.0 2.4.7 13.2.7 6.7.2 @@ -76,34 +84,6 @@ systems, but not all of them: 2.3.2 9.13.3 6.3.13 2.3.1 9.12.3 6.3.12 2.3.0 9.11.3 6.3.11 - 2.2.1 9.10.3 6.3.10 - 2.2.0 9.9.3 6.3.9 - 2.1.10 9.8.3 6.3.8 - 2.1.9 9.7.3 6.3.7 - 2.1.8 9.6.3 6.3.6 - 2.1.7 9.5.3 6.3.5 - 2.1.6 9.5.3 6.3.5 - 2.1.5 9.4.3 6.3.4 - 2.1.4 9.3.3 6.3.3 - 2.1.3 9.2.3 6.3.2 - 2.1.2 9.1.3 6.3.1 - 2.1.1 9.0.3 ? - 2.1.0 8.0.2 ? - 2.0.9 9.0.3 ? - 2.0.8 8.0.2 ? - 2.0.4 7.0.1 ? - 2.0.1 6.1.0 ? - -The libtool numbers are a bit inconsistent due to the library's history: - - - 2.1.0 was created as a development branch from 2.0.8 (hence the same - libtool numbers). - - - 2.0.9 was a bug-fix release of the `stable' branch, and we - incorrectly increased its libtool number. - - - 2.1.4 was a development version, however it was stable enough to be - the basis of the 2.2.0 release. 3. Autoconf Code Fragment @@ -135,7 +115,7 @@ other release numbers. ------------------------------------------------------------------------ -Copyright 2002-2012 by +Copyright 2002-2014 by David Turner, Robert Wilhelm, and Werner Lemberg. This file is part of the FreeType project, and may only be used, diff --git a/docs/formats.txt b/docs/formats.txt index 827c894..aed885c 100644 --- a/docs/formats.txt +++ b/docs/formats.txt @@ -153,7 +153,7 @@ MAC --- PS TYPE_1 --- type1 T1_SPEC.pdf for a specification given in Appendix D on pgs. 436-450. However, this information might be out of date; unfortunately, there is no - PCF specification available online, and this book is out of print. + PCF specification available online, and this book is out of print. George Williams deduced the font format from the X11 sources and documented it for his FontForge font editor: diff --git a/docs/freetype-config.1 b/docs/freetype-config.1 new file mode 100644 index 0000000..7b4a118 --- /dev/null +++ b/docs/freetype-config.1 @@ -0,0 +1,108 @@ +.TH FREETYPE-CONFIG 1 "December 2014" "FreeType 2.5.5" +. +. +.SH NAME +. +freetype-config \- Get information about a libfreetype installation +. +. +.SH SYNOPSIS +. +.B freetype-config +.RI [ options ] +. +. +.SH DESCRIPTION +. +.B freetype-config +returns information needed for compiling and linking programs with the +FreeType library, such as linker flags and compilation parameters. +. +Alternatively, it can be used to query information about the +FreeType library version installed on the system, such as the +installation (directory path) prefix or the FreeType version number. +. +.PP +This program is part of the FreeType package. +. +. +.SH OPTIONS +. +There are two types of options: output/display selection options, and +path override options. +. +. +.SS Output selection options +. +Only one of the output selection options should be given at each program +invocation. +. +.TP +.B \-\-prefix +Return the prefix value of the installed FreeType library (the default +prefix will be `/usr' in most cases for distribution-installed +packages). +. +.TP +.B \-\-exec-prefix +Return the executable prefix value of the installed FreeType library +(will often be the same as the prefix value). +. +.TP +.B \-\-ftversion +Return the FreeType version number. +. +.TP +.B \-\-version +Return the `libtool version' of the FreeType library. +. +.TP +.B \-\-libtool +Return the library name for linking with libtool. +. +.TP +.B \-\-libs +Return compiler flags for linking with the installed FreeType library. +. +.TP +.B \-\-cflags +Return compiler flags for compiling against the installed FreeType library. +. +.TP +.B \-\-static +Make command line options display flags for static linking. +. +. +.SS Path override options +. +These affect any selected output option, except the libtool version +returned by `--version'. +. +.TP +.BI \-\-prefix= PREFIX +Override `--prefix' value with +.IR PREFIX . +. +.TP +.BI \-\-exec-prefix= EPREFIX +Override `--exec-prefix' value with +.IR EPREFIX . +. +. +.SH BUGS +In case the libraries FreeType links to are located in non-standard +directories, the output from option +.B \-\-libs +might be incomplete. +It is thus recommended to use the +.BR pkg-config (1) +interface instead, which is able to correctly resolve all dependencies. +. +. +.SH AUTHOR +. +This manual page was contributed by Nis Martensen , +with further refinements from the FreeType team. +. +. +.\" eof diff --git a/docs/reference/ft2-base_interface.html b/docs/reference/ft2-base_interface.html deleted file mode 100644 index 8c918ea..0000000 --- a/docs/reference/ft2-base_interface.html +++ /dev/null @@ -1,3608 +0,0 @@ - - - - -FreeType-2.4.9 API Reference - - - - -

    - -
    [Index][TOC]
    -

    FreeType-2.4.9 API Reference

    - -

    -Base Interface -

    -

    Synopsis

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    FT_LibraryFT_IS_TRICKYFT_Load_Char
    FT_FaceFT_STYLE_FLAG_XXXFT_LOAD_XXX
    FT_SizeFT_Size_InternalFT_LOAD_TARGET_XXX
    FT_GlyphSlotFT_Size_MetricsFT_LOAD_TARGET_MODE
    FT_CharMapFT_SizeRecFT_Set_Transform
    FT_EncodingFT_SubGlyphFT_Render_Mode
    FT_Glyph_MetricsFT_Slot_Internalft_render_mode_xxx
    FT_Bitmap_SizeFT_GlyphSlotRecFT_Render_Glyph
    FT_ModuleFT_Init_FreeTypeFT_Kerning_Mode
    FT_DriverFT_Done_FreeTypeft_kerning_default
    FT_RendererFT_OPEN_XXXft_kerning_unfitted
    FT_ENC_TAGFT_Parameterft_kerning_unscaled
    ft_encoding_xxxFT_Open_ArgsFT_Get_Kerning
    FT_CharMapRecFT_New_FaceFT_Get_Track_Kerning
    FT_Face_InternalFT_New_Memory_FaceFT_Get_Glyph_Name
    FT_FaceRecFT_Open_FaceFT_Get_Postscript_Name
    FT_FACE_FLAG_XXXFT_Attach_FileFT_Select_Charmap
    FT_HAS_HORIZONTALFT_Attach_StreamFT_Set_Charmap
    FT_HAS_VERTICALFT_Reference_FaceFT_Get_Charmap_Index
    FT_HAS_KERNINGFT_Done_FaceFT_Get_Char_Index
    FT_IS_SCALABLEFT_Select_SizeFT_Get_First_Char
    FT_IS_SFNTFT_Size_Request_TypeFT_Get_Next_Char
    FT_IS_FIXED_WIDTHFT_Size_RequestRecFT_Get_Name_Index
    FT_HAS_FIXED_SIZESFT_Size_RequestFT_SUBGLYPH_FLAG_XXX
    FT_HAS_FAST_GLYPHSFT_Request_SizeFT_Get_SubGlyph_Info
    FT_HAS_GLYPH_NAMESFT_Set_Char_SizeFT_FSTYPE_XXX
    FT_HAS_MULTIPLE_MASTERSFT_Set_Pixel_SizesFT_Get_FSType_Flags
    FT_IS_CID_KEYEDFT_Load_Glyph


    - -
    -

    This section describes the public high-level API of FreeType 2.

    -

    -
    -

    FT_Library

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  typedef struct FT_LibraryRec_  *FT_Library;
-
-

    -
    -

    A handle to a FreeType library instance. Each ‘library’ is completely independent from the others; it is the ‘root’ of a set of objects like fonts, faces, sizes, etc.

    -

    It also embeds a memory manager (see FT_Memory), as well as a scan-line converter object (see FT_Raster).

    -

    For multi-threading applications each thread should have its own FT_Library object.

    -

    -
    note
    -

    Library objects are normally created by FT_Init_FreeType, and destroyed with FT_Done_FreeType.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Face

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  typedef struct FT_FaceRec_*  FT_Face;
-
-

    -
    -

    A handle to a given typographic face object. A face object models a given typeface, in a given style.

    -

    -
    note
    -

    Each face object also owns a single FT_GlyphSlot object, as well as one or more FT_Size objects.

    -

    Use FT_New_Face or FT_Open_Face to create a new face object from a given filepathname or a custom input stream.

    -

    Use FT_Done_Face to destroy it (along with its slot and sizes).

    -
    -
    also
    -

    See FT_FaceRec for the publicly accessible fields of a given face object.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Size

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  typedef struct FT_SizeRec_*  FT_Size;
-
-

    -
    -

    A handle to an object used to model a face scaled to a given character size.

    -

    -
    note
    -

    Each FT_Face has an active FT_Size object that is used by functions like FT_Load_Glyph to determine the scaling transformation which is used to load and hint glyphs and metrics.

    -

    You can use FT_Set_Char_Size, FT_Set_Pixel_Sizes, FT_Request_Size or even FT_Select_Size to change the content (i.e., the scaling values) of the active FT_Size.

    -

    You can use FT_New_Size to create additional size objects for a given FT_Face, but they won't be used by other functions until you activate it through FT_Activate_Size. Only one size can be activated at any given time per face.

    -
    -
    also
    -

    See FT_SizeRec for the publicly accessible fields of a given size object.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_GlyphSlot

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  typedef struct FT_GlyphSlotRec_*  FT_GlyphSlot;
-
-

    -
    -

    A handle to a given ‘glyph slot’. A slot is a container where it is possible to load any of the glyphs contained in its parent face.

    -

    In other words, each time you call FT_Load_Glyph or FT_Load_Char, the slot's content is erased by the new glyph data, i.e., the glyph's metrics, its image (bitmap or outline), and other control information.

    -

    -
    also
    -

    See FT_GlyphSlotRec for the publicly accessible glyph fields.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_CharMap

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  typedef struct FT_CharMapRec_*  FT_CharMap;
-
-

    -
    -

    A handle to a given character map. A charmap is used to translate character codes in a given encoding into glyph indexes for its parent's face. Some font formats may provide several charmaps per font.

    -

    Each face object owns zero or more charmaps, but only one of them can be ‘active’ and used by FT_Get_Char_Index or FT_Load_Char.

    -

    The list of available charmaps in a face is available through the ‘face->num_charmaps’ and ‘face->charmaps’ fields of FT_FaceRec.

    -

    The currently active charmap is available as ‘face->charmap’. You should call FT_Set_Charmap to change it.

    -

    -
    note
    -

    When a new face is created (either through FT_New_Face or FT_Open_Face), the library looks for a Unicode charmap within the list and automatically activates it.

    -
    -
    also
    -

    See FT_CharMapRec for the publicly accessible fields of a given character map.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Encoding

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  typedef enum  FT_Encoding_
-  {
-    FT_ENC_TAG( FT_ENCODING_NONE, 0, 0, 0, 0 ),
-
-    FT_ENC_TAG( FT_ENCODING_MS_SYMBOL, 's', 'y', 'm', 'b' ),
-    FT_ENC_TAG( FT_ENCODING_UNICODE,   'u', 'n', 'i', 'c' ),
-
-    FT_ENC_TAG( FT_ENCODING_SJIS,    's', 'j', 'i', 's' ),
-    FT_ENC_TAG( FT_ENCODING_GB2312,  'g', 'b', ' ', ' ' ),
-    FT_ENC_TAG( FT_ENCODING_BIG5,    'b', 'i', 'g', '5' ),
-    FT_ENC_TAG( FT_ENCODING_WANSUNG, 'w', 'a', 'n', 's' ),
-    FT_ENC_TAG( FT_ENCODING_JOHAB,   'j', 'o', 'h', 'a' ),
-
-    /* for backwards compatibility */
-    FT_ENCODING_MS_SJIS    = FT_ENCODING_SJIS,
-    FT_ENCODING_MS_GB2312  = FT_ENCODING_GB2312,
-    FT_ENCODING_MS_BIG5    = FT_ENCODING_BIG5,
-    FT_ENCODING_MS_WANSUNG = FT_ENCODING_WANSUNG,
-    FT_ENCODING_MS_JOHAB   = FT_ENCODING_JOHAB,
-
-    FT_ENC_TAG( FT_ENCODING_ADOBE_STANDARD, 'A', 'D', 'O', 'B' ),
-    FT_ENC_TAG( FT_ENCODING_ADOBE_EXPERT,   'A', 'D', 'B', 'E' ),
-    FT_ENC_TAG( FT_ENCODING_ADOBE_CUSTOM,   'A', 'D', 'B', 'C' ),
-    FT_ENC_TAG( FT_ENCODING_ADOBE_LATIN_1,  'l', 'a', 't', '1' ),
-
-    FT_ENC_TAG( FT_ENCODING_OLD_LATIN_2, 'l', 'a', 't', '2' ),
-
-    FT_ENC_TAG( FT_ENCODING_APPLE_ROMAN, 'a', 'r', 'm', 'n' )
-
-  } FT_Encoding;
-
-

    -
    -

    An enumeration used to specify character sets supported by charmaps. Used in the FT_Select_Charmap API function.

    -

    -
    note
    -

    Despite the name, this enumeration lists specific character repertories (i.e., charsets), and not text encoding methods (e.g., UTF-8, UTF-16, etc.).

    -

    Other encodings might be defined in the future.

    -
    -
    values
    -

    - - - - - - - - - - - - - - - - - - - - - - - - - - -
    FT_ENCODING_NONE -

    The encoding value 0 is reserved.

    -
    FT_ENCODING_UNICODE -

    Corresponds to the Unicode character set. This value covers all versions of the Unicode repertoire, including ASCII and Latin-1. Most fonts include a Unicode charmap, but not all of them.

    -

    For example, if you want to access Unicode value U+1F028 (and the font contains it), use value 0x1F028 as the input value for FT_Get_Char_Index.

    -
    FT_ENCODING_MS_SYMBOL -

    Corresponds to the Microsoft Symbol encoding, used to encode mathematical symbols in the 32..255 character code range. For more information, see ‘http://www.ceviz.net/symbol.htm’.

    -
    FT_ENCODING_SJIS -

    Corresponds to Japanese SJIS encoding. More info at at ‘http://langsupport.japanreference.com/encoding.shtml’. See note on multi-byte encodings below.

    -
    FT_ENCODING_GB2312 -

    Corresponds to an encoding system for Simplified Chinese as used used in mainland China.

    -
    FT_ENCODING_BIG5 -

    Corresponds to an encoding system for Traditional Chinese as used in Taiwan and Hong Kong.

    -
    FT_ENCODING_WANSUNG -

    Corresponds to the Korean encoding system known as Wansung. For more information see ‘http://www.microsoft.com/typography/unicode/949.txt’.

    -
    FT_ENCODING_JOHAB -

    The Korean standard character set (KS C 5601-1992), which corresponds to MS Windows code page 1361. This character set includes all possible Hangeul character combinations.

    -
    FT_ENCODING_ADOBE_LATIN_1
    -

    Corresponds to a Latin-1 encoding as defined in a Type 1 PostScript font. It is limited to 256 character codes.

    -
    FT_ENCODING_ADOBE_STANDARD
    -

    Corresponds to the Adobe Standard encoding, as found in Type 1, CFF, and OpenType/CFF fonts. It is limited to 256 character codes.

    -
    FT_ENCODING_ADOBE_EXPERT
    -

    Corresponds to the Adobe Expert encoding, as found in Type 1, CFF, and OpenType/CFF fonts. It is limited to 256 character codes.

    -
    FT_ENCODING_ADOBE_CUSTOM
    -

    Corresponds to a custom encoding, as found in Type 1, CFF, and OpenType/CFF fonts. It is limited to 256 character codes.

    -
    FT_ENCODING_APPLE_ROMAN
    -

    Corresponds to the 8-bit Apple roman encoding. Many TrueType and OpenType fonts contain a charmap for this encoding, since older versions of Mac OS are able to use it.

    -
    FT_ENCODING_OLD_LATIN_2
    -

    This value is deprecated and was never used nor reported by FreeType. Don't use or test for it.

    -
    FT_ENCODING_MS_SJIS -

    Same as FT_ENCODING_SJIS. Deprecated.

    -
    FT_ENCODING_MS_GB2312 -

    Same as FT_ENCODING_GB2312. Deprecated.

    -
    FT_ENCODING_MS_BIG5 -

    Same as FT_ENCODING_BIG5. Deprecated.

    -
    FT_ENCODING_MS_WANSUNG -

    Same as FT_ENCODING_WANSUNG. Deprecated.

    -
    FT_ENCODING_MS_JOHAB -

    Same as FT_ENCODING_JOHAB. Deprecated.

    -
    -
    -
    note
    -

    By default, FreeType automatically synthesizes a Unicode charmap for PostScript fonts, using their glyph names dictionaries. However, it also reports the encodings defined explicitly in the font file, for the cases when they are needed, with the Adobe values as well.

    -

    FT_ENCODING_NONE is set by the BDF and PCF drivers if the charmap is neither Unicode nor ISO-8859-1 (otherwise it is set to FT_ENCODING_UNICODE). Use FT_Get_BDF_Charset_ID to find out which encoding is really present. If, for example, the ‘cs_registry’ field is ‘KOI8’ and the ‘cs_encoding’ field is ‘R’, the font is encoded in KOI8-R.

    -

    FT_ENCODING_NONE is always set (with a single exception) by the winfonts driver. Use FT_Get_WinFNT_Header and examine the ‘charset’ field of the FT_WinFNT_HeaderRec structure to find out which encoding is really present. For example, FT_WinFNT_ID_CP1251 (204) means Windows code page 1251 (for Russian).

    -

    FT_ENCODING_NONE is set if ‘platform_id’ is TT_PLATFORM_MACINTOSH and ‘encoding_id’ is not TT_MAC_ID_ROMAN (otherwise it is set to FT_ENCODING_APPLE_ROMAN).

    -

    If ‘platform_id’ is TT_PLATFORM_MACINTOSH, use the function FT_Get_CMap_Language_ID to query the Mac language ID which may be needed to be able to distinguish Apple encoding variants. See

    -

    http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/README.TXT

    -

    to get an idea how to do that. Basically, if the language ID is 0, don't use it, otherwise subtract 1 from the language ID. Then examine ‘encoding_id’. If, for example, ‘encoding_id’ is TT_MAC_ID_ROMAN and the language ID (minus 1) is ‘TT_MAC_LANGID_GREEK’, it is the Greek encoding, not Roman. TT_MAC_ID_ARABIC with ‘TT_MAC_LANGID_FARSI’ means the Farsi variant the Arabic encoding.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Glyph_Metrics

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  typedef struct  FT_Glyph_Metrics_
-  {
-    FT_Pos  width;
-    FT_Pos  height;
-
-    FT_Pos  horiBearingX;
-    FT_Pos  horiBearingY;
-    FT_Pos  horiAdvance;
-
-    FT_Pos  vertBearingX;
-    FT_Pos  vertBearingY;
-    FT_Pos  vertAdvance;
-
-  } FT_Glyph_Metrics;
-
-

    -
    -

    A structure used to model the metrics of a single glyph. The values are expressed in 26.6 fractional pixel format; if the flag FT_LOAD_NO_SCALE has been used while loading the glyph, values are expressed in font units instead.

    -

    -
    fields
    -

    - - - - - - - - - -
    width -

    The glyph's width.

    -
    height -

    The glyph's height.

    -
    horiBearingX -

    Left side bearing for horizontal layout.

    -
    horiBearingY -

    Top side bearing for horizontal layout.

    -
    horiAdvance -

    Advance width for horizontal layout.

    -
    vertBearingX -

    Left side bearing for vertical layout.

    -
    vertBearingY -

    Top side bearing for vertical layout. Larger positive values mean further below the vertical glyph origin.

    -
    vertAdvance -

    Advance height for vertical layout. Positive values mean the glyph has a positive advance downward.

    -
    -
    -
    note
    -

    If not disabled with FT_LOAD_NO_HINTING, the values represent dimensions of the hinted glyph (in case hinting is applicable).

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Bitmap_Size

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  typedef struct  FT_Bitmap_Size_
-  {
-    FT_Short  height;
-    FT_Short  width;
-
-    FT_Pos    size;
-
-    FT_Pos    x_ppem;
-    FT_Pos    y_ppem;
-
-  } FT_Bitmap_Size;
-
-

    -
    -

    This structure models the metrics of a bitmap strike (i.e., a set of glyphs for a given point size and resolution) in a bitmap font. It is used for the ‘available_sizes’ field of FT_Face.

    -

    -
    fields
    -

    - - - - - - -
    height -

    The vertical distance, in pixels, between two consecutive baselines. It is always positive.

    -
    width -

    The average width, in pixels, of all glyphs in the strike.

    -
    size -

    The nominal size of the strike in 26.6 fractional points. This field is not very useful.

    -
    x_ppem -

    The horizontal ppem (nominal width) in 26.6 fractional pixels.

    -
    y_ppem -

    The vertical ppem (nominal height) in 26.6 fractional pixels.

    -
    -
    -
    note
    -

    Windows FNT: The nominal size given in a FNT font is not reliable. Thus when the driver finds it incorrect, it sets ‘size’ to some calculated values and sets ‘x_ppem’ and ‘y_ppem’ to the pixel width and height given in the font, respectively.

    -

    TrueType embedded bitmaps: ‘size’, ‘width’, and ‘height’ values are not contained in the bitmap strike itself. They are computed from the global font parameters.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Module

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  typedef struct FT_ModuleRec_*  FT_Module;
-
-

    -
    -

    A handle to a given FreeType module object. Each module can be a font driver, a renderer, or anything else that provides services to the formers.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Driver

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  typedef struct FT_DriverRec_*  FT_Driver;
-
-

    -
    -

    A handle to a given FreeType font driver object. Each font driver is a special module capable of creating faces from font files.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Renderer

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  typedef struct FT_RendererRec_*  FT_Renderer;
-
-

    -
    -

    A handle to a given FreeType renderer. A renderer is a special module in charge of converting a glyph image to a bitmap, when necessary. Each renderer supports a given glyph image format, and one or more target surface depths.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_ENC_TAG

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-#ifndef FT_ENC_TAG
-#define FT_ENC_TAG( value, a, b, c, d )         \
-          value = ( ( (FT_UInt32)(a) << 24 ) |  \
-                    ( (FT_UInt32)(b) << 16 ) |  \
-                    ( (FT_UInt32)(c) <<  8 ) |  \
-                      (FT_UInt32)(d)         )
-
-#endif /* FT_ENC_TAG */
-
-

    -
    -

    This macro converts four-letter tags into an unsigned long. It is used to define ‘encoding’ identifiers (see FT_Encoding).

    -

    -
    note
    -

    Since many 16-bit compilers don't like 32-bit enumerations, you should redefine this macro in case of problems to something like this:

    -
    -  #define FT_ENC_TAG( value, a, b, c, d )  value                   
-
    -

    to get a simple enumeration without assigning special numbers.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    ft_encoding_xxx

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-#define ft_encoding_none            FT_ENCODING_NONE
-#define ft_encoding_unicode         FT_ENCODING_UNICODE
-#define ft_encoding_symbol          FT_ENCODING_MS_SYMBOL
-#define ft_encoding_latin_1         FT_ENCODING_ADOBE_LATIN_1
-#define ft_encoding_latin_2         FT_ENCODING_OLD_LATIN_2
-#define ft_encoding_sjis            FT_ENCODING_SJIS
-#define ft_encoding_gb2312          FT_ENCODING_GB2312
-#define ft_encoding_big5            FT_ENCODING_BIG5
-#define ft_encoding_wansung         FT_ENCODING_WANSUNG
-#define ft_encoding_johab           FT_ENCODING_JOHAB
-
-#define ft_encoding_adobe_standard  FT_ENCODING_ADOBE_STANDARD
-#define ft_encoding_adobe_expert    FT_ENCODING_ADOBE_EXPERT
-#define ft_encoding_adobe_custom    FT_ENCODING_ADOBE_CUSTOM
-#define ft_encoding_apple_roman     FT_ENCODING_APPLE_ROMAN
-
-

    -
    -

    These constants are deprecated; use the corresponding FT_Encoding values instead.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_CharMapRec

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  typedef struct  FT_CharMapRec_
-  {
-    FT_Face      face;
-    FT_Encoding  encoding;
-    FT_UShort    platform_id;
-    FT_UShort    encoding_id;
-
-  } FT_CharMapRec;
-
-

    -
    -

    The base charmap structure.

    -

    -
    fields
    -

    - - - - - -
    face -

    A handle to the parent face object.

    -
    encoding -

    An FT_Encoding tag identifying the charmap. Use this with FT_Select_Charmap.

    -
    platform_id -

    An ID number describing the platform for the following encoding ID. This comes directly from the TrueType specification and should be emulated for other formats.

    -
    encoding_id -

    A platform specific encoding number. This also comes from the TrueType specification and should be emulated similarly.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Face_Internal

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  typedef struct FT_Face_InternalRec_*  FT_Face_Internal;
-
-

    -
    -

    An opaque handle to an ‘FT_Face_InternalRec’ structure, used to model private data of a given FT_Face object.

    -

    This structure might change between releases of FreeType 2 and is not generally available to client applications.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_FaceRec

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  typedef struct  FT_FaceRec_
-  {
-    FT_Long           num_faces;
-    FT_Long           face_index;
-
-    FT_Long           face_flags;
-    FT_Long           style_flags;
-
-    FT_Long           num_glyphs;
-
-    FT_String*        family_name;
-    FT_String*        style_name;
-
-    FT_Int            num_fixed_sizes;
-    FT_Bitmap_Size*   available_sizes;
-
-    FT_Int            num_charmaps;
-    FT_CharMap*       charmaps;
-
-    FT_Generic        generic;
-
-    /*# The following member variables (down to `underline_thickness') */
-    /*# are only relevant to scalable outlines; cf. @FT_Bitmap_Size    */
-    /*# for bitmap fonts.                                              */
-    FT_BBox           bbox;
-
-    FT_UShort         units_per_EM;
-    FT_Short          ascender;
-    FT_Short          descender;
-    FT_Short          height;
-
-    FT_Short          max_advance_width;
-    FT_Short          max_advance_height;
-
-    FT_Short          underline_position;
-    FT_Short          underline_thickness;
-
-    FT_GlyphSlot      glyph;
-    FT_Size           size;
-    FT_CharMap        charmap;
-
-    /*@private begin */
-
-    FT_Driver         driver;
-    FT_Memory         memory;
-    FT_Stream         stream;
-
-    FT_ListRec        sizes_list;
-
-    FT_Generic        autohint;   /* face-specific auto-hinter data */
-    void*             extensions; /* unused                         */
-
-    FT_Face_Internal  internal;
-
-    /*@private end */
-
-  } FT_FaceRec;
-
-

    -
    -

    FreeType root face class structure. A face object models a typeface in a font file.

    -

    -
    fields
    -

    - - - - - - - - - - - - - - - - - - - - - - - - - -
    num_faces -

    The number of faces in the font file. Some font formats can have multiple faces in a font file.

    -
    face_index -

    The index of the face in the font file. It is set to 0 if there is only one face in the font file.

    -
    face_flags -

    A set of bit flags that give important information about the face; see FT_FACE_FLAG_XXX for the details.

    -
    style_flags -

    A set of bit flags indicating the style of the face; see FT_STYLE_FLAG_XXX for the details.

    -
    num_glyphs -

    The number of glyphs in the face. If the face is scalable and has sbits (see ‘num_fixed_sizes’), it is set to the number of outline glyphs.

    -

    For CID-keyed fonts, this value gives the highest CID used in the font.

    -
    family_name -

    The face's family name. This is an ASCII string, usually in English, which describes the typeface's family (like ‘Times New Roman’, ‘Bodoni’, ‘Garamond’, etc). This is a least common denominator used to list fonts. Some formats (TrueType & OpenType) provide localized and Unicode versions of this string. Applications should use the format specific interface to access them. Can be NULL (e.g., in fonts embedded in a PDF file).

    -
    style_name -

    The face's style name. This is an ASCII string, usually in English, which describes the typeface's style (like ‘Italic’, ‘Bold’, ‘Condensed’, etc). Not all font formats provide a style name, so this field is optional, and can be set to NULL. As for ‘family_name’, some formats provide localized and Unicode versions of this string. Applications should use the format specific interface to access them.

    -
    num_fixed_sizes -

    The number of bitmap strikes in the face. Even if the face is scalable, there might still be bitmap strikes, which are called ‘sbits’ in that case.

    -
    available_sizes -

    An array of FT_Bitmap_Size for all bitmap strikes in the face. It is set to NULL if there is no bitmap strike.

    -
    num_charmaps -

    The number of charmaps in the face.

    -
    charmaps -

    An array of the charmaps of the face.

    -
    generic -

    A field reserved for client uses. See the FT_Generic type description.

    -
    bbox -

    The font bounding box. Coordinates are expressed in font units (see ‘units_per_EM’). The box is large enough to contain any glyph from the font. Thus, ‘bbox.yMax’ can be seen as the ‘maximal ascender’, and ‘bbox.yMin’ as the ‘minimal descender’. Only relevant for scalable formats.

    -

    Note that the bounding box might be off by (at least) one pixel for hinted fonts. See FT_Size_Metrics for further discussion.

    -
    units_per_EM -

    The number of font units per EM square for this face. This is typically 2048 for TrueType fonts, and 1000 for Type 1 fonts. Only relevant for scalable formats.

    -
    ascender -

    The typographic ascender of the face, expressed in font units. For font formats not having this information, it is set to ‘bbox.yMax’. Only relevant for scalable formats.

    -
    descender -

    The typographic descender of the face, expressed in font units. For font formats not having this information, it is set to ‘bbox.yMin’. Note that this field is usually negative. Only relevant for scalable formats.

    -
    height -

    The height is the vertical distance between two consecutive baselines, expressed in font units. It is always positive. Only relevant for scalable formats.

    -
    max_advance_width -

    The maximal advance width, in font units, for all glyphs in this face. This can be used to make word wrapping computations faster. Only relevant for scalable formats.

    -
    max_advance_height -

    The maximal advance height, in font units, for all glyphs in this face. This is only relevant for vertical layouts, and is set to ‘height’ for fonts that do not provide vertical metrics. Only relevant for scalable formats.

    -
    underline_position -

    The position, in font units, of the underline line for this face. It is the center of the underlining stem. Only relevant for scalable formats.

    -
    underline_thickness -

    The thickness, in font units, of the underline for this face. Only relevant for scalable formats.

    -
    glyph -

    The face's associated glyph slot(s).

    -
    size -

    The current active size for this face.

    -
    charmap -

    The current active charmap for this face.

    -
    -
    -
    note
    -

    Fields may be changed after a call to FT_Attach_File or FT_Attach_Stream.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_FACE_FLAG_XXX

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-#define FT_FACE_FLAG_SCALABLE          ( 1L <<  0 )
-#define FT_FACE_FLAG_FIXED_SIZES       ( 1L <<  1 )
-#define FT_FACE_FLAG_FIXED_WIDTH       ( 1L <<  2 )
-#define FT_FACE_FLAG_SFNT              ( 1L <<  3 )
-#define FT_FACE_FLAG_HORIZONTAL        ( 1L <<  4 )
-#define FT_FACE_FLAG_VERTICAL          ( 1L <<  5 )
-#define FT_FACE_FLAG_KERNING           ( 1L <<  6 )
-#define FT_FACE_FLAG_FAST_GLYPHS       ( 1L <<  7 )
-#define FT_FACE_FLAG_MULTIPLE_MASTERS  ( 1L <<  8 )
-#define FT_FACE_FLAG_GLYPH_NAMES       ( 1L <<  9 )
-#define FT_FACE_FLAG_EXTERNAL_STREAM   ( 1L << 10 )
-#define FT_FACE_FLAG_HINTER            ( 1L << 11 )
-#define FT_FACE_FLAG_CID_KEYED         ( 1L << 12 )
-#define FT_FACE_FLAG_TRICKY            ( 1L << 13 )
-
-

    -
    -

    A list of bit flags used in the ‘face_flags’ field of the FT_FaceRec structure. They inform client applications of properties of the corresponding face.

    -

    -
    values
    -

    - - - - - - - - - - - - - - - - - - - - - - -
    FT_FACE_FLAG_SCALABLE -

    Indicates that the face contains outline glyphs. This doesn't prevent bitmap strikes, i.e., a face can have both this and and FT_FACE_FLAG_FIXED_SIZES set.

    -
    FT_FACE_FLAG_FIXED_SIZES
    -

    Indicates that the face contains bitmap strikes. See also the ‘num_fixed_sizes’ and ‘available_sizes’ fields of FT_FaceRec.

    -
    FT_FACE_FLAG_FIXED_WIDTH
    -

    Indicates that the face contains fixed-width characters (like Courier, Lucido, MonoType, etc.).

    -
    FT_FACE_FLAG_SFNT -

    Indicates that the face uses the ‘sfnt’ storage scheme. For now, this means TrueType and OpenType.

    -
    FT_FACE_FLAG_HORIZONTAL
    -

    Indicates that the face contains horizontal glyph metrics. This should be set for all common formats.

    -
    FT_FACE_FLAG_VERTICAL -

    Indicates that the face contains vertical glyph metrics. This is only available in some formats, not all of them.

    -
    FT_FACE_FLAG_KERNING -

    Indicates that the face contains kerning information. If set, the kerning distance can be retrieved through the function FT_Get_Kerning. Otherwise the function always return the vector (0,0). Note that FreeType doesn't handle kerning data from the ‘GPOS’ table (as present in some OpenType fonts).

    -
    FT_FACE_FLAG_FAST_GLYPHS
    -

    THIS FLAG IS DEPRECATED. DO NOT USE OR TEST IT.

    -
    FT_FACE_FLAG_MULTIPLE_MASTERS
    -

    Indicates that the font contains multiple masters and is capable of interpolating between them. See the multiple-masters specific API for details.

    -
    FT_FACE_FLAG_GLYPH_NAMES
    -

    Indicates that the font contains glyph names that can be retrieved through FT_Get_Glyph_Name. Note that some TrueType fonts contain broken glyph name tables. Use the function FT_Has_PS_Glyph_Names when needed.

    -
    FT_FACE_FLAG_EXTERNAL_STREAM
    -

    Used internally by FreeType to indicate that a face's stream was provided by the client application and should not be destroyed when FT_Done_Face is called. Don't read or test this flag.

    -
    FT_FACE_FLAG_HINTER -

    Set if the font driver has a hinting machine of its own. For example, with TrueType fonts, it makes sense to use data from the SFNT ‘gasp’ table only if the native TrueType hinting engine (with the bytecode interpreter) is available and active.

    -
    FT_FACE_FLAG_CID_KEYED -

    Set if the font is CID-keyed. In that case, the font is not accessed by glyph indices but by CID values. For subsetted CID-keyed fonts this has the consequence that not all index values are a valid argument to FT_Load_Glyph. Only the CID values for which corresponding glyphs in the subsetted font exist make FT_Load_Glyph return successfully; in all other cases you get an ‘FT_Err_Invalid_Argument’ error.

    -

    Note that CID-keyed fonts which are in an SFNT wrapper don't have this flag set since the glyphs are accessed in the normal way (using contiguous indices); the ‘CID-ness’ isn't visible to the application.

    -
    FT_FACE_FLAG_TRICKY -

    Set if the font is ‘tricky’, this is, it always needs the font format's native hinting engine to get a reasonable result. A typical example is the Chinese font ‘mingli.ttf’ which uses TrueType bytecode instructions to move and scale all of its subglyphs.

    -

    It is not possible to autohint such fonts using FT_LOAD_FORCE_AUTOHINT; it will also ignore FT_LOAD_NO_HINTING. You have to set both FT_LOAD_NO_HINTING and FT_LOAD_NO_AUTOHINT to really disable hinting; however, you probably never want this except for demonstration purposes.

    -

    Currently, there are about a dozen TrueType fonts in the list of tricky fonts; they are hard-coded in file ‘ttobjs.c’.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_HAS_HORIZONTAL

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-#define FT_HAS_HORIZONTAL( face ) \
-          ( face->face_flags & FT_FACE_FLAG_HORIZONTAL )
-
-

    -
    -

    A macro that returns true whenever a face object contains horizontal metrics (this is true for all font formats though).

    -

    -
    also
    -

    FT_HAS_VERTICAL can be used to check for vertical metrics.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_HAS_VERTICAL

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-#define FT_HAS_VERTICAL( face ) \
-          ( face->face_flags & FT_FACE_FLAG_VERTICAL )
-
-

    -
    -

    A macro that returns true whenever a face object contains vertical metrics.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_HAS_KERNING

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-#define FT_HAS_KERNING( face ) \
-          ( face->face_flags & FT_FACE_FLAG_KERNING )
-
-

    -
    -

    A macro that returns true whenever a face object contains kerning data that can be accessed with FT_Get_Kerning.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_IS_SCALABLE

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-#define FT_IS_SCALABLE( face ) \
-          ( face->face_flags & FT_FACE_FLAG_SCALABLE )
-
-

    -
    -

    A macro that returns true whenever a face object contains a scalable font face (true for TrueType, Type 1, Type 42, CID, OpenType/CFF, and PFR font formats.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_IS_SFNT

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-#define FT_IS_SFNT( face ) \
-          ( face->face_flags & FT_FACE_FLAG_SFNT )
-
-

    -
    -

    A macro that returns true whenever a face object contains a font whose format is based on the SFNT storage scheme. This usually means: TrueType fonts, OpenType fonts, as well as SFNT-based embedded bitmap fonts.

    -

    If this macro is true, all functions defined in FT_SFNT_NAMES_H and FT_TRUETYPE_TABLES_H are available.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_IS_FIXED_WIDTH

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-#define FT_IS_FIXED_WIDTH( face ) \
-          ( face->face_flags & FT_FACE_FLAG_FIXED_WIDTH )
-
-

    -
    -

    A macro that returns true whenever a face object contains a font face that contains fixed-width (or ‘monospace’, ‘fixed-pitch’, etc.) glyphs.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_HAS_FIXED_SIZES

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-#define FT_HAS_FIXED_SIZES( face ) \
-          ( face->face_flags & FT_FACE_FLAG_FIXED_SIZES )
-
-

    -
    -

    A macro that returns true whenever a face object contains some embedded bitmaps. See the ‘available_sizes’ field of the FT_FaceRec structure.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_HAS_FAST_GLYPHS

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-#define FT_HAS_FAST_GLYPHS( face )  0
-
-

    -
    -

    Deprecated.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_HAS_GLYPH_NAMES

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-#define FT_HAS_GLYPH_NAMES( face ) \
-          ( face->face_flags & FT_FACE_FLAG_GLYPH_NAMES )
-
-

    -
    -

    A macro that returns true whenever a face object contains some glyph names that can be accessed through FT_Get_Glyph_Name.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_HAS_MULTIPLE_MASTERS

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-#define FT_HAS_MULTIPLE_MASTERS( face ) \
-          ( face->face_flags & FT_FACE_FLAG_MULTIPLE_MASTERS )
-
-

    -
    -

    A macro that returns true whenever a face object contains some multiple masters. The functions provided by FT_MULTIPLE_MASTERS_H are then available to choose the exact design you want.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_IS_CID_KEYED

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-#define FT_IS_CID_KEYED( face ) \
-          ( face->face_flags & FT_FACE_FLAG_CID_KEYED )
-
-

    -
    -

    A macro that returns true whenever a face object contains a CID-keyed font. See the discussion of FT_FACE_FLAG_CID_KEYED for more details.

    -

    If this macro is true, all functions defined in FT_CID_H are available.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_IS_TRICKY

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-#define FT_IS_TRICKY( face ) \
-          ( face->face_flags & FT_FACE_FLAG_TRICKY )
-
-

    -
    -

    A macro that returns true whenever a face represents a ‘tricky’ font. See the discussion of FT_FACE_FLAG_TRICKY for more details.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_STYLE_FLAG_XXX

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-#define FT_STYLE_FLAG_ITALIC  ( 1 << 0 )
-#define FT_STYLE_FLAG_BOLD    ( 1 << 1 )
-
-

    -
    -

    A list of bit-flags used to indicate the style of a given face. These are used in the ‘style_flags’ field of FT_FaceRec.

    -

    -
    values
    -

    - - - -
    FT_STYLE_FLAG_ITALIC -

    Indicates that a given face style is italic or oblique.

    -
    FT_STYLE_FLAG_BOLD -

    Indicates that a given face is bold.

    -
    -
    -
    note
    -

    The style information as provided by FreeType is very basic. More details are beyond the scope and should be done on a higher level (for example, by analyzing various fields of the ‘OS/2’ table in SFNT based fonts).

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Size_Internal

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  typedef struct FT_Size_InternalRec_*  FT_Size_Internal;
-
-

    -
    -

    An opaque handle to an ‘FT_Size_InternalRec’ structure, used to model private data of a given FT_Size object.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Size_Metrics

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  typedef struct  FT_Size_Metrics_
-  {
-    FT_UShort  x_ppem;      /* horizontal pixels per EM               */
-    FT_UShort  y_ppem;      /* vertical pixels per EM                 */
-
-    FT_Fixed   x_scale;     /* scaling values used to convert font    */
-    FT_Fixed   y_scale;     /* units to 26.6 fractional pixels        */
-
-    FT_Pos     ascender;    /* ascender in 26.6 frac. pixels          */
-    FT_Pos     descender;   /* descender in 26.6 frac. pixels         */
-    FT_Pos     height;      /* text height in 26.6 frac. pixels       */
-    FT_Pos     max_advance; /* max horizontal advance, in 26.6 pixels */
-
-  } FT_Size_Metrics;
-
-

    -
    -

    The size metrics structure gives the metrics of a size object.

    -

    -
    fields
    -

    - - - - - - - - - -
    x_ppem -

    The width of the scaled EM square in pixels, hence the term ‘ppem’ (pixels per EM). It is also referred to as ‘nominal width’.

    -
    y_ppem -

    The height of the scaled EM square in pixels, hence the term ‘ppem’ (pixels per EM). It is also referred to as ‘nominal height’.

    -
    x_scale -

    A 16.16 fractional scaling value used to convert horizontal metrics from font units to 26.6 fractional pixels. Only relevant for scalable font formats.

    -
    y_scale -

    A 16.16 fractional scaling value used to convert vertical metrics from font units to 26.6 fractional pixels. Only relevant for scalable font formats.

    -
    ascender -

    The ascender in 26.6 fractional pixels. See FT_FaceRec for the details.

    -
    descender -

    The descender in 26.6 fractional pixels. See FT_FaceRec for the details.

    -
    height -

    The height in 26.6 fractional pixels. See FT_FaceRec for the details.

    -
    max_advance -

    The maximal advance width in 26.6 fractional pixels. See FT_FaceRec for the details.

    -
    -
    -
    note
    -

    The scaling values, if relevant, are determined first during a size changing operation. The remaining fields are then set by the driver. For scalable formats, they are usually set to scaled values of the corresponding fields in FT_FaceRec.

    -

    Note that due to glyph hinting, these values might not be exact for certain fonts. Thus they must be treated as unreliable with an error margin of at least one pixel!

    -

    Indeed, the only way to get the exact metrics is to render all glyphs. As this would be a definite performance hit, it is up to client applications to perform such computations.

    -

    The FT_Size_Metrics structure is valid for bitmap fonts also.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_SizeRec

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  typedef struct  FT_SizeRec_
-  {
-    FT_Face           face;      /* parent face object              */
-    FT_Generic        generic;   /* generic pointer for client uses */
-    FT_Size_Metrics   metrics;   /* size metrics                    */
-    FT_Size_Internal  internal;
-
-  } FT_SizeRec;
-
-

    -
    -

    FreeType root size class structure. A size object models a face object at a given size.

    -

    -
    fields
    -

    - - - - -
    face -

    Handle to the parent face object.

    -
    generic -

    A typeless pointer, which is unused by the FreeType library or any of its drivers. It can be used by client applications to link their own data to each size object.

    -
    metrics -

    Metrics for this size object. This field is read-only.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_SubGlyph

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  typedef struct FT_SubGlyphRec_*  FT_SubGlyph;
-
-

    -
    -

    The subglyph structure is an internal object used to describe subglyphs (for example, in the case of composites).

    -

    -
    note
    -

    The subglyph implementation is not part of the high-level API, hence the forward structure declaration.

    -

    You can however retrieve subglyph information with FT_Get_SubGlyph_Info.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Slot_Internal

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  typedef struct FT_Slot_InternalRec_*  FT_Slot_Internal;
-
-

    -
    -

    An opaque handle to an ‘FT_Slot_InternalRec’ structure, used to model private data of a given FT_GlyphSlot object.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_GlyphSlotRec

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  typedef struct  FT_GlyphSlotRec_
-  {
-    FT_Library        library;
-    FT_Face           face;
-    FT_GlyphSlot      next;
-    FT_UInt           reserved;       /* retained for binary compatibility */
-    FT_Generic        generic;
-
-    FT_Glyph_Metrics  metrics;
-    FT_Fixed          linearHoriAdvance;
-    FT_Fixed          linearVertAdvance;
-    FT_Vector         advance;
-
-    FT_Glyph_Format   format;
-
-    FT_Bitmap         bitmap;
-    FT_Int            bitmap_left;
-    FT_Int            bitmap_top;
-
-    FT_Outline        outline;
-
-    FT_UInt           num_subglyphs;
-    FT_SubGlyph       subglyphs;
-
-    void*             control_data;
-    long              control_len;
-
-    FT_Pos            lsb_delta;
-    FT_Pos            rsb_delta;
-
-    void*             other;
-
-    FT_Slot_Internal  internal;
-
-  } FT_GlyphSlotRec;
-
-

    -
    -

    FreeType root glyph slot class structure. A glyph slot is a container where individual glyphs can be loaded, be they in outline or bitmap format.

    -

    -
    fields
    -

    - - - - - - - - - - - - - - - - - - - - - -
    library -

    A handle to the FreeType library instance this slot belongs to.

    -
    face -

    A handle to the parent face object.

    -
    next -

    In some cases (like some font tools), several glyph slots per face object can be a good thing. As this is rare, the glyph slots are listed through a direct, single-linked list using its ‘next’ field.

    -
    generic -

    A typeless pointer which is unused by the FreeType library or any of its drivers. It can be used by client applications to link their own data to each glyph slot object.

    -
    metrics -

    The metrics of the last loaded glyph in the slot. The returned values depend on the last load flags (see the FT_Load_Glyph API function) and can be expressed either in 26.6 fractional pixels or font units.

    -

    Note that even when the glyph image is transformed, the metrics are not.

    -
    linearHoriAdvance -

    The advance width of the unhinted glyph. Its value is expressed in 16.16 fractional pixels, unless FT_LOAD_LINEAR_DESIGN is set when loading the glyph. This field can be important to perform correct WYSIWYG layout. Only relevant for outline glyphs.

    -
    linearVertAdvance -

    The advance height of the unhinted glyph. Its value is expressed in 16.16 fractional pixels, unless FT_LOAD_LINEAR_DESIGN is set when loading the glyph. This field can be important to perform correct WYSIWYG layout. Only relevant for outline glyphs.

    -
    advance -

    This shorthand is, depending on FT_LOAD_IGNORE_TRANSFORM, the transformed advance width for the glyph (in 26.6 fractional pixel format). As specified with FT_LOAD_VERTICAL_LAYOUT, it uses either the ‘horiAdvance’ or the ‘vertAdvance’ value of ‘metrics’ field.

    -
    format -

    This field indicates the format of the image contained in the glyph slot. Typically FT_GLYPH_FORMAT_BITMAP, FT_GLYPH_FORMAT_OUTLINE, or FT_GLYPH_FORMAT_COMPOSITE, but others are possible.

    -
    bitmap -

    This field is used as a bitmap descriptor when the slot format is FT_GLYPH_FORMAT_BITMAP. Note that the address and content of the bitmap buffer can change between calls of FT_Load_Glyph and a few other functions.

    -
    bitmap_left -

    This is the bitmap's left bearing expressed in integer pixels. Of course, this is only valid if the format is FT_GLYPH_FORMAT_BITMAP.

    -
    bitmap_top -

    This is the bitmap's top bearing expressed in integer pixels. Remember that this is the distance from the baseline to the top-most glyph scanline, upwards y coordinates being positive.

    -
    outline -

    The outline descriptor for the current glyph image if its format is FT_GLYPH_FORMAT_OUTLINE. Once a glyph is loaded, ‘outline’ can be transformed, distorted, embolded, etc. However, it must not be freed.

    -
    num_subglyphs -

    The number of subglyphs in a composite glyph. This field is only valid for the composite glyph format that should normally only be loaded with the FT_LOAD_NO_RECURSE flag. For now this is internal to FreeType.

    -
    subglyphs -

    An array of subglyph descriptors for composite glyphs. There are ‘num_subglyphs’ elements in there. Currently internal to FreeType.

    -
    control_data -

    Certain font drivers can also return the control data for a given glyph image (e.g. TrueType bytecode, Type 1 charstrings, etc.). This field is a pointer to such data.

    -
    control_len -

    This is the length in bytes of the control data.

    -
    other -

    Really wicked formats can use this pointer to present their own glyph image to client applications. Note that the application needs to know about the image format.

    -
    lsb_delta -

    The difference between hinted and unhinted left side bearing while autohinting is active. Zero otherwise.

    -
    rsb_delta -

    The difference between hinted and unhinted right side bearing while autohinting is active. Zero otherwise.

    -
    -
    -
    note
    -

    If FT_Load_Glyph is called with default flags (see FT_LOAD_DEFAULT) the glyph image is loaded in the glyph slot in its native format (e.g., an outline glyph for TrueType and Type 1 formats).

    -

    This image can later be converted into a bitmap by calling FT_Render_Glyph. This function finds the current renderer for the native image's format, then invokes it.

    -

    The renderer is in charge of transforming the native image through the slot's face transformation fields, then converting it into a bitmap that is returned in ‘slot->bitmap’.

    -

    Note that ‘slot->bitmap_left’ and ‘slot->bitmap_top’ are also used to specify the position of the bitmap relative to the current pen position (e.g., coordinates (0,0) on the baseline). Of course, ‘slot->format’ is also changed to FT_GLYPH_FORMAT_BITMAP.

    -
    -
    note
    -

    Here a small pseudo code fragment which shows how to use ‘lsb_delta’ and ‘rsb_delta’:

    -
    -  FT_Pos  origin_x       = 0;                                      
-  FT_Pos  prev_rsb_delta = 0;                                      
-                                                                   
-                                                                   
-  for all glyphs do                                                
-    <compute kern between current and previous glyph and add it to 
-     `origin_x'>                                                   
-                                                                   
-    <load glyph with `FT_Load_Glyph'>                              
-                                                                   
-    if ( prev_rsb_delta - face->glyph->lsb_delta >= 32 )           
-      origin_x -= 64;                                              
-    else if ( prev_rsb_delta - face->glyph->lsb_delta < -32 )      
-      origin_x += 64;                                              
-                                                                   
-    prev_rsb_delta = face->glyph->rsb_delta;                       
-                                                                   
-    <save glyph image, or render glyph, or ...>                    
-                                                                   
-    origin_x += face->glyph->advance.x;                            
-  endfor                                                           
-
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Init_FreeType

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Init_FreeType( FT_Library  *alibrary );
-
-

    -
    -

    Initialize a new FreeType library object. The set of modules that are registered by this function is determined at build time.

    -

    -
    output
    -

    - - -
    alibrary -

    A handle to a new library object.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    In case you want to provide your own memory allocating routines, use FT_New_Library instead, followed by a call to FT_Add_Default_Modules (or a series of calls to FT_Add_Module).

    -

    For multi-threading applications each thread should have its own FT_Library object.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Done_FreeType

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Done_FreeType( FT_Library  library );
-
-

    -
    -

    Destroy a given FreeType library object and all of its children, including resources, drivers, faces, sizes, etc.

    -

    -
    input
    -

    - - -
    library -

    A handle to the target library object.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_OPEN_XXX

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-#define FT_OPEN_MEMORY    0x1
-#define FT_OPEN_STREAM    0x2
-#define FT_OPEN_PATHNAME  0x4
-#define FT_OPEN_DRIVER    0x8
-#define FT_OPEN_PARAMS    0x10
-
-#define ft_open_memory    FT_OPEN_MEMORY     /* deprecated */
-#define ft_open_stream    FT_OPEN_STREAM     /* deprecated */
-#define ft_open_pathname  FT_OPEN_PATHNAME   /* deprecated */
-#define ft_open_driver    FT_OPEN_DRIVER     /* deprecated */
-#define ft_open_params    FT_OPEN_PARAMS     /* deprecated */
-
-

    -
    -

    A list of bit-field constants used within the ‘flags’ field of the FT_Open_Args structure.

    -

    -
    values
    -

    - - - - - - - - - - - -
    FT_OPEN_MEMORY -

    This is a memory-based stream.

    -
    FT_OPEN_STREAM -

    Copy the stream from the ‘stream’ field.

    -
    FT_OPEN_PATHNAME -

    Create a new input stream from a C path name.

    -
    FT_OPEN_DRIVER -

    Use the ‘driver’ field.

    -
    FT_OPEN_PARAMS -

    Use the ‘num_params’ and ‘params’ fields.

    -
    ft_open_memory -

    Deprecated; use FT_OPEN_MEMORY instead.

    -
    ft_open_stream -

    Deprecated; use FT_OPEN_STREAM instead.

    -
    ft_open_pathname -

    Deprecated; use FT_OPEN_PATHNAME instead.

    -
    ft_open_driver -

    Deprecated; use FT_OPEN_DRIVER instead.

    -
    ft_open_params -

    Deprecated; use FT_OPEN_PARAMS instead.

    -
    -
    -
    note
    -

    The ‘FT_OPEN_MEMORY’, ‘FT_OPEN_STREAM’, and ‘FT_OPEN_PATHNAME’ flags are mutually exclusive.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Parameter

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  typedef struct  FT_Parameter_
-  {
-    FT_ULong    tag;
-    FT_Pointer  data;
-
-  } FT_Parameter;
-
-

    -
    -

    A simple structure used to pass more or less generic parameters to FT_Open_Face.

    -

    -
    fields
    -

    - - - -
    tag -

    A four-byte identification tag.

    -
    data -

    A pointer to the parameter data.

    -
    -
    -
    note
    -

    The ID and function of parameters are driver-specific. See the various FT_PARAM_TAG_XXX flags for more information.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Open_Args

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  typedef struct  FT_Open_Args_
-  {
-    FT_UInt         flags;
-    const FT_Byte*  memory_base;
-    FT_Long         memory_size;
-    FT_String*      pathname;
-    FT_Stream       stream;
-    FT_Module       driver;
-    FT_Int          num_params;
-    FT_Parameter*   params;
-
-  } FT_Open_Args;
-
-

    -
    -

    A structure used to indicate how to open a new font file or stream. A pointer to such a structure can be used as a parameter for the functions FT_Open_Face and FT_Attach_Stream.

    -

    -
    fields
    -

    - - - - - - - - - -
    flags -

    A set of bit flags indicating how to use the structure.

    -
    memory_base -

    The first byte of the file in memory.

    -
    memory_size -

    The size in bytes of the file in memory.

    -
    pathname -

    A pointer to an 8-bit file pathname.

    -
    stream -

    A handle to a source stream object.

    -
    driver -

    This field is exclusively used by FT_Open_Face; it simply specifies the font driver to use to open the face. If set to 0, FreeType tries to load the face with each one of the drivers in its list.

    -
    num_params -

    The number of extra parameters.

    -
    params -

    Extra parameters passed to the font driver when opening a new face.

    -
    -
    -
    note
    -

    The stream type is determined by the contents of ‘flags’ which are tested in the following order by FT_Open_Face:

    -

    If the ‘FT_OPEN_MEMORY’ bit is set, assume that this is a memory file of ‘memory_size’ bytes, located at ‘memory_address’. The data are are not copied, and the client is responsible for releasing and destroying them after the corresponding call to FT_Done_Face.

    -

    Otherwise, if the ‘FT_OPEN_STREAM’ bit is set, assume that a custom input stream ‘stream’ is used.

    -

    Otherwise, if the ‘FT_OPEN_PATHNAME’ bit is set, assume that this is a normal file and use ‘pathname’ to open it.

    -

    If the ‘FT_OPEN_DRIVER’ bit is set, FT_Open_Face only tries to open the file with the driver whose handler is in ‘driver’.

    -

    If the ‘FT_OPEN_PARAMS’ bit is set, the parameters given by ‘num_params’ and ‘params’ is used. They are ignored otherwise.

    -

    Ideally, both the ‘pathname’ and ‘params’ fields should be tagged as ‘const’; this is missing for API backwards compatibility. In other words, applications should treat them as read-only.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_New_Face

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_New_Face( FT_Library   library,
-               const char*  filepathname,
-               FT_Long      face_index,
-               FT_Face     *aface );
-
-

    -
    -

    This function calls FT_Open_Face to open a font by its pathname.

    -

    -
    inout
    -

    - - -
    library -

    A handle to the library resource.

    -
    -
    -
    input
    -

    - - - -
    pathname -

    A path to the font file.

    -
    face_index -

    The index of the face within the font. The first face has index 0.

    -
    -
    -
    output
    -

    - - -
    aface -

    A handle to a new face object. If ‘face_index’ is greater than or equal to zero, it must be non-NULL. See FT_Open_Face for more details.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_New_Memory_Face

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_New_Memory_Face( FT_Library      library,
-                      const FT_Byte*  file_base,
-                      FT_Long         file_size,
-                      FT_Long         face_index,
-                      FT_Face        *aface );
-
-

    -
    -

    This function calls FT_Open_Face to open a font which has been loaded into memory.

    -

    -
    inout
    -

    - - -
    library -

    A handle to the library resource.

    -
    -
    -
    input
    -

    - - - - -
    file_base -

    A pointer to the beginning of the font data.

    -
    file_size -

    The size of the memory chunk used by the font data.

    -
    face_index -

    The index of the face within the font. The first face has index 0.

    -
    -
    -
    output
    -

    - - -
    aface -

    A handle to a new face object. If ‘face_index’ is greater than or equal to zero, it must be non-NULL. See FT_Open_Face for more details.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    You must not deallocate the memory before calling FT_Done_Face.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Open_Face

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Open_Face( FT_Library           library,
-                const FT_Open_Args*  args,
-                FT_Long              face_index,
-                FT_Face             *aface );
-
-

    -
    -

    Create a face object from a given resource described by FT_Open_Args.

    -

    -
    inout
    -

    - - -
    library -

    A handle to the library resource.

    -
    -
    -
    input
    -

    - - - -
    args -

    A pointer to an ‘FT_Open_Args’ structure which must be filled by the caller.

    -
    face_index -

    The index of the face within the font. The first face has index 0.

    -
    -
    -
    output
    -

    - - -
    aface -

    A handle to a new face object. If ‘face_index’ is greater than or equal to zero, it must be non-NULL. See note below.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    Unlike FreeType 1.x, this function automatically creates a glyph slot for the face object which can be accessed directly through ‘face->glyph’.

    -

    FT_Open_Face can be used to quickly check whether the font format of a given font resource is supported by FreeType. If the ‘face_index’ field is negative, the function's return value is 0 if the font format is recognized, or non-zero otherwise; the function returns a more or less empty face handle in ‘*aface’ (if ‘aface’ isn't NULL). The only useful field in this special case is ‘face->num_faces’ which gives the number of faces within the font file. After examination, the returned FT_Face structure should be deallocated with a call to FT_Done_Face.

    -

    Each new face object created with this function also owns a default FT_Size object, accessible as ‘face->size’.

    -

    One FT_Library instance can have multiple face objects, this is, FT_Open_Face and its siblings can be called multiple times using the same ‘library’ argument.

    -

    See the discussion of reference counters in the description of FT_Reference_Face.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Attach_File

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Attach_File( FT_Face      face,
-                  const char*  filepathname );
-
-

    -
    -

    This function calls FT_Attach_Stream to attach a file.

    -

    -
    inout
    -

    - - -
    face -

    The target face object.

    -
    -
    -
    input
    -

    - - -
    filepathname -

    The pathname.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Attach_Stream

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Attach_Stream( FT_Face        face,
-                    FT_Open_Args*  parameters );
-
-

    -
    -

    ‘Attach’ data to a face object. Normally, this is used to read additional information for the face object. For example, you can attach an AFM file that comes with a Type 1 font to get the kerning values and other metrics.

    -

    -
    inout
    -

    - - -
    face -

    The target face object.

    -
    -
    -
    input
    -

    - - -
    parameters -

    A pointer to FT_Open_Args which must be filled by the caller.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    The meaning of the ‘attach’ (i.e., what really happens when the new file is read) is not fixed by FreeType itself. It really depends on the font format (and thus the font driver).

    -

    Client applications are expected to know what they are doing when invoking this function. Most drivers simply do not implement file attachments.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Reference_Face

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Reference_Face( FT_Face  face );
-
-

    -
    -

    A counter gets initialized to 1 at the time an FT_Face structure is created. This function increments the counter. FT_Done_Face then only destroys a face if the counter is 1, otherwise it simply decrements the counter.

    -

    This function helps in managing life-cycles of structures which reference FT_Face objects.

    -

    -
    input
    -

    - - -
    face -

    A handle to a target face object.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    since
    -

    2.4.2

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Done_Face

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Done_Face( FT_Face  face );
-
-

    -
    -

    Discard a given face object, as well as all of its child slots and sizes.

    -

    -
    input
    -

    - - -
    face -

    A handle to a target face object.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    See the discussion of reference counters in the description of FT_Reference_Face.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Select_Size

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Select_Size( FT_Face  face,
-                  FT_Int   strike_index );
-
-

    -
    -

    Select a bitmap strike.

    -

    -
    inout
    -

    - - -
    face -

    A handle to a target face object.

    -
    -
    -
    input
    -

    - - -
    strike_index -

    The index of the bitmap strike in the ‘available_sizes’ field of FT_FaceRec structure.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Size_Request_Type

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  typedef enum  FT_Size_Request_Type_
-  {
-    FT_SIZE_REQUEST_TYPE_NOMINAL,
-    FT_SIZE_REQUEST_TYPE_REAL_DIM,
-    FT_SIZE_REQUEST_TYPE_BBOX,
-    FT_SIZE_REQUEST_TYPE_CELL,
-    FT_SIZE_REQUEST_TYPE_SCALES,
-
-    FT_SIZE_REQUEST_TYPE_MAX
-
-  } FT_Size_Request_Type;
-
-

    -
    -

    An enumeration type that lists the supported size request types.

    -

    -
    values
    -

    - - - - - - - - - - - -
    FT_SIZE_REQUEST_TYPE_NOMINAL
    -

    The nominal size. The ‘units_per_EM’ field of FT_FaceRec is used to determine both scaling values.

    -
    FT_SIZE_REQUEST_TYPE_REAL_DIM
    -

    The real dimension. The sum of the the ‘ascender’ and (minus of) the ‘descender’ fields of FT_FaceRec are used to determine both scaling values.

    -
    FT_SIZE_REQUEST_TYPE_BBOX
    -

    The font bounding box. The width and height of the ‘bbox’ field of FT_FaceRec are used to determine the horizontal and vertical scaling value, respectively.

    -
    FT_SIZE_REQUEST_TYPE_CELL
    -

    The ‘max_advance_width’ field of FT_FaceRec is used to determine the horizontal scaling value; the vertical scaling value is determined the same way as FT_SIZE_REQUEST_TYPE_REAL_DIM does. Finally, both scaling values are set to the smaller one. This type is useful if you want to specify the font size for, say, a window of a given dimension and 80x24 cells.

    -
    FT_SIZE_REQUEST_TYPE_SCALES
    -

    Specify the scaling values directly.

    -
    -
    -
    note
    -

    The above descriptions only apply to scalable formats. For bitmap formats, the behaviour is up to the driver.

    -

    See the note section of FT_Size_Metrics if you wonder how size requesting relates to scaling values.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Size_RequestRec

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  typedef struct  FT_Size_RequestRec_
-  {
-    FT_Size_Request_Type  type;
-    FT_Long               width;
-    FT_Long               height;
-    FT_UInt               horiResolution;
-    FT_UInt               vertResolution;
-
-  } FT_Size_RequestRec;
-
-

    -
    -

    A structure used to model a size request.

    -

    -
    fields
    -

    - - - - - - -
    type -

    See FT_Size_Request_Type.

    -
    width -

    The desired width.

    -
    height -

    The desired height.

    -
    horiResolution -

    The horizontal resolution. If set to zero, ‘width’ is treated as a 26.6 fractional pixel value.

    -
    vertResolution -

    The vertical resolution. If set to zero, ‘height’ is treated as a 26.6 fractional pixel value.

    -
    -
    -
    note
    -

    If ‘width’ is zero, then the horizontal scaling value is set equal to the vertical scaling value, and vice versa.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Size_Request

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  typedef struct FT_Size_RequestRec_  *FT_Size_Request;
-
-

    -
    -

    A handle to a size request structure.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Request_Size

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Request_Size( FT_Face          face,
-                   FT_Size_Request  req );
-
-

    -
    -

    Resize the scale of the active FT_Size object in a face.

    -

    -
    inout
    -

    - - -
    face -

    A handle to a target face object.

    -
    -
    -
    input
    -

    - - -
    req -

    A pointer to a FT_Size_RequestRec.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    Although drivers may select the bitmap strike matching the request, you should not rely on this if you intend to select a particular bitmap strike. Use FT_Select_Size instead in that case.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Set_Char_Size

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Set_Char_Size( FT_Face     face,
-                    FT_F26Dot6  char_width,
-                    FT_F26Dot6  char_height,
-                    FT_UInt     horz_resolution,
-                    FT_UInt     vert_resolution );
-
-

    -
    -

    This function calls FT_Request_Size to request the nominal size (in points).

    -

    -
    inout
    -

    - - -
    face -

    A handle to a target face object.

    -
    -
    -
    input
    -

    - - - - - -
    char_width -

    The nominal width, in 26.6 fractional points.

    -
    char_height -

    The nominal height, in 26.6 fractional points.

    -
    horz_resolution -

    The horizontal resolution in dpi.

    -
    vert_resolution -

    The vertical resolution in dpi.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    If either the character width or height is zero, it is set equal to the other value.

    -

    If either the horizontal or vertical resolution is zero, it is set equal to the other value.

    -

    A character width or height smaller than 1pt is set to 1pt; if both resolution values are zero, they are set to 72dpi.

    -

    Don't use this function if you are using the FreeType cache API.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Set_Pixel_Sizes

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Set_Pixel_Sizes( FT_Face  face,
-                      FT_UInt  pixel_width,
-                      FT_UInt  pixel_height );
-
-

    -
    -

    This function calls FT_Request_Size to request the nominal size (in pixels).

    -

    -
    inout
    -

    - - -
    face -

    A handle to the target face object.

    -
    -
    -
    input
    -

    - - - -
    pixel_width -

    The nominal width, in pixels.

    -
    pixel_height -

    The nominal height, in pixels.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Load_Glyph

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Load_Glyph( FT_Face   face,
-                 FT_UInt   glyph_index,
-                 FT_Int32  load_flags );
-
-

    -
    -

    A function used to load a single glyph into the glyph slot of a face object.

    -

    -
    inout
    -

    - - -
    face -

    A handle to the target face object where the glyph is loaded.

    -
    -
    -
    input
    -

    - - - -
    glyph_index -

    The index of the glyph in the font file. For CID-keyed fonts (either in PS or in CFF format) this argument specifies the CID value.

    -
    load_flags -

    A flag indicating what to load for this glyph. The FT_LOAD_XXX constants can be used to control the glyph loading process (e.g., whether the outline should be scaled, whether to load bitmaps or not, whether to hint the outline, etc).

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    The loaded glyph may be transformed. See FT_Set_Transform for the details.

    -

    For subsetted CID-keyed fonts, ‘FT_Err_Invalid_Argument’ is returned for invalid CID values (this is, for CID values which don't have a corresponding glyph in the font). See the discussion of the FT_FACE_FLAG_CID_KEYED flag for more details.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Load_Char

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Load_Char( FT_Face   face,
-                FT_ULong  char_code,
-                FT_Int32  load_flags );
-
-

    -
    -

    A function used to load a single glyph into the glyph slot of a face object, according to its character code.

    -

    -
    inout
    -

    - - -
    face -

    A handle to a target face object where the glyph is loaded.

    -
    -
    -
    input
    -

    - - - -
    char_code -

    The glyph's character code, according to the current charmap used in the face.

    -
    load_flags -

    A flag indicating what to load for this glyph. The FT_LOAD_XXX constants can be used to control the glyph loading process (e.g., whether the outline should be scaled, whether to load bitmaps or not, whether to hint the outline, etc).

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    This function simply calls FT_Get_Char_Index and FT_Load_Glyph.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_LOAD_XXX

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-#define FT_LOAD_DEFAULT                      0x0
-#define FT_LOAD_NO_SCALE                     ( 1L << 0 )
-#define FT_LOAD_NO_HINTING                   ( 1L << 1 )
-#define FT_LOAD_RENDER                       ( 1L << 2 )
-#define FT_LOAD_NO_BITMAP                    ( 1L << 3 )
-#define FT_LOAD_VERTICAL_LAYOUT              ( 1L << 4 )
-#define FT_LOAD_FORCE_AUTOHINT               ( 1L << 5 )
-#define FT_LOAD_CROP_BITMAP                  ( 1L << 6 )
-#define FT_LOAD_PEDANTIC                     ( 1L << 7 )
-#define FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH  ( 1L << 9 )
-#define FT_LOAD_NO_RECURSE                   ( 1L << 10 )
-#define FT_LOAD_IGNORE_TRANSFORM             ( 1L << 11 )
-#define FT_LOAD_MONOCHROME                   ( 1L << 12 )
-#define FT_LOAD_LINEAR_DESIGN                ( 1L << 13 )
-#define FT_LOAD_NO_AUTOHINT                  ( 1L << 15 )
-
-

    -
    -

    A list of bit-field constants used with FT_Load_Glyph to indicate what kind of operations to perform during glyph loading.

    -

    -
    values
    -

    - - - - - - - - - - - - - - - - - - - -
    FT_LOAD_DEFAULT -

    Corresponding to 0, this value is used as the default glyph load operation. In this case, the following happens:

    -

    1. FreeType looks for a bitmap for the glyph corresponding to the face's current size. If one is found, the function returns. The bitmap data can be accessed from the glyph slot (see note below).

    -

    2. If no embedded bitmap is searched or found, FreeType looks for a scalable outline. If one is found, it is loaded from the font file, scaled to device pixels, then ‘hinted’ to the pixel grid in order to optimize it. The outline data can be accessed from the glyph slot (see note below).

    -

    Note that by default, the glyph loader doesn't render outlines into bitmaps. The following flags are used to modify this default behaviour to more specific and useful cases.

    -
    FT_LOAD_NO_SCALE -

    Don't scale the outline glyph loaded, but keep it in font units.

    -

    This flag implies FT_LOAD_NO_HINTING and FT_LOAD_NO_BITMAP, and unsets FT_LOAD_RENDER.

    -
    FT_LOAD_NO_HINTING -

    Disable hinting. This generally generates ‘blurrier’ bitmap glyph when the glyph is rendered in any of the anti-aliased modes. See also the note below.

    -

    This flag is implied by FT_LOAD_NO_SCALE.

    -
    FT_LOAD_RENDER -

    Call FT_Render_Glyph after the glyph is loaded. By default, the glyph is rendered in FT_RENDER_MODE_NORMAL mode. This can be overridden by FT_LOAD_TARGET_XXX or FT_LOAD_MONOCHROME.

    -

    This flag is unset by FT_LOAD_NO_SCALE.

    -
    FT_LOAD_NO_BITMAP -

    Ignore bitmap strikes when loading. Bitmap-only fonts ignore this flag.

    -

    FT_LOAD_NO_SCALE always sets this flag.

    -
    FT_LOAD_VERTICAL_LAYOUT
    -

    Load the glyph for vertical text layout. Don't use it as it is problematic currently.

    -
    FT_LOAD_FORCE_AUTOHINT -

    Indicates that the auto-hinter is preferred over the font's native hinter. See also the note below.

    -
    FT_LOAD_CROP_BITMAP -

    Indicates that the font driver should crop the loaded bitmap glyph (i.e., remove all space around its black bits). Not all drivers implement this.

    -
    FT_LOAD_PEDANTIC -

    Indicates that the font driver should perform pedantic verifications during glyph loading. This is mostly used to detect broken glyphs in fonts. By default, FreeType tries to handle broken fonts also.

    -

    In particular, errors from the TrueType bytecode engine are not passed to the application if this flag is not set; this might result in partially hinted or distorted glyphs in case a glyph's bytecode is buggy.

    -
    FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH
    -

    Ignored. Deprecated.

    -
    FT_LOAD_NO_RECURSE -

    This flag is only used internally. It merely indicates that the font driver should not load composite glyphs recursively. Instead, it should set the ‘num_subglyph’ and ‘subglyphs’ values of the glyph slot accordingly, and set ‘glyph->format’ to FT_GLYPH_FORMAT_COMPOSITE.

    -

    The description of sub-glyphs is not available to client applications for now.

    -

    This flag implies FT_LOAD_NO_SCALE and FT_LOAD_IGNORE_TRANSFORM.

    -
    FT_LOAD_IGNORE_TRANSFORM
    -

    Indicates that the transform matrix set by FT_Set_Transform should be ignored.

    -
    FT_LOAD_MONOCHROME -

    This flag is used with FT_LOAD_RENDER to indicate that you want to render an outline glyph to a 1-bit monochrome bitmap glyph, with 8 pixels packed into each byte of the bitmap data.

    -

    Note that this has no effect on the hinting algorithm used. You should rather use FT_LOAD_TARGET_MONO so that the monochrome-optimized hinting algorithm is used.

    -
    FT_LOAD_LINEAR_DESIGN -

    Indicates that the ‘linearHoriAdvance’ and ‘linearVertAdvance’ fields of FT_GlyphSlotRec should be kept in font units. See FT_GlyphSlotRec for details.

    -
    FT_LOAD_NO_AUTOHINT -

    Disable auto-hinter. See also the note below.

    -
    -
    -
    note
    -

    By default, hinting is enabled and the font's native hinter (see FT_FACE_FLAG_HINTER) is preferred over the auto-hinter. You can disable hinting by setting FT_LOAD_NO_HINTING or change the precedence by setting FT_LOAD_FORCE_AUTOHINT. You can also set FT_LOAD_NO_AUTOHINT in case you don't want the auto-hinter to be used at all.

    -

    See the description of FT_FACE_FLAG_TRICKY for a special exception (affecting only a handful of Asian fonts).

    -

    Besides deciding which hinter to use, you can also decide which hinting algorithm to use. See FT_LOAD_TARGET_XXX for details.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_LOAD_TARGET_XXX

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-#define FT_LOAD_TARGET_( x )   ( (FT_Int32)( (x) & 15 ) << 16 )
-
-#define FT_LOAD_TARGET_NORMAL  FT_LOAD_TARGET_( FT_RENDER_MODE_NORMAL )
-#define FT_LOAD_TARGET_LIGHT   FT_LOAD_TARGET_( FT_RENDER_MODE_LIGHT  )
-#define FT_LOAD_TARGET_MONO    FT_LOAD_TARGET_( FT_RENDER_MODE_MONO   )
-#define FT_LOAD_TARGET_LCD     FT_LOAD_TARGET_( FT_RENDER_MODE_LCD    )
-#define FT_LOAD_TARGET_LCD_V   FT_LOAD_TARGET_( FT_RENDER_MODE_LCD_V  )
-
-

    -
    -

    A list of values that are used to select a specific hinting algorithm to use by the hinter. You should OR one of these values to your ‘load_flags’ when calling FT_Load_Glyph.

    -

    Note that font's native hinters may ignore the hinting algorithm you have specified (e.g., the TrueType bytecode interpreter). You can set FT_LOAD_FORCE_AUTOHINT to ensure that the auto-hinter is used.

    -

    Also note that FT_LOAD_TARGET_LIGHT is an exception, in that it always implies FT_LOAD_FORCE_AUTOHINT.

    -

    -
    values
    -

    - - - - - - -
    FT_LOAD_TARGET_NORMAL -

    This corresponds to the default hinting algorithm, optimized for standard gray-level rendering. For monochrome output, use FT_LOAD_TARGET_MONO instead.

    -
    FT_LOAD_TARGET_LIGHT -

    A lighter hinting algorithm for non-monochrome modes. Many generated glyphs are more fuzzy but better resemble its original shape. A bit like rendering on Mac OS X.

    -

    As a special exception, this target implies FT_LOAD_FORCE_AUTOHINT.

    -
    FT_LOAD_TARGET_MONO -

    Strong hinting algorithm that should only be used for monochrome output. The result is probably unpleasant if the glyph is rendered in non-monochrome modes.

    -
    FT_LOAD_TARGET_LCD -

    A variant of FT_LOAD_TARGET_NORMAL optimized for horizontally decimated LCD displays.

    -
    FT_LOAD_TARGET_LCD_V -

    A variant of FT_LOAD_TARGET_NORMAL optimized for vertically decimated LCD displays.

    -
    -
    -
    note
    -

    You should use only one of the FT_LOAD_TARGET_XXX values in your ‘load_flags’. They can't be ORed.

    -

    If FT_LOAD_RENDER is also set, the glyph is rendered in the corresponding mode (i.e., the mode which matches the used algorithm best) unless FT_LOAD_MONOCHROME is set.

    -

    You can use a hinting algorithm that doesn't correspond to the same rendering mode. As an example, it is possible to use the ‘light’ hinting algorithm and have the results rendered in horizontal LCD pixel mode, with code like

    -
    -  FT_Load_Glyph( face, glyph_index,
-                 load_flags | FT_LOAD_TARGET_LIGHT );
-
-  FT_Render_Glyph( face->glyph, FT_RENDER_MODE_LCD );
-
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_LOAD_TARGET_MODE

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-#define FT_LOAD_TARGET_MODE( x )  ( (FT_Render_Mode)( ( (x) >> 16 ) & 15 ) )
-
-

    -
    -

    Return the FT_Render_Mode corresponding to a given FT_LOAD_TARGET_XXX value.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Set_Transform

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  FT_EXPORT( void )
-  FT_Set_Transform( FT_Face     face,
-                    FT_Matrix*  matrix,
-                    FT_Vector*  delta );
-
-

    -
    -

    A function used to set the transformation that is applied to glyph images when they are loaded into a glyph slot through FT_Load_Glyph.

    -

    -
    inout
    -

    - - -
    face -

    A handle to the source face object.

    -
    -
    -
    input
    -

    - - - -
    matrix -

    A pointer to the transformation's 2x2 matrix. Use 0 for the identity matrix.

    -
    delta -

    A pointer to the translation vector. Use 0 for the null vector.

    -
    -
    -
    note
    -

    The transformation is only applied to scalable image formats after the glyph has been loaded. It means that hinting is unaltered by the transformation and is performed on the character size given in the last call to FT_Set_Char_Size or FT_Set_Pixel_Sizes.

    -

    Note that this also transforms the ‘face.glyph.advance’ field, but not the values in ‘face.glyph.metrics’.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Render_Mode

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  typedef enum  FT_Render_Mode_
-  {
-    FT_RENDER_MODE_NORMAL = 0,
-    FT_RENDER_MODE_LIGHT,
-    FT_RENDER_MODE_MONO,
-    FT_RENDER_MODE_LCD,
-    FT_RENDER_MODE_LCD_V,
-
-    FT_RENDER_MODE_MAX
-
-  } FT_Render_Mode;
-
-

    -
    -

    An enumeration type that lists the render modes supported by FreeType 2. Each mode corresponds to a specific type of scanline conversion performed on the outline.

    -

    For bitmap fonts and embedded bitmaps the ‘bitmap->pixel_mode’ field in the FT_GlyphSlotRec structure gives the format of the returned bitmap.

    -

    All modes except FT_RENDER_MODE_MONO use 256 levels of opacity.

    -

    -
    values
    -

    - - - - - - -
    FT_RENDER_MODE_NORMAL -

    This is the default render mode; it corresponds to 8-bit anti-aliased bitmaps.

    -
    FT_RENDER_MODE_LIGHT -

    This is equivalent to FT_RENDER_MODE_NORMAL. It is only defined as a separate value because render modes are also used indirectly to define hinting algorithm selectors. See FT_LOAD_TARGET_XXX for details.

    -
    FT_RENDER_MODE_MONO -

    This mode corresponds to 1-bit bitmaps (with 2 levels of opacity).

    -
    FT_RENDER_MODE_LCD -

    This mode corresponds to horizontal RGB and BGR sub-pixel displays like LCD screens. It produces 8-bit bitmaps that are 3 times the width of the original glyph outline in pixels, and which use the FT_PIXEL_MODE_LCD mode.

    -
    FT_RENDER_MODE_LCD_V -

    This mode corresponds to vertical RGB and BGR sub-pixel displays (like PDA screens, rotated LCD displays, etc.). It produces 8-bit bitmaps that are 3 times the height of the original glyph outline in pixels and use the FT_PIXEL_MODE_LCD_V mode.

    -
    -
    -
    note
    -

    The LCD-optimized glyph bitmaps produced by FT_Render_Glyph can be filtered to reduce color-fringes by using FT_Library_SetLcdFilter (not active in the default builds). It is up to the caller to either call FT_Library_SetLcdFilter (if available) or do the filtering itself.

    -

    The selected render mode only affects vector glyphs of a font. Embedded bitmaps often have a different pixel mode like FT_PIXEL_MODE_MONO. You can use FT_Bitmap_Convert to transform them into 8-bit pixmaps.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    ft_render_mode_xxx

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-#define ft_render_mode_normal  FT_RENDER_MODE_NORMAL
-#define ft_render_mode_mono    FT_RENDER_MODE_MONO
-
-

    -
    -

    These constants are deprecated. Use the corresponding FT_Render_Mode values instead.

    -

    -
    values
    -

    - - - -
    ft_render_mode_normal -

    see FT_RENDER_MODE_NORMAL

    -
    ft_render_mode_mono -

    see FT_RENDER_MODE_MONO

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Render_Glyph

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Render_Glyph( FT_GlyphSlot    slot,
-                   FT_Render_Mode  render_mode );
-
-

    -
    -

    Convert a given glyph image to a bitmap. It does so by inspecting the glyph image format, finding the relevant renderer, and invoking it.

    -

    -
    inout
    -

    - - -
    slot -

    A handle to the glyph slot containing the image to convert.

    -
    -
    -
    input
    -

    - - -
    render_mode -

    This is the render mode used to render the glyph image into a bitmap. See FT_Render_Mode for a list of possible values.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Kerning_Mode

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  typedef enum  FT_Kerning_Mode_
-  {
-    FT_KERNING_DEFAULT  = 0,
-    FT_KERNING_UNFITTED,
-    FT_KERNING_UNSCALED
-
-  } FT_Kerning_Mode;
-
-

    -
    -

    An enumeration used to specify which kerning values to return in FT_Get_Kerning.

    -

    -
    values
    -

    - - - - -
    FT_KERNING_DEFAULT -

    Return scaled and grid-fitted kerning distances (value is 0).

    -
    FT_KERNING_UNFITTED -

    Return scaled but un-grid-fitted kerning distances.

    -
    FT_KERNING_UNSCALED -

    Return the kerning vector in original font units.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    ft_kerning_default

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-#define ft_kerning_default   FT_KERNING_DEFAULT
-
-

    -
    -

    This constant is deprecated. Please use FT_KERNING_DEFAULT instead.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    ft_kerning_unfitted

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-#define ft_kerning_unfitted  FT_KERNING_UNFITTED
-
-

    -
    -

    This constant is deprecated. Please use FT_KERNING_UNFITTED instead.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    ft_kerning_unscaled

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-#define ft_kerning_unscaled  FT_KERNING_UNSCALED
-
-

    -
    -

    This constant is deprecated. Please use FT_KERNING_UNSCALED instead.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Get_Kerning

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Get_Kerning( FT_Face     face,
-                  FT_UInt     left_glyph,
-                  FT_UInt     right_glyph,
-                  FT_UInt     kern_mode,
-                  FT_Vector  *akerning );
-
-

    -
    -

    Return the kerning vector between two glyphs of a same face.

    -

    -
    input
    -

    - - - - - -
    face -

    A handle to a source face object.

    -
    left_glyph -

    The index of the left glyph in the kern pair.

    -
    right_glyph -

    The index of the right glyph in the kern pair.

    -
    kern_mode -

    See FT_Kerning_Mode for more information. Determines the scale and dimension of the returned kerning vector.

    -
    -
    -
    output
    -

    - - -
    akerning -

    The kerning vector. This is either in font units or in pixels (26.6 format) for scalable formats, and in pixels for fixed-sizes formats.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    Only horizontal layouts (left-to-right & right-to-left) are supported by this method. Other layouts, or more sophisticated kernings, are out of the scope of this API function -- they can be implemented through format-specific interfaces.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Get_Track_Kerning

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Get_Track_Kerning( FT_Face    face,
-                        FT_Fixed   point_size,
-                        FT_Int     degree,
-                        FT_Fixed*  akerning );
-
-

    -
    -

    Return the track kerning for a given face object at a given size.

    -

    -
    input
    -

    - - - - -
    face -

    A handle to a source face object.

    -
    point_size -

    The point size in 16.16 fractional points.

    -
    degree -

    The degree of tightness. Increasingly negative values represent tighter track kerning, while increasingly positive values represent looser track kerning. Value zero means no track kerning.

    -
    -
    -
    output
    -

    - - -
    akerning -

    The kerning in 16.16 fractional points, to be uniformly applied between all glyphs.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    Currently, only the Type 1 font driver supports track kerning, using data from AFM files (if attached with FT_Attach_File or FT_Attach_Stream).

    -

    Only very few AFM files come with track kerning data; please refer to the Adobe's AFM specification for more details.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Get_Glyph_Name

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Get_Glyph_Name( FT_Face     face,
-                     FT_UInt     glyph_index,
-                     FT_Pointer  buffer,
-                     FT_UInt     buffer_max );
-
-

    -
    -

    Retrieve the ASCII name of a given glyph in a face. This only works for those faces where FT_HAS_GLYPH_NAMES(face) returns 1.

    -

    -
    input
    -

    - - - - -
    face -

    A handle to a source face object.

    -
    glyph_index -

    The glyph index.

    -
    buffer_max -

    The maximal number of bytes available in the buffer.

    -
    -
    -
    output
    -

    - - -
    buffer -

    A pointer to a target buffer where the name is copied to.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    An error is returned if the face doesn't provide glyph names or if the glyph index is invalid. In all cases of failure, the first byte of ‘buffer’ is set to 0 to indicate an empty name.

    -

    The glyph name is truncated to fit within the buffer if it is too long. The returned string is always zero-terminated.

    -

    Be aware that FreeType reorders glyph indices internally so that glyph index 0 always corresponds to the ‘missing glyph’ (called ‘.notdef’).

    -

    This function is not compiled within the library if the config macro ‘FT_CONFIG_OPTION_NO_GLYPH_NAMES’ is defined in ‘include/freetype/config/ftoptions.h’.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Get_Postscript_Name

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  FT_EXPORT( const char* )
-  FT_Get_Postscript_Name( FT_Face  face );
-
-

    -
    -

    Retrieve the ASCII PostScript name of a given face, if available. This only works with PostScript and TrueType fonts.

    -

    -
    input
    -

    - - -
    face -

    A handle to the source face object.

    -
    -
    -
    return
    -

    A pointer to the face's PostScript name. NULL if unavailable.

    -
    -
    note
    -

    The returned pointer is owned by the face and is destroyed with it.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Select_Charmap

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Select_Charmap( FT_Face      face,
-                     FT_Encoding  encoding );
-
-

    -
    -

    Select a given charmap by its encoding tag (as listed in ‘freetype.h’).

    -

    -
    inout
    -

    - - -
    face -

    A handle to the source face object.

    -
    -
    -
    input
    -

    - - -
    encoding -

    A handle to the selected encoding.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    This function returns an error if no charmap in the face corresponds to the encoding queried here.

    -

    Because many fonts contain more than a single cmap for Unicode encoding, this function has some special code to select the one which covers Unicode best (‘best’ in the sense that a UCS-4 cmap is preferred to a UCS-2 cmap). It is thus preferable to FT_Set_Charmap in this case.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Set_Charmap

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Set_Charmap( FT_Face     face,
-                  FT_CharMap  charmap );
-
-

    -
    -

    Select a given charmap for character code to glyph index mapping.

    -

    -
    inout
    -

    - - -
    face -

    A handle to the source face object.

    -
    -
    -
    input
    -

    - - -
    charmap -

    A handle to the selected charmap.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    This function returns an error if the charmap is not part of the face (i.e., if it is not listed in the ‘face->charmaps’ table).

    -

    It also fails if a type 14 charmap is selected.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Get_Charmap_Index

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  FT_EXPORT( FT_Int )
-  FT_Get_Charmap_Index( FT_CharMap  charmap );
-
-

    -
    -

    Retrieve index of a given charmap.

    -

    -
    input
    -

    - - -
    charmap -

    A handle to a charmap.

    -
    -
    -
    return
    -

    The index into the array of character maps within the face to which ‘charmap’ belongs. If an error occurs, -1 is returned.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Get_Char_Index

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  FT_EXPORT( FT_UInt )
-  FT_Get_Char_Index( FT_Face   face,
-                     FT_ULong  charcode );
-
-

    -
    -

    Return the glyph index of a given character code. This function uses a charmap object to do the mapping.

    -

    -
    input
    -

    - - - -
    face -

    A handle to the source face object.

    -
    charcode -

    The character code.

    -
    -
    -
    return
    -

    The glyph index. 0 means ‘undefined character code’.

    -
    -
    note
    -

    If you use FreeType to manipulate the contents of font files directly, be aware that the glyph index returned by this function doesn't always correspond to the internal indices used within the file. This is done to ensure that value 0 always corresponds to the ‘missing glyph’.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Get_First_Char

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  FT_EXPORT( FT_ULong )
-  FT_Get_First_Char( FT_Face   face,
-                     FT_UInt  *agindex );
-
-

    -
    -

    This function is used to return the first character code in the current charmap of a given face. It also returns the corresponding glyph index.

    -

    -
    input
    -

    - - -
    face -

    A handle to the source face object.

    -
    -
    -
    output
    -

    - - -
    agindex -

    Glyph index of first character code. 0 if charmap is empty.

    -
    -
    -
    return
    -

    The charmap's first character code.

    -
    -
    note
    -

    You should use this function with FT_Get_Next_Char to be able to parse all character codes available in a given charmap. The code should look like this:

    -
    -  FT_ULong  charcode;                                              
-  FT_UInt   gindex;                                                
-                                                                   
-                                                                   
-  charcode = FT_Get_First_Char( face, &gindex );                   
-  while ( gindex != 0 )                                            
-  {                                                                
-    ... do something with (charcode,gindex) pair ...               
-                                                                   
-    charcode = FT_Get_Next_Char( face, charcode, &gindex );        
-  }                                                                
-
    -

    Note that ‘*agindex’ is set to 0 if the charmap is empty. The result itself can be 0 in two cases: if the charmap is empty or if the value 0 is the first valid character code.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Get_Next_Char

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  FT_EXPORT( FT_ULong )
-  FT_Get_Next_Char( FT_Face    face,
-                    FT_ULong   char_code,
-                    FT_UInt   *agindex );
-
-

    -
    -

    This function is used to return the next character code in the current charmap of a given face following the value ‘char_code’, as well as the corresponding glyph index.

    -

    -
    input
    -

    - - - -
    face -

    A handle to the source face object.

    -
    char_code -

    The starting character code.

    -
    -
    -
    output
    -

    - - -
    agindex -

    Glyph index of next character code. 0 if charmap is empty.

    -
    -
    -
    return
    -

    The charmap's next character code.

    -
    -
    note
    -

    You should use this function with FT_Get_First_Char to walk over all character codes available in a given charmap. See the note for this function for a simple code example.

    -

    Note that ‘*agindex’ is set to 0 when there are no more codes in the charmap.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Get_Name_Index

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  FT_EXPORT( FT_UInt )
-  FT_Get_Name_Index( FT_Face     face,
-                     FT_String*  glyph_name );
-
-

    -
    -

    Return the glyph index of a given glyph name. This function uses driver specific objects to do the translation.

    -

    -
    input
    -

    - - - -
    face -

    A handle to the source face object.

    -
    glyph_name -

    The glyph name.

    -
    -
    -
    return
    -

    The glyph index. 0 means ‘undefined character code’.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_SUBGLYPH_FLAG_XXX

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-#define FT_SUBGLYPH_FLAG_ARGS_ARE_WORDS          1
-#define FT_SUBGLYPH_FLAG_ARGS_ARE_XY_VALUES      2
-#define FT_SUBGLYPH_FLAG_ROUND_XY_TO_GRID        4
-#define FT_SUBGLYPH_FLAG_SCALE                   8
-#define FT_SUBGLYPH_FLAG_XY_SCALE             0x40
-#define FT_SUBGLYPH_FLAG_2X2                  0x80
-#define FT_SUBGLYPH_FLAG_USE_MY_METRICS      0x200
-
-

    -
    -

    A list of constants used to describe subglyphs. Please refer to the TrueType specification for the meaning of the various flags.

    -

    -
    values
    -

    - - - - - - - - - - - - - -
    FT_SUBGLYPH_FLAG_ARGS_ARE_WORDS
    -

    -
    FT_SUBGLYPH_FLAG_ARGS_ARE_XY_VALUES
    -

    -
    FT_SUBGLYPH_FLAG_ROUND_XY_TO_GRID
    -

    -
    FT_SUBGLYPH_FLAG_SCALE -

    -
    FT_SUBGLYPH_FLAG_XY_SCALE
    -

    -
    FT_SUBGLYPH_FLAG_2X2 -

    -
    FT_SUBGLYPH_FLAG_USE_MY_METRICS
    -

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Get_SubGlyph_Info

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Get_SubGlyph_Info( FT_GlyphSlot  glyph,
-                        FT_UInt       sub_index,
-                        FT_Int       *p_index,
-                        FT_UInt      *p_flags,
-                        FT_Int       *p_arg1,
-                        FT_Int       *p_arg2,
-                        FT_Matrix    *p_transform );
-
-

    -
    -

    Retrieve a description of a given subglyph. Only use it if ‘glyph->format’ is FT_GLYPH_FORMAT_COMPOSITE; an error is returned otherwise.

    -

    -
    input
    -

    - - - -
    glyph -

    The source glyph slot.

    -
    sub_index -

    The index of the subglyph. Must be less than ‘glyph->num_subglyphs’.

    -
    -
    -
    output
    -

    - - - - - - -
    p_index -

    The glyph index of the subglyph.

    -
    p_flags -

    The subglyph flags, see FT_SUBGLYPH_FLAG_XXX.

    -
    p_arg1 -

    The subglyph's first argument (if any).

    -
    p_arg2 -

    The subglyph's second argument (if any).

    -
    p_transform -

    The subglyph transformation (if any).

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    The values of ‘*p_arg1’, ‘*p_arg2’, and ‘*p_transform’ must be interpreted depending on the flags returned in ‘*p_flags’. See the TrueType specification for details.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_FSTYPE_XXX

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-#define FT_FSTYPE_INSTALLABLE_EMBEDDING         0x0000
-#define FT_FSTYPE_RESTRICTED_LICENSE_EMBEDDING  0x0002
-#define FT_FSTYPE_PREVIEW_AND_PRINT_EMBEDDING   0x0004
-#define FT_FSTYPE_EDITABLE_EMBEDDING            0x0008
-#define FT_FSTYPE_NO_SUBSETTING                 0x0100
-#define FT_FSTYPE_BITMAP_EMBEDDING_ONLY         0x0200
-
-

    -
    -

    A list of bit flags used in the ‘fsType’ field of the OS/2 table in a TrueType or OpenType font and the ‘FSType’ entry in a PostScript font. These bit flags are returned by FT_Get_FSType_Flags; they inform client applications of embedding and subsetting restrictions associated with a font.

    -

    See http://www.adobe.com/devnet/acrobat/pdfs/FontPolicies.pdf for more details.

    -

    -
    values
    -

    - - - - - - - - - - - - - -
    FT_FSTYPE_INSTALLABLE_EMBEDDING
    -

    Fonts with no fsType bit set may be embedded and permanently installed on the remote system by an application.

    -
    FT_FSTYPE_RESTRICTED_LICENSE_EMBEDDING
    -

    Fonts that have only this bit set must not be modified, embedded or exchanged in any manner without first obtaining permission of the font software copyright owner.

    -
    FT_FSTYPE_PREVIEW_AND_PRINT_EMBEDDING
    -

    If this bit is set, the font may be embedded and temporarily loaded on the remote system. Documents containing Preview & Print fonts must be opened ‘read-only’; no edits can be applied to the document.

    -
    FT_FSTYPE_EDITABLE_EMBEDDING
    -

    If this bit is set, the font may be embedded but must only be installed temporarily on other systems. In contrast to Preview & Print fonts, documents containing editable fonts may be opened for reading, editing is permitted, and changes may be saved.

    -
    FT_FSTYPE_NO_SUBSETTING
    -

    If this bit is set, the font may not be subsetted prior to embedding.

    -
    FT_FSTYPE_BITMAP_EMBEDDING_ONLY
    -

    If this bit is set, only bitmaps contained in the font may be embedded; no outline data may be embedded. If there are no bitmaps available in the font, then the font is unembeddable.

    -
    -
    -
    note
    -

    While the fsType flags can indicate that a font may be embedded, a license with the font vendor may be separately required to use the font in this way.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Get_FSType_Flags

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  FT_EXPORT( FT_UShort )
-  FT_Get_FSType_Flags( FT_Face  face );
-
-

    -
    -

    Return the fsType flags for a font.

    -

    -
    input
    -

    - - -
    face -

    A handle to the source face object.

    -
    -
    -
    return
    -

    The fsType flags, FT_FSTYPE_XXX.

    -
    -
    note
    -

    Use this function rather than directly reading the ‘fs_type’ field in the PS_FontInfoRec structure which is only guaranteed to return the correct results for Type 1 fonts.

    -
    -
    since
    -

    2.3.8

    -
    -
    -
    - - -
    [Index][TOC]
    - - - diff --git a/docs/reference/ft2-basic_types.html b/docs/reference/ft2-basic_types.html deleted file mode 100644 index 510d04b..0000000 --- a/docs/reference/ft2-basic_types.html +++ /dev/null @@ -1,1173 +0,0 @@ - - - - -FreeType-2.4.9 API Reference - - - - - - -
    [Index][TOC]
    -

    FreeType-2.4.9 API Reference

    - -

    -Basic Data Types -

    -

    Synopsis

    - - - - - - - - - - - - - - - -
    FT_ByteFT_OffsetFT_UnitVector
    FT_BytesFT_PtrDistFT_F26Dot6
    FT_CharFT_StringFT_Pixel_Mode
    FT_IntFT_Tagft_pixel_mode_xxx
    FT_UIntFT_ErrorFT_Palette_Mode
    FT_Int16FT_FixedFT_Bitmap
    FT_UInt16FT_PointerFT_IMAGE_TAG
    FT_Int32FT_PosFT_Glyph_Format
    FT_UInt32FT_Vectorft_glyph_format_xxx
    FT_ShortFT_BBoxFT_Data
    FT_UShortFT_MatrixFT_Generic_Finalizer
    FT_LongFT_FWordFT_Generic
    FT_ULongFT_UFWordFT_MAKE_TAG
    FT_BoolFT_F2Dot14


    - -
    -

    This section contains the basic data types defined by FreeType 2, ranging from simple scalar types to bitmap descriptors. More font-specific structures are defined in a different section.

    -

    -
    -

    FT_Byte

    -
    -Defined in FT_TYPES_H (freetype/fttypes.h). -

    -
    -
-  typedef unsigned char  FT_Byte;
-
-

    -
    -

    A simple typedef for the unsigned char type.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Bytes

    -
    -Defined in FT_TYPES_H (freetype/fttypes.h). -

    -
    -
-  typedef const FT_Byte*  FT_Bytes;
-
-

    -
    -

    A typedef for constant memory areas.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Char

    -
    -Defined in FT_TYPES_H (freetype/fttypes.h). -

    -
    -
-  typedef signed char  FT_Char;
-
-

    -
    -

    A simple typedef for the signed char type.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Int

    -
    -Defined in FT_TYPES_H (freetype/fttypes.h). -

    -
    -
-  typedef signed int  FT_Int;
-
-

    -
    -

    A typedef for the int type.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_UInt

    -
    -Defined in FT_TYPES_H (freetype/fttypes.h). -

    -
    -
-  typedef unsigned int  FT_UInt;
-
-

    -
    -

    A typedef for the unsigned int type.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Int16

    -
    -Defined in FT_CONFIG_CONFIG_H (freetype/config/ftconfig.h). -

    -
    -
-  typedef signed short  FT_Int16;
-
-

    -
    -

    A typedef for a 16bit signed integer type.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_UInt16

    -
    -Defined in FT_CONFIG_CONFIG_H (freetype/config/ftconfig.h). -

    -
    -
-  typedef unsigned short  FT_UInt16;
-
-

    -
    -

    A typedef for a 16bit unsigned integer type.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Int32

    -
    -Defined in FT_CONFIG_CONFIG_H (freetype/config/ftconfig.h). -

    -
    -
-  typedef signed XXX  FT_Int32;
-
-

    -
    -

    A typedef for a 32bit signed integer type. The size depends on the configuration.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_UInt32

    -
    -Defined in FT_CONFIG_CONFIG_H (freetype/config/ftconfig.h). -

    -
    -
-  typedef unsigned XXX  FT_UInt32;
-
-

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Short

    -
    -Defined in FT_TYPES_H (freetype/fttypes.h). -

    -
    -
-  typedef signed short  FT_Short;
-
-

    -
    -

    A typedef for signed short.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_UShort

    -
    -Defined in FT_TYPES_H (freetype/fttypes.h). -

    -
    -
-  typedef unsigned short  FT_UShort;
-
-

    -
    -

    A typedef for unsigned short.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Long

    -
    -Defined in FT_TYPES_H (freetype/fttypes.h). -

    -
    -
-  typedef signed long  FT_Long;
-
-

    -
    -

    A typedef for signed long.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_ULong

    -
    -Defined in FT_TYPES_H (freetype/fttypes.h). -

    -
    -
-  typedef unsigned long  FT_ULong;
-
-

    -
    -

    A typedef for unsigned long.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Bool

    -
    -Defined in FT_TYPES_H (freetype/fttypes.h). -

    -
    -
-  typedef unsigned char  FT_Bool;
-
-

    -
    -

    A typedef of unsigned char, used for simple booleans. As usual, values 1 and 0 represent true and false, respectively.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Offset

    -
    -Defined in FT_TYPES_H (freetype/fttypes.h). -

    -
    -
-  typedef size_t  FT_Offset;
-
-

    -
    -

    This is equivalent to the ANSI C ‘size_t’ type, i.e., the largest unsigned integer type used to express a file size or position, or a memory block size.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_PtrDist

    -
    -Defined in FT_TYPES_H (freetype/fttypes.h). -

    -
    -
-  typedef ft_ptrdiff_t  FT_PtrDist;
-
-

    -
    -

    This is equivalent to the ANSI C ‘ptrdiff_t’ type, i.e., the largest signed integer type used to express the distance between two pointers.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_String

    -
    -Defined in FT_TYPES_H (freetype/fttypes.h). -

    -
    -
-  typedef char  FT_String;
-
-

    -
    -

    A simple typedef for the char type, usually used for strings.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Tag

    -
    -Defined in FT_TYPES_H (freetype/fttypes.h). -

    -
    -
-  typedef FT_UInt32  FT_Tag;
-
-

    -
    -

    A typedef for 32-bit tags (as used in the SFNT format).

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Error

    -
    -Defined in FT_TYPES_H (freetype/fttypes.h). -

    -
    -
-  typedef int  FT_Error;
-
-

    -
    -

    The FreeType error code type. A value of 0 is always interpreted as a successful operation.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Fixed

    -
    -Defined in FT_TYPES_H (freetype/fttypes.h). -

    -
    -
-  typedef signed long  FT_Fixed;
-
-

    -
    -

    This type is used to store 16.16 fixed float values, like scaling values or matrix coefficients.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Pointer

    -
    -Defined in FT_TYPES_H (freetype/fttypes.h). -

    -
    -
-  typedef void*  FT_Pointer;
-
-

    -
    -

    A simple typedef for a typeless pointer.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Pos

    -
    -Defined in FT_IMAGE_H (freetype/ftimage.h). -

    -
    -
-  typedef signed long  FT_Pos;
-
-

    -
    -

    The type FT_Pos is used to store vectorial coordinates. Depending on the context, these can represent distances in integer font units, or 16.16, or 26.6 fixed float pixel coordinates.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Vector

    -
    -Defined in FT_IMAGE_H (freetype/ftimage.h). -

    -
    -
-  typedef struct  FT_Vector_
-  {
-    FT_Pos  x;
-    FT_Pos  y;
-
-  } FT_Vector;
-
-

    -
    -

    A simple structure used to store a 2D vector; coordinates are of the FT_Pos type.

    -

    -
    fields
    -

    - - - -
    x -

    The horizontal coordinate.

    -
    y -

    The vertical coordinate.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_BBox

    -
    -Defined in FT_IMAGE_H (freetype/ftimage.h). -

    -
    -
-  typedef struct  FT_BBox_
-  {
-    FT_Pos  xMin, yMin;
-    FT_Pos  xMax, yMax;
-
-  } FT_BBox;
-
-

    -
    -

    A structure used to hold an outline's bounding box, i.e., the coordinates of its extrema in the horizontal and vertical directions.

    -

    -
    fields
    -

    - - - - - -
    xMin -

    The horizontal minimum (left-most).

    -
    yMin -

    The vertical minimum (bottom-most).

    -
    xMax -

    The horizontal maximum (right-most).

    -
    yMax -

    The vertical maximum (top-most).

    -
    -
    -
    note
    -

    The bounding box is specified with the coordinates of the lower left and the upper right corner. In PostScript, those values are often called (llx,lly) and (urx,ury), respectively.

    -

    If ‘yMin’ is negative, this value gives the glyph's descender. Otherwise, the glyph doesn't descend below the baseline. Similarly, if ‘ymax’ is positive, this value gives the glyph's ascender.

    -

    ‘xMin’ gives the horizontal distance from the glyph's origin to the left edge of the glyph's bounding box. If ‘xMin’ is negative, the glyph extends to the left of the origin.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Matrix

    -
    -Defined in FT_TYPES_H (freetype/fttypes.h). -

    -
    -
-  typedef struct  FT_Matrix_
-  {
-    FT_Fixed  xx, xy;
-    FT_Fixed  yx, yy;
-
-  } FT_Matrix;
-
-

    -
    -

    A simple structure used to store a 2x2 matrix. Coefficients are in 16.16 fixed float format. The computation performed is:

    -
    -   x' = x*xx + y*xy                                             
-   y' = x*yx + y*yy                                             
-
    -

    -
    fields
    -

    - - - - - -
    xx -

    Matrix coefficient.

    -
    xy -

    Matrix coefficient.

    -
    yx -

    Matrix coefficient.

    -
    yy -

    Matrix coefficient.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_FWord

    -
    -Defined in FT_TYPES_H (freetype/fttypes.h). -

    -
    -
-  typedef signed short  FT_FWord;   /* distance in FUnits */
-
-

    -
    -

    A signed 16-bit integer used to store a distance in original font units.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_UFWord

    -
    -Defined in FT_TYPES_H (freetype/fttypes.h). -

    -
    -
-  typedef unsigned short  FT_UFWord;  /* unsigned distance */
-
-

    -
    -

    An unsigned 16-bit integer used to store a distance in original font units.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_F2Dot14

    -
    -Defined in FT_TYPES_H (freetype/fttypes.h). -

    -
    -
-  typedef signed short  FT_F2Dot14;
-
-

    -
    -

    A signed 2.14 fixed float type used for unit vectors.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_UnitVector

    -
    -Defined in FT_TYPES_H (freetype/fttypes.h). -

    -
    -
-  typedef struct  FT_UnitVector_
-  {
-    FT_F2Dot14  x;
-    FT_F2Dot14  y;
-
-  } FT_UnitVector;
-
-

    -
    -

    A simple structure used to store a 2D vector unit vector. Uses FT_F2Dot14 types.

    -

    -
    fields
    -

    - - - -
    x -

    Horizontal coordinate.

    -
    y -

    Vertical coordinate.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_F26Dot6

    -
    -Defined in FT_TYPES_H (freetype/fttypes.h). -

    -
    -
-  typedef signed long  FT_F26Dot6;
-
-

    -
    -

    A signed 26.6 fixed float type used for vectorial pixel coordinates.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Pixel_Mode

    -
    -Defined in FT_IMAGE_H (freetype/ftimage.h). -

    -
    -
-  typedef enum  FT_Pixel_Mode_
-  {
-    FT_PIXEL_MODE_NONE = 0,
-    FT_PIXEL_MODE_MONO,
-    FT_PIXEL_MODE_GRAY,
-    FT_PIXEL_MODE_GRAY2,
-    FT_PIXEL_MODE_GRAY4,
-    FT_PIXEL_MODE_LCD,
-    FT_PIXEL_MODE_LCD_V,
-
-    FT_PIXEL_MODE_MAX      /* do not remove */
-
-  } FT_Pixel_Mode;
-
-

    -
    -

    An enumeration type used to describe the format of pixels in a given bitmap. Note that additional formats may be added in the future.

    -

    -
    values
    -

    - - - - - - - - -
    FT_PIXEL_MODE_NONE -

    Value 0 is reserved.

    -
    FT_PIXEL_MODE_MONO -

    A monochrome bitmap, using 1 bit per pixel. Note that pixels are stored in most-significant order (MSB), which means that the left-most pixel in a byte has value 128.

    -
    FT_PIXEL_MODE_GRAY -

    An 8-bit bitmap, generally used to represent anti-aliased glyph images. Each pixel is stored in one byte. Note that the number of ‘gray’ levels is stored in the ‘num_grays’ field of the FT_Bitmap structure (it generally is 256).

    -
    FT_PIXEL_MODE_GRAY2 -

    A 2-bit per pixel bitmap, used to represent embedded anti-aliased bitmaps in font files according to the OpenType specification. We haven't found a single font using this format, however.

    -
    FT_PIXEL_MODE_GRAY4 -

    A 4-bit per pixel bitmap, representing embedded anti-aliased bitmaps in font files according to the OpenType specification. We haven't found a single font using this format, however.

    -
    FT_PIXEL_MODE_LCD -

    An 8-bit bitmap, representing RGB or BGR decimated glyph images used for display on LCD displays; the bitmap is three times wider than the original glyph image. See also FT_RENDER_MODE_LCD.

    -
    FT_PIXEL_MODE_LCD_V -

    An 8-bit bitmap, representing RGB or BGR decimated glyph images used for display on rotated LCD displays; the bitmap is three times taller than the original glyph image. See also FT_RENDER_MODE_LCD_V.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    ft_pixel_mode_xxx

    -
    -Defined in FT_IMAGE_H (freetype/ftimage.h). -

    -
    -
-#define ft_pixel_mode_none   FT_PIXEL_MODE_NONE
-#define ft_pixel_mode_mono   FT_PIXEL_MODE_MONO
-#define ft_pixel_mode_grays  FT_PIXEL_MODE_GRAY
-#define ft_pixel_mode_pal2   FT_PIXEL_MODE_GRAY2
-#define ft_pixel_mode_pal4   FT_PIXEL_MODE_GRAY4
-
-

    -
    -

    A list of deprecated constants. Use the corresponding FT_Pixel_Mode values instead.

    -

    -
    values
    -

    - - - - - - -
    ft_pixel_mode_none -

    See FT_PIXEL_MODE_NONE.

    -
    ft_pixel_mode_mono -

    See FT_PIXEL_MODE_MONO.

    -
    ft_pixel_mode_grays -

    See FT_PIXEL_MODE_GRAY.

    -
    ft_pixel_mode_pal2 -

    See FT_PIXEL_MODE_GRAY2.

    -
    ft_pixel_mode_pal4 -

    See FT_PIXEL_MODE_GRAY4.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Palette_Mode

    -
    -Defined in FT_IMAGE_H (freetype/ftimage.h). -

    -
    -
-  typedef enum  FT_Palette_Mode_
-  {
-    ft_palette_mode_rgb = 0,
-    ft_palette_mode_rgba,
-
-    ft_palette_mode_max   /* do not remove */
-
-  } FT_Palette_Mode;
-
-

    -
    -

    THIS TYPE IS DEPRECATED. DO NOT USE IT!

    -

    An enumeration type to describe the format of a bitmap palette, used with ft_pixel_mode_pal4 and ft_pixel_mode_pal8.

    -

    -
    values
    -

    - - - -
    ft_palette_mode_rgb -

    The palette is an array of 3-byte RGB records.

    -
    ft_palette_mode_rgba -

    The palette is an array of 4-byte RGBA records.

    -
    -
    -
    note
    -

    As ft_pixel_mode_pal2, pal4 and pal8 are currently unused by FreeType, these types are not handled by the library itself.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Bitmap

    -
    -Defined in FT_IMAGE_H (freetype/ftimage.h). -

    -
    -
-  typedef struct  FT_Bitmap_
-  {
-    int             rows;
-    int             width;
-    int             pitch;
-    unsigned char*  buffer;
-    short           num_grays;
-    char            pixel_mode;
-    char            palette_mode;
-    void*           palette;
-
-  } FT_Bitmap;
-
-

    -
    -

    A structure used to describe a bitmap or pixmap to the raster. Note that we now manage pixmaps of various depths through the ‘pixel_mode’ field.

    -

    -
    fields
    -

    - - - - - - - - - -
    rows -

    The number of bitmap rows.

    -
    width -

    The number of pixels in bitmap row.

    -
    pitch -

    The pitch's absolute value is the number of bytes taken by one bitmap row, including padding. However, the pitch is positive when the bitmap has a ‘down’ flow, and negative when it has an ‘up’ flow. In all cases, the pitch is an offset to add to a bitmap pointer in order to go down one row.

    -

    Note that ‘padding’ means the alignment of a bitmap to a byte border, and FreeType functions normally align to the smallest possible integer value.

    -

    For the B/W rasterizer, ‘pitch’ is always an even number.

    -

    To change the pitch of a bitmap (say, to make it a multiple of 4), use FT_Bitmap_Convert. Alternatively, you might use callback functions to directly render to the application's surface; see the file ‘example2.cpp’ in the tutorial for a demonstration.

    -
    buffer -

    A typeless pointer to the bitmap buffer. This value should be aligned on 32-bit boundaries in most cases.

    -
    num_grays -

    This field is only used with FT_PIXEL_MODE_GRAY; it gives the number of gray levels used in the bitmap.

    -
    pixel_mode -

    The pixel mode, i.e., how pixel bits are stored. See FT_Pixel_Mode for possible values.

    -
    palette_mode -

    This field is intended for paletted pixel modes; it indicates how the palette is stored. Not used currently.

    -
    palette -

    A typeless pointer to the bitmap palette; this field is intended for paletted pixel modes. Not used currently.

    -
    -
    -
    note
    -

    For now, the only pixel modes supported by FreeType are mono and grays. However, drivers might be added in the future to support more ‘colorful’ options.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_IMAGE_TAG

    -
    -Defined in FT_IMAGE_H (freetype/ftimage.h). -

    -
    -
-#ifndef FT_IMAGE_TAG
-#define FT_IMAGE_TAG( value, _x1, _x2, _x3, _x4 )  \
-          value = ( ( (unsigned long)_x1 << 24 ) | \
-                    ( (unsigned long)_x2 << 16 ) | \
-                    ( (unsigned long)_x3 << 8  ) | \
-                      (unsigned long)_x4         )
-#endif /* FT_IMAGE_TAG */
-
-

    -
    -

    This macro converts four-letter tags to an unsigned long type.

    -

    -
    note
    -

    Since many 16-bit compilers don't like 32-bit enumerations, you should redefine this macro in case of problems to something like this:

    -
    -  #define FT_IMAGE_TAG( value, _x1, _x2, _x3, _x4 )  value         
-
    -

    to get a simple enumeration without assigning special numbers.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Glyph_Format

    -
    -Defined in FT_IMAGE_H (freetype/ftimage.h). -

    -
    -
-  typedef enum  FT_Glyph_Format_
-  {
-    FT_IMAGE_TAG( FT_GLYPH_FORMAT_NONE, 0, 0, 0, 0 ),
-
-    FT_IMAGE_TAG( FT_GLYPH_FORMAT_COMPOSITE, 'c', 'o', 'm', 'p' ),
-    FT_IMAGE_TAG( FT_GLYPH_FORMAT_BITMAP,    'b', 'i', 't', 's' ),
-    FT_IMAGE_TAG( FT_GLYPH_FORMAT_OUTLINE,   'o', 'u', 't', 'l' ),
-    FT_IMAGE_TAG( FT_GLYPH_FORMAT_PLOTTER,   'p', 'l', 'o', 't' )
-
-  } FT_Glyph_Format;
-
-

    -
    -

    An enumeration type used to describe the format of a given glyph image. Note that this version of FreeType only supports two image formats, even though future font drivers will be able to register their own format.

    -

    -
    values
    -

    - - - - - - - - - -
    FT_GLYPH_FORMAT_NONE -

    The value 0 is reserved.

    -
    FT_GLYPH_FORMAT_COMPOSITE
    -

    The glyph image is a composite of several other images. This format is only used with FT_LOAD_NO_RECURSE, and is used to report compound glyphs (like accented characters).

    -
    FT_GLYPH_FORMAT_BITMAP -

    The glyph image is a bitmap, and can be described as an FT_Bitmap. You generally need to access the ‘bitmap’ field of the FT_GlyphSlotRec structure to read it.

    -
    FT_GLYPH_FORMAT_OUTLINE
    -

    The glyph image is a vectorial outline made of line segments and Bézier arcs; it can be described as an FT_Outline; you generally want to access the ‘outline’ field of the FT_GlyphSlotRec structure to read it.

    -
    FT_GLYPH_FORMAT_PLOTTER
    -

    The glyph image is a vectorial path with no inside and outside contours. Some Type 1 fonts, like those in the Hershey family, contain glyphs in this format. These are described as FT_Outline, but FreeType isn't currently capable of rendering them correctly.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    ft_glyph_format_xxx

    -
    -Defined in FT_IMAGE_H (freetype/ftimage.h). -

    -
    -
-#define ft_glyph_format_none       FT_GLYPH_FORMAT_NONE
-#define ft_glyph_format_composite  FT_GLYPH_FORMAT_COMPOSITE
-#define ft_glyph_format_bitmap     FT_GLYPH_FORMAT_BITMAP
-#define ft_glyph_format_outline    FT_GLYPH_FORMAT_OUTLINE
-#define ft_glyph_format_plotter    FT_GLYPH_FORMAT_PLOTTER
-
-

    -
    -

    A list of deprecated constants. Use the corresponding FT_Glyph_Format values instead.

    -

    -
    values
    -

    - - - - - - - - - -
    ft_glyph_format_none -

    See FT_GLYPH_FORMAT_NONE.

    -
    ft_glyph_format_composite
    -

    See FT_GLYPH_FORMAT_COMPOSITE.

    -
    ft_glyph_format_bitmap -

    See FT_GLYPH_FORMAT_BITMAP.

    -
    ft_glyph_format_outline
    -

    See FT_GLYPH_FORMAT_OUTLINE.

    -
    ft_glyph_format_plotter
    -

    See FT_GLYPH_FORMAT_PLOTTER.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Data

    -
    -Defined in FT_TYPES_H (freetype/fttypes.h). -

    -
    -
-  typedef struct  FT_Data_
-  {
-    const FT_Byte*  pointer;
-    FT_Int          length;
-
-  } FT_Data;
-
-

    -
    -

    Read-only binary data represented as a pointer and a length.

    -

    -
    fields
    -

    - - - -
    pointer -

    The data.

    -
    length -

    The length of the data in bytes.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Generic_Finalizer

    -
    -Defined in FT_TYPES_H (freetype/fttypes.h). -

    -
    -
-  typedef void  (*FT_Generic_Finalizer)(void*  object);
-
-

    -
    -

    Describe a function used to destroy the ‘client’ data of any FreeType object. See the description of the FT_Generic type for details of usage.

    -

    -
    input
    -

    The address of the FreeType object which is under finalization. Its client data is accessed through its ‘generic’ field.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Generic

    -
    -Defined in FT_TYPES_H (freetype/fttypes.h). -

    -
    -
-  typedef struct  FT_Generic_
-  {
-    void*                 data;
-    FT_Generic_Finalizer  finalizer;
-
-  } FT_Generic;
-
-

    -
    -

    Client applications often need to associate their own data to a variety of FreeType core objects. For example, a text layout API might want to associate a glyph cache to a given size object.

    -

    Some FreeType object contains a ‘generic’ field, of type FT_Generic, which usage is left to client applications and font servers.

    -

    It can be used to store a pointer to client-specific data, as well as the address of a ‘finalizer’ function, which will be called by FreeType when the object is destroyed (for example, the previous client example would put the address of the glyph cache destructor in the ‘finalizer’ field).

    -

    -
    fields
    -

    - - - -
    data -

    A typeless pointer to any client-specified data. This field is completely ignored by the FreeType library.

    -
    finalizer -

    A pointer to a ‘generic finalizer’ function, which will be called when the object is destroyed. If this field is set to NULL, no code will be called.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_MAKE_TAG

    -
    -Defined in FT_TYPES_H (freetype/fttypes.h). -

    -
    -
-#define FT_MAKE_TAG( _x1, _x2, _x3, _x4 ) \
-          (FT_Tag)                        \
-          ( ( (FT_ULong)_x1 << 24 ) |     \
-            ( (FT_ULong)_x2 << 16 ) |     \
-            ( (FT_ULong)_x3 <<  8 ) |     \
-              (FT_ULong)_x4         )
-
-

    -
    -

    This macro converts four-letter tags which are used to label TrueType tables into an unsigned long to be used within FreeType.

    -

    -
    note
    -

    The produced values must be 32-bit integers. Don't redefine this macro.

    -
    -
    -
    - - -
    [Index][TOC]
    - - - diff --git a/docs/reference/ft2-bdf_fonts.html b/docs/reference/ft2-bdf_fonts.html deleted file mode 100644 index 0f41254..0000000 --- a/docs/reference/ft2-bdf_fonts.html +++ /dev/null @@ -1,260 +0,0 @@ - - - - -FreeType-2.4.9 API Reference - - - - - - -
    [Index][TOC]
    -

    FreeType-2.4.9 API Reference

    - -

    -BDF and PCF Files -

    -

    Synopsis

    - - - -
    FT_PropertyTypeBDF_PropertyRecFT_Get_BDF_Property
    BDF_PropertyFT_Get_BDF_Charset_ID


    - -
    -

    This section contains the declaration of functions specific to BDF and PCF fonts.

    -

    -
    -

    FT_PropertyType

    -
    -Defined in FT_BDF_H (freetype/ftbdf.h). -

    -
    -
-  typedef enum  BDF_PropertyType_
-  {
-    BDF_PROPERTY_TYPE_NONE     = 0,
-    BDF_PROPERTY_TYPE_ATOM     = 1,
-    BDF_PROPERTY_TYPE_INTEGER  = 2,
-    BDF_PROPERTY_TYPE_CARDINAL = 3
-
-  } BDF_PropertyType;
-
-

    -
    -

    A list of BDF property types.

    -

    -
    values
    -

    - - - - - - - -
    BDF_PROPERTY_TYPE_NONE -

    Value 0 is used to indicate a missing property.

    -
    BDF_PROPERTY_TYPE_ATOM -

    Property is a string atom.

    -
    BDF_PROPERTY_TYPE_INTEGER
    -

    Property is a 32-bit signed integer.

    -
    BDF_PROPERTY_TYPE_CARDINAL
    -

    Property is a 32-bit unsigned integer.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    BDF_Property

    -
    -Defined in FT_BDF_H (freetype/ftbdf.h). -

    -
    -
-  typedef struct BDF_PropertyRec_*  BDF_Property;
-
-

    -
    -

    A handle to a BDF_PropertyRec structure to model a given BDF/PCF property.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    BDF_PropertyRec

    -
    -Defined in FT_BDF_H (freetype/ftbdf.h). -

    -
    -
-  typedef struct  BDF_PropertyRec_
-  {
-    BDF_PropertyType  type;
-    union {
-      const char*     atom;
-      FT_Int32        integer;
-      FT_UInt32       cardinal;
-
-    } u;
-
-  } BDF_PropertyRec;
-
-

    -
    -

    This structure models a given BDF/PCF property.

    -

    -
    fields
    -

    - - - - - -
    type -

    The property type.

    -
    u.atom -

    The atom string, if type is BDF_PROPERTY_TYPE_ATOM.

    -
    u.integer -

    A signed integer, if type is BDF_PROPERTY_TYPE_INTEGER.

    -
    u.cardinal -

    An unsigned integer, if type is BDF_PROPERTY_TYPE_CARDINAL.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Get_BDF_Charset_ID

    -
    -Defined in FT_BDF_H (freetype/ftbdf.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Get_BDF_Charset_ID( FT_Face       face,
-                         const char*  *acharset_encoding,
-                         const char*  *acharset_registry );
-
-

    -
    -

    Retrieve a BDF font character set identity, according to the BDF specification.

    -

    -
    input
    -

    - - -
    face -

    A handle to the input face.

    -
    -
    -
    output
    -

    - - - -
    acharset_encoding -

    Charset encoding, as a C string, owned by the face.

    -
    acharset_registry -

    Charset registry, as a C string, owned by the face.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    This function only works with BDF faces, returning an error otherwise.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Get_BDF_Property

    -
    -Defined in FT_BDF_H (freetype/ftbdf.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Get_BDF_Property( FT_Face           face,
-                       const char*       prop_name,
-                       BDF_PropertyRec  *aproperty );
-
-

    -
    -

    Retrieve a BDF property from a BDF or PCF font file.

    -

    -
    input
    -

    - - - -
    face -

    A handle to the input face.

    -
    name -

    The property name.

    -
    -
    -
    output
    -

    - - -
    aproperty -

    The property.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    This function works with BDF and PCF fonts. It returns an error otherwise. It also returns an error if the property is not in the font.

    -

    A ‘property’ is a either key-value pair within the STARTPROPERTIES ... ENDPROPERTIES block of a BDF font or a key-value pair from the ‘info->props’ array within a ‘FontRec’ structure of a PCF font.

    -

    Integer properties are always stored as ‘signed’ within PCF fonts; consequently, BDF_PROPERTY_TYPE_CARDINAL is a possible return value for BDF fonts only.

    -

    In case of error, ‘aproperty->type’ is always set to BDF_PROPERTY_TYPE_NONE.

    -
    -
    -
    - - -
    [Index][TOC]
    - - - diff --git a/docs/reference/ft2-bitmap_handling.html b/docs/reference/ft2-bitmap_handling.html deleted file mode 100644 index db5c763..0000000 --- a/docs/reference/ft2-bitmap_handling.html +++ /dev/null @@ -1,302 +0,0 @@ - - - - -FreeType-2.4.9 API Reference - - - - - - -
    [Index][TOC]
    -

    FreeType-2.4.9 API Reference

    - -

    -Bitmap Handling -

    -

    Synopsis

    - - - -
    FT_Bitmap_NewFT_Bitmap_EmboldenFT_GlyphSlot_Own_Bitmap
    FT_Bitmap_CopyFT_Bitmap_ConvertFT_Bitmap_Done


    - -
    -

    This section contains functions for converting FT_Bitmap objects.

    -

    -
    -

    FT_Bitmap_New

    -
    -Defined in FT_BITMAP_H (freetype/ftbitmap.h). -

    -
    -
-  FT_EXPORT( void )
-  FT_Bitmap_New( FT_Bitmap  *abitmap );
-
-

    -
    -

    Initialize a pointer to an FT_Bitmap structure.

    -

    -
    inout
    -

    - - -
    abitmap -

    A pointer to the bitmap structure.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Bitmap_Copy

    -
    -Defined in FT_BITMAP_H (freetype/ftbitmap.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Bitmap_Copy( FT_Library        library,
-                  const FT_Bitmap  *source,
-                  FT_Bitmap        *target);
-
-

    -
    -

    Copy a bitmap into another one.

    -

    -
    input
    -

    - - - -
    library -

    A handle to a library object.

    -
    source -

    A handle to the source bitmap.

    -
    -
    -
    output
    -

    - - -
    target -

    A handle to the target bitmap.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Bitmap_Embolden

    -
    -Defined in FT_BITMAP_H (freetype/ftbitmap.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Bitmap_Embolden( FT_Library  library,
-                      FT_Bitmap*  bitmap,
-                      FT_Pos      xStrength,
-                      FT_Pos      yStrength );
-
-

    -
    -

    Embolden a bitmap. The new bitmap will be about ‘xStrength’ pixels wider and ‘yStrength’ pixels higher. The left and bottom borders are kept unchanged.

    -

    -
    input
    -

    - - - - -
    library -

    A handle to a library object.

    -
    xStrength -

    How strong the glyph is emboldened horizontally. Expressed in 26.6 pixel format.

    -
    yStrength -

    How strong the glyph is emboldened vertically. Expressed in 26.6 pixel format.

    -
    -
    -
    inout
    -

    - - -
    bitmap -

    A handle to the target bitmap.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    The current implementation restricts ‘xStrength’ to be less than or equal to 8 if bitmap is of pixel_mode FT_PIXEL_MODE_MONO.

    -

    If you want to embolden the bitmap owned by a FT_GlyphSlotRec, you should call FT_GlyphSlot_Own_Bitmap on the slot first.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Bitmap_Convert

    -
    -Defined in FT_BITMAP_H (freetype/ftbitmap.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Bitmap_Convert( FT_Library        library,
-                     const FT_Bitmap  *source,
-                     FT_Bitmap        *target,
-                     FT_Int            alignment );
-
-

    -
    -

    Convert a bitmap object with depth 1bpp, 2bpp, 4bpp, or 8bpp to a bitmap object with depth 8bpp, making the number of used bytes per line (a.k.a. the ‘pitch’) a multiple of ‘alignment’.

    -

    -
    input
    -

    - - - - -
    library -

    A handle to a library object.

    -
    source -

    The source bitmap.

    -
    alignment -

    The pitch of the bitmap is a multiple of this parameter. Common values are 1, 2, or 4.

    -
    -
    -
    output
    -

    - - -
    target -

    The target bitmap.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    It is possible to call FT_Bitmap_Convert multiple times without calling FT_Bitmap_Done (the memory is simply reallocated).

    -

    Use FT_Bitmap_Done to finally remove the bitmap object.

    -

    The ‘library’ argument is taken to have access to FreeType's memory handling functions.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_GlyphSlot_Own_Bitmap

    -
    -Defined in FT_BITMAP_H (freetype/ftbitmap.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_GlyphSlot_Own_Bitmap( FT_GlyphSlot  slot );
-
-

    -
    -

    Make sure that a glyph slot owns ‘slot->bitmap’.

    -

    -
    input
    -

    - - -
    slot -

    The glyph slot.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    This function is to be used in combination with FT_Bitmap_Embolden.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Bitmap_Done

    -
    -Defined in FT_BITMAP_H (freetype/ftbitmap.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Bitmap_Done( FT_Library  library,
-                  FT_Bitmap  *bitmap );
-
-

    -
    -

    Destroy a bitmap object created with FT_Bitmap_New.

    -

    -
    input
    -

    - - - -
    library -

    A handle to a library object.

    -
    bitmap -

    The bitmap object to be freed.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    The ‘library’ argument is taken to have access to FreeType's memory handling functions.

    -
    -
    -
    - - -
    [Index][TOC]
    - - - diff --git a/docs/reference/ft2-cache_subsystem.html b/docs/reference/ft2-cache_subsystem.html deleted file mode 100644 index cb7ad05..0000000 --- a/docs/reference/ft2-cache_subsystem.html +++ /dev/null @@ -1,1170 +0,0 @@ - - - - -FreeType-2.4.9 API Reference - - - - - - -
    [Index][TOC]
    -

    FreeType-2.4.9 API Reference

    - -

    -Cache Sub-System -

    -

    Synopsis

    - - - - - - - - - - - - - - - -
    FTC_ManagerFTC_CMapCache_New
    FTC_FaceIDFTC_CMapCache_Lookup
    FTC_Face_RequesterFTC_ImageTypeRec
    FTC_NodeFTC_ImageType
    FTC_Manager_NewFTC_ImageCache
    FTC_Manager_ResetFTC_ImageCache_New
    FTC_Manager_DoneFTC_ImageCache_Lookup
    FTC_Manager_LookupFaceFTC_ImageCache_LookupScaler
    FTC_ScalerRecFTC_SBit
    FTC_ScalerFTC_SBitRec
    FTC_Manager_LookupSizeFTC_SBitCache
    FTC_Node_UnrefFTC_SBitCache_New
    FTC_Manager_RemoveFaceIDFTC_SBitCache_Lookup
    FTC_CMapCacheFTC_SBitCache_LookupScaler


    - -
    -

    This section describes the FreeType 2 cache sub-system, which is used to limit the number of concurrently opened FT_Face and FT_Size objects, as well as caching information like character maps and glyph images while limiting their maximum memory usage.

    -

    Note that all types and functions begin with the ‘FTC_’ prefix.

    -

    The cache is highly portable and thus doesn't know anything about the fonts installed on your system, or how to access them. This implies the following scheme:

    -

    First, available or installed font faces are uniquely identified by FTC_FaceID values, provided to the cache by the client. Note that the cache only stores and compares these values, and doesn't try to interpret them in any way.

    -

    Second, the cache calls, only when needed, a client-provided function to convert an FTC_FaceID into a new FT_Face object. The latter is then completely managed by the cache, including its termination through FT_Done_Face. To monitor termination of face objects, the finalizer callback in the ‘generic’ field of the FT_Face object can be used, which might also be used to store the FTC_FaceID of the face.

    -

    Clients are free to map face IDs to anything else. The most simple usage is to associate them to a (pathname,face_index) pair that is used to call FT_New_Face. However, more complex schemes are also possible.

    -

    Note that for the cache to work correctly, the face ID values must be persistent, which means that the contents they point to should not change at runtime, or that their value should not become invalid.

    -

    If this is unavoidable (e.g., when a font is uninstalled at runtime), you should call FTC_Manager_RemoveFaceID as soon as possible, to let the cache get rid of any references to the old FTC_FaceID it may keep internally. Failure to do so will lead to incorrect behaviour or even crashes.

    -

    To use the cache, start with calling FTC_Manager_New to create a new FTC_Manager object, which models a single cache instance. You can then look up FT_Face and FT_Size objects with FTC_Manager_LookupFace and FTC_Manager_LookupSize, respectively.

    -

    If you want to use the charmap caching, call FTC_CMapCache_New, then later use FTC_CMapCache_Lookup to perform the equivalent of FT_Get_Char_Index, only much faster.

    -

    If you want to use the FT_Glyph caching, call FTC_ImageCache, then later use FTC_ImageCache_Lookup to retrieve the corresponding FT_Glyph objects from the cache.

    -

    If you need lots of small bitmaps, it is much more memory efficient to call FTC_SBitCache_New followed by FTC_SBitCache_Lookup. This returns FTC_SBitRec structures, which are used to store small bitmaps directly. (A small bitmap is one whose metrics and dimensions all fit into 8-bit integers).

    -

    We hope to also provide a kerning cache in the near future.

    -

    -
    -

    FTC_Manager

    -
    -Defined in FT_CACHE_H (freetype/ftcache.h). -

    -
    -
-  typedef struct FTC_ManagerRec_*  FTC_Manager;
-
-

    -
    -

    This object corresponds to one instance of the cache-subsystem. It is used to cache one or more FT_Face objects, along with corresponding FT_Size objects.

    -

    The manager intentionally limits the total number of opened FT_Face and FT_Size objects to control memory usage. See the ‘max_faces’ and ‘max_sizes’ parameters of FTC_Manager_New.

    -

    The manager is also used to cache ‘nodes’ of various types while limiting their total memory usage.

    -

    All limitations are enforced by keeping lists of managed objects in most-recently-used order, and flushing old nodes to make room for new ones.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FTC_FaceID

    -
    -Defined in FT_CACHE_H (freetype/ftcache.h). -

    -
    -
-  typedef FT_Pointer  FTC_FaceID;
-
-

    -
    -

    An opaque pointer type that is used to identity face objects. The contents of such objects is application-dependent.

    -

    These pointers are typically used to point to a user-defined structure containing a font file path, and face index.

    -

    -
    note
    -

    Never use NULL as a valid FTC_FaceID.

    -

    Face IDs are passed by the client to the cache manager, which calls, when needed, the FTC_Face_Requester to translate them into new FT_Face objects.

    -

    If the content of a given face ID changes at runtime, or if the value becomes invalid (e.g., when uninstalling a font), you should immediately call FTC_Manager_RemoveFaceID before any other cache function.

    -

    Failure to do so will result in incorrect behaviour or even memory leaks and crashes.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FTC_Face_Requester

    -
    -Defined in FT_CACHE_H (freetype/ftcache.h). -

    -
    -
-  typedef FT_Error
-  (*FTC_Face_Requester)( FTC_FaceID  face_id,
-                         FT_Library  library,
-                         FT_Pointer  request_data,
-                         FT_Face*    aface );
-
-

    -
    -

    A callback function provided by client applications. It is used by the cache manager to translate a given FTC_FaceID into a new valid FT_Face object, on demand.

    -

    -
    input
    -

    - - - - -
    face_id -

    The face ID to resolve.

    -
    library -

    A handle to a FreeType library object.

    -
    req_data -

    Application-provided request data (see note below).

    -
    -
    -
    output
    -

    - - -
    aface -

    A new FT_Face handle.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    The third parameter ‘req_data’ is the same as the one passed by the client when FTC_Manager_New is called.

    -

    The face requester should not perform funny things on the returned face object, like creating a new FT_Size for it, or setting a transformation through FT_Set_Transform!

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FTC_Node

    -
    -Defined in FT_CACHE_H (freetype/ftcache.h). -

    -
    -
-  typedef struct FTC_NodeRec_*  FTC_Node;
-
-

    -
    -

    An opaque handle to a cache node object. Each cache node is reference-counted. A node with a count of 0 might be flushed out of a full cache whenever a lookup request is performed.

    -

    If you look up nodes, you have the ability to ‘acquire’ them, i.e., to increment their reference count. This will prevent the node from being flushed out of the cache until you explicitly ‘release’ it (see FTC_Node_Unref).

    -

    See also FTC_SBitCache_Lookup and FTC_ImageCache_Lookup.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FTC_Manager_New

    -
    -Defined in FT_CACHE_H (freetype/ftcache.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FTC_Manager_New( FT_Library          library,
-                   FT_UInt             max_faces,
-                   FT_UInt             max_sizes,
-                   FT_ULong            max_bytes,
-                   FTC_Face_Requester  requester,
-                   FT_Pointer          req_data,
-                   FTC_Manager        *amanager );
-
-

    -
    -

    Create a new cache manager.

    -

    -
    input
    -

    - - - - - - - -
    library -

    The parent FreeType library handle to use.

    -
    max_faces -

    Maximum number of opened FT_Face objects managed by this cache instance. Use 0 for defaults.

    -
    max_sizes -

    Maximum number of opened FT_Size objects managed by this cache instance. Use 0 for defaults.

    -
    max_bytes -

    Maximum number of bytes to use for cached data nodes. Use 0 for defaults. Note that this value does not account for managed FT_Face and FT_Size objects.

    -
    requester -

    An application-provided callback used to translate face IDs into real FT_Face objects.

    -
    req_data -

    A generic pointer that is passed to the requester each time it is called (see FTC_Face_Requester).

    -
    -
    -
    output
    -

    - - -
    amanager -

    A handle to a new manager object. 0 in case of failure.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FTC_Manager_Reset

    -
    -Defined in FT_CACHE_H (freetype/ftcache.h). -

    -
    -
-  FT_EXPORT( void )
-  FTC_Manager_Reset( FTC_Manager  manager );
-
-

    -
    -

    Empty a given cache manager. This simply gets rid of all the currently cached FT_Face and FT_Size objects within the manager.

    -

    -
    inout
    -

    - - -
    manager -

    A handle to the manager.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FTC_Manager_Done

    -
    -Defined in FT_CACHE_H (freetype/ftcache.h). -

    -
    -
-  FT_EXPORT( void )
-  FTC_Manager_Done( FTC_Manager  manager );
-
-

    -
    -

    Destroy a given manager after emptying it.

    -

    -
    input
    -

    - - -
    manager -

    A handle to the target cache manager object.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FTC_Manager_LookupFace

    -
    -Defined in FT_CACHE_H (freetype/ftcache.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FTC_Manager_LookupFace( FTC_Manager  manager,
-                          FTC_FaceID   face_id,
-                          FT_Face     *aface );
-
-

    -
    -

    Retrieve the FT_Face object that corresponds to a given face ID through a cache manager.

    -

    -
    input
    -

    - - - -
    manager -

    A handle to the cache manager.

    -
    face_id -

    The ID of the face object.

    -
    -
    -
    output
    -

    - - -
    aface -

    A handle to the face object.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    The returned FT_Face object is always owned by the manager. You should never try to discard it yourself.

    -

    The FT_Face object doesn't necessarily have a current size object (i.e., face->size can be 0). If you need a specific ‘font size’, use FTC_Manager_LookupSize instead.

    -

    Never change the face's transformation matrix (i.e., never call the FT_Set_Transform function) on a returned face! If you need to transform glyphs, do it yourself after glyph loading.

    -

    When you perform a lookup, out-of-memory errors are detected within the lookup and force incremental flushes of the cache until enough memory is released for the lookup to succeed.

    -

    If a lookup fails with ‘FT_Err_Out_Of_Memory’ the cache has already been completely flushed, and still no memory was available for the operation.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FTC_ScalerRec

    -
    -Defined in FT_CACHE_H (freetype/ftcache.h). -

    -
    -
-  typedef struct  FTC_ScalerRec_
-  {
-    FTC_FaceID  face_id;
-    FT_UInt     width;
-    FT_UInt     height;
-    FT_Int      pixel;
-    FT_UInt     x_res;
-    FT_UInt     y_res;
-
-  } FTC_ScalerRec;
-
-

    -
    -

    A structure used to describe a given character size in either pixels or points to the cache manager. See FTC_Manager_LookupSize.

    -

    -
    fields
    -

    - - - - - - - -
    face_id -

    The source face ID.

    -
    width -

    The character width.

    -
    height -

    The character height.

    -
    pixel -

    A Boolean. If 1, the ‘width’ and ‘height’ fields are interpreted as integer pixel character sizes. Otherwise, they are expressed as 1/64th of points.

    -
    x_res -

    Only used when ‘pixel’ is value 0 to indicate the horizontal resolution in dpi.

    -
    y_res -

    Only used when ‘pixel’ is value 0 to indicate the vertical resolution in dpi.

    -
    -
    -
    note
    -

    This type is mainly used to retrieve FT_Size objects through the cache manager.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FTC_Scaler

    -
    -Defined in FT_CACHE_H (freetype/ftcache.h). -

    -
    -
-  typedef struct FTC_ScalerRec_*  FTC_Scaler;
-
-

    -
    -

    A handle to an FTC_ScalerRec structure.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FTC_Manager_LookupSize

    -
    -Defined in FT_CACHE_H (freetype/ftcache.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FTC_Manager_LookupSize( FTC_Manager  manager,
-                          FTC_Scaler   scaler,
-                          FT_Size     *asize );
-
-

    -
    -

    Retrieve the FT_Size object that corresponds to a given FTC_ScalerRec pointer through a cache manager.

    -

    -
    input
    -

    - - - -
    manager -

    A handle to the cache manager.

    -
    scaler -

    A scaler handle.

    -
    -
    -
    output
    -

    - - -
    asize -

    A handle to the size object.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    The returned FT_Size object is always owned by the manager. You should never try to discard it by yourself.

    -

    You can access the parent FT_Face object simply as ‘size->face’ if you need it. Note that this object is also owned by the manager.

    -
    -
    note
    -

    When you perform a lookup, out-of-memory errors are detected within the lookup and force incremental flushes of the cache until enough memory is released for the lookup to succeed.

    -

    If a lookup fails with ‘FT_Err_Out_Of_Memory’ the cache has already been completely flushed, and still no memory is available for the operation.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FTC_Node_Unref

    -
    -Defined in FT_CACHE_H (freetype/ftcache.h). -

    -
    -
-  FT_EXPORT( void )
-  FTC_Node_Unref( FTC_Node     node,
-                  FTC_Manager  manager );
-
-

    -
    -

    Decrement a cache node's internal reference count. When the count reaches 0, it is not destroyed but becomes eligible for subsequent cache flushes.

    -

    -
    input
    -

    - - - -
    node -

    The cache node handle.

    -
    manager -

    The cache manager handle.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FTC_Manager_RemoveFaceID

    -
    -Defined in FT_CACHE_H (freetype/ftcache.h). -

    -
    -
-  FT_EXPORT( void )
-  FTC_Manager_RemoveFaceID( FTC_Manager  manager,
-                            FTC_FaceID   face_id );
-
-

    -
    -

    A special function used to indicate to the cache manager that a given FTC_FaceID is no longer valid, either because its content changed, or because it was deallocated or uninstalled.

    -

    -
    input
    -

    - - - -
    manager -

    The cache manager handle.

    -
    face_id -

    The FTC_FaceID to be removed.

    -
    -
    -
    note
    -

    This function flushes all nodes from the cache corresponding to this ‘face_id’, with the exception of nodes with a non-null reference count.

    -

    Such nodes are however modified internally so as to never appear in later lookups with the same ‘face_id’ value, and to be immediately destroyed when released by all their users.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FTC_CMapCache

    -
    -Defined in FT_CACHE_H (freetype/ftcache.h). -

    -
    -
-  typedef struct FTC_CMapCacheRec_*  FTC_CMapCache;
-
-

    -
    -

    An opaque handle used to model a charmap cache. This cache is to hold character codes -> glyph indices mappings.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FTC_CMapCache_New

    -
    -Defined in FT_CACHE_H (freetype/ftcache.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FTC_CMapCache_New( FTC_Manager     manager,
-                     FTC_CMapCache  *acache );
-
-

    -
    -

    Create a new charmap cache.

    -

    -
    input
    -

    - - -
    manager -

    A handle to the cache manager.

    -
    -
    -
    output
    -

    - - -
    acache -

    A new cache handle. NULL in case of error.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    Like all other caches, this one will be destroyed with the cache manager.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FTC_CMapCache_Lookup

    -
    -Defined in FT_CACHE_H (freetype/ftcache.h). -

    -
    -
-  FT_EXPORT( FT_UInt )
-  FTC_CMapCache_Lookup( FTC_CMapCache  cache,
-                        FTC_FaceID     face_id,
-                        FT_Int         cmap_index,
-                        FT_UInt32      char_code );
-
-

    -
    -

    Translate a character code into a glyph index, using the charmap cache.

    -

    -
    input
    -

    - - - - - -
    cache -

    A charmap cache handle.

    -
    face_id -

    The source face ID.

    -
    cmap_index -

    The index of the charmap in the source face. Any negative value means to use the cache FT_Face's default charmap.

    -
    char_code -

    The character code (in the corresponding charmap).

    -
    -
    -
    return
    -

    Glyph index. 0 means ‘no glyph’.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FTC_ImageTypeRec

    -
    -Defined in FT_CACHE_H (freetype/ftcache.h). -

    -
    -
-  typedef struct  FTC_ImageTypeRec_
-  {
-    FTC_FaceID  face_id;
-    FT_Int      width;
-    FT_Int      height;
-    FT_Int32    flags;
-
-  } FTC_ImageTypeRec;
-
-

    -
    -

    A structure used to model the type of images in a glyph cache.

    -

    -
    fields
    -

    - - - - - -
    face_id -

    The face ID.

    -
    width -

    The width in pixels.

    -
    height -

    The height in pixels.

    -
    flags -

    The load flags, as in FT_Load_Glyph.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FTC_ImageType

    -
    -Defined in FT_CACHE_H (freetype/ftcache.h). -

    -
    -
-  typedef struct FTC_ImageTypeRec_*  FTC_ImageType;
-
-

    -
    -

    A handle to an FTC_ImageTypeRec structure.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FTC_ImageCache

    -
    -Defined in FT_CACHE_H (freetype/ftcache.h). -

    -
    -
-  typedef struct FTC_ImageCacheRec_*  FTC_ImageCache;
-
-

    -
    -

    A handle to an glyph image cache object. They are designed to hold many distinct glyph images while not exceeding a certain memory threshold.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FTC_ImageCache_New

    -
    -Defined in FT_CACHE_H (freetype/ftcache.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FTC_ImageCache_New( FTC_Manager      manager,
-                      FTC_ImageCache  *acache );
-
-

    -
    -

    Create a new glyph image cache.

    -

    -
    input
    -

    - - -
    manager -

    The parent manager for the image cache.

    -
    -
    -
    output
    -

    - - -
    acache -

    A handle to the new glyph image cache object.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FTC_ImageCache_Lookup

    -
    -Defined in FT_CACHE_H (freetype/ftcache.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FTC_ImageCache_Lookup( FTC_ImageCache  cache,
-                         FTC_ImageType   type,
-                         FT_UInt         gindex,
-                         FT_Glyph       *aglyph,
-                         FTC_Node       *anode );
-
-

    -
    -

    Retrieve a given glyph image from a glyph image cache.

    -

    -
    input
    -

    - - - - -
    cache -

    A handle to the source glyph image cache.

    -
    type -

    A pointer to a glyph image type descriptor.

    -
    gindex -

    The glyph index to retrieve.

    -
    -
    -
    output
    -

    - - - -
    aglyph -

    The corresponding FT_Glyph object. 0 in case of failure.

    -
    anode -

    Used to return the address of of the corresponding cache node after incrementing its reference count (see note below).

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    The returned glyph is owned and managed by the glyph image cache. Never try to transform or discard it manually! You can however create a copy with FT_Glyph_Copy and modify the new one.

    -

    If ‘anode’ is not NULL, it receives the address of the cache node containing the glyph image, after increasing its reference count. This ensures that the node (as well as the FT_Glyph) will always be kept in the cache until you call FTC_Node_Unref to ‘release’ it.

    -

    If ‘anode’ is NULL, the cache node is left unchanged, which means that the FT_Glyph could be flushed out of the cache on the next call to one of the caching sub-system APIs. Don't assume that it is persistent!

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FTC_ImageCache_LookupScaler

    -
    -Defined in FT_CACHE_H (freetype/ftcache.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FTC_ImageCache_LookupScaler( FTC_ImageCache  cache,
-                               FTC_Scaler      scaler,
-                               FT_ULong        load_flags,
-                               FT_UInt         gindex,
-                               FT_Glyph       *aglyph,
-                               FTC_Node       *anode );
-
-

    -
    -

    A variant of FTC_ImageCache_Lookup that uses an FTC_ScalerRec to specify the face ID and its size.

    -

    -
    input
    -

    - - - - - -
    cache -

    A handle to the source glyph image cache.

    -
    scaler -

    A pointer to a scaler descriptor.

    -
    load_flags -

    The corresponding load flags.

    -
    gindex -

    The glyph index to retrieve.

    -
    -
    -
    output
    -

    - - - -
    aglyph -

    The corresponding FT_Glyph object. 0 in case of failure.

    -
    anode -

    Used to return the address of of the corresponding cache node after incrementing its reference count (see note below).

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    The returned glyph is owned and managed by the glyph image cache. Never try to transform or discard it manually! You can however create a copy with FT_Glyph_Copy and modify the new one.

    -

    If ‘anode’ is not NULL, it receives the address of the cache node containing the glyph image, after increasing its reference count. This ensures that the node (as well as the FT_Glyph) will always be kept in the cache until you call FTC_Node_Unref to ‘release’ it.

    -

    If ‘anode’ is NULL, the cache node is left unchanged, which means that the FT_Glyph could be flushed out of the cache on the next call to one of the caching sub-system APIs. Don't assume that it is persistent!

    -

    Calls to FT_Set_Char_Size and friends have no effect on cached glyphs; you should always use the FreeType cache API instead.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FTC_SBit

    -
    -Defined in FT_CACHE_H (freetype/ftcache.h). -

    -
    -
-  typedef struct FTC_SBitRec_*  FTC_SBit;
-
-

    -
    -

    A handle to a small bitmap descriptor. See the FTC_SBitRec structure for details.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FTC_SBitRec

    -
    -Defined in FT_CACHE_H (freetype/ftcache.h). -

    -
    -
-  typedef struct  FTC_SBitRec_
-  {
-    FT_Byte   width;
-    FT_Byte   height;
-    FT_Char   left;
-    FT_Char   top;
-
-    FT_Byte   format;
-    FT_Byte   max_grays;
-    FT_Short  pitch;
-    FT_Char   xadvance;
-    FT_Char   yadvance;
-
-    FT_Byte*  buffer;
-
-  } FTC_SBitRec;
-
-

    -
    -

    A very compact structure used to describe a small glyph bitmap.

    -

    -
    fields
    -

    - - - - - - - - - - - -
    width -

    The bitmap width in pixels.

    -
    height -

    The bitmap height in pixels.

    -
    left -

    The horizontal distance from the pen position to the left bitmap border (a.k.a. ‘left side bearing’, or ‘lsb’).

    -
    top -

    The vertical distance from the pen position (on the baseline) to the upper bitmap border (a.k.a. ‘top side bearing’). The distance is positive for upwards y coordinates.

    -
    format -

    The format of the glyph bitmap (monochrome or gray).

    -
    max_grays -

    Maximum gray level value (in the range 1 to 255).

    -
    pitch -

    The number of bytes per bitmap line. May be positive or negative.

    -
    xadvance -

    The horizontal advance width in pixels.

    -
    yadvance -

    The vertical advance height in pixels.

    -
    buffer -

    A pointer to the bitmap pixels.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FTC_SBitCache

    -
    -Defined in FT_CACHE_H (freetype/ftcache.h). -

    -
    -
-  typedef struct FTC_SBitCacheRec_*  FTC_SBitCache;
-
-

    -
    -

    A handle to a small bitmap cache. These are special cache objects used to store small glyph bitmaps (and anti-aliased pixmaps) in a much more efficient way than the traditional glyph image cache implemented by FTC_ImageCache.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FTC_SBitCache_New

    -
    -Defined in FT_CACHE_H (freetype/ftcache.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FTC_SBitCache_New( FTC_Manager     manager,
-                     FTC_SBitCache  *acache );
-
-

    -
    -

    Create a new cache to store small glyph bitmaps.

    -

    -
    input
    -

    - - -
    manager -

    A handle to the source cache manager.

    -
    -
    -
    output
    -

    - - -
    acache -

    A handle to the new sbit cache. NULL in case of error.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FTC_SBitCache_Lookup

    -
    -Defined in FT_CACHE_H (freetype/ftcache.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FTC_SBitCache_Lookup( FTC_SBitCache    cache,
-                        FTC_ImageType    type,
-                        FT_UInt          gindex,
-                        FTC_SBit        *sbit,
-                        FTC_Node        *anode );
-
-

    -
    -

    Look up a given small glyph bitmap in a given sbit cache and ‘lock’ it to prevent its flushing from the cache until needed.

    -

    -
    input
    -

    - - - - -
    cache -

    A handle to the source sbit cache.

    -
    type -

    A pointer to the glyph image type descriptor.

    -
    gindex -

    The glyph index.

    -
    -
    -
    output
    -

    - - - -
    sbit -

    A handle to a small bitmap descriptor.

    -
    anode -

    Used to return the address of of the corresponding cache node after incrementing its reference count (see note below).

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    The small bitmap descriptor and its bit buffer are owned by the cache and should never be freed by the application. They might as well disappear from memory on the next cache lookup, so don't treat them as persistent data.

    -

    The descriptor's ‘buffer’ field is set to 0 to indicate a missing glyph bitmap.

    -

    If ‘anode’ is not NULL, it receives the address of the cache node containing the bitmap, after increasing its reference count. This ensures that the node (as well as the image) will always be kept in the cache until you call FTC_Node_Unref to ‘release’ it.

    -

    If ‘anode’ is NULL, the cache node is left unchanged, which means that the bitmap could be flushed out of the cache on the next call to one of the caching sub-system APIs. Don't assume that it is persistent!

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FTC_SBitCache_LookupScaler

    -
    -Defined in FT_CACHE_H (freetype/ftcache.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FTC_SBitCache_LookupScaler( FTC_SBitCache  cache,
-                              FTC_Scaler     scaler,
-                              FT_ULong       load_flags,
-                              FT_UInt        gindex,
-                              FTC_SBit      *sbit,
-                              FTC_Node      *anode );
-
-

    -
    -

    A variant of FTC_SBitCache_Lookup that uses an FTC_ScalerRec to specify the face ID and its size.

    -

    -
    input
    -

    - - - - - -
    cache -

    A handle to the source sbit cache.

    -
    scaler -

    A pointer to the scaler descriptor.

    -
    load_flags -

    The corresponding load flags.

    -
    gindex -

    The glyph index.

    -
    -
    -
    output
    -

    - - - -
    sbit -

    A handle to a small bitmap descriptor.

    -
    anode -

    Used to return the address of of the corresponding cache node after incrementing its reference count (see note below).

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    The small bitmap descriptor and its bit buffer are owned by the cache and should never be freed by the application. They might as well disappear from memory on the next cache lookup, so don't treat them as persistent data.

    -

    The descriptor's ‘buffer’ field is set to 0 to indicate a missing glyph bitmap.

    -

    If ‘anode’ is not NULL, it receives the address of the cache node containing the bitmap, after increasing its reference count. This ensures that the node (as well as the image) will always be kept in the cache until you call FTC_Node_Unref to ‘release’ it.

    -

    If ‘anode’ is NULL, the cache node is left unchanged, which means that the bitmap could be flushed out of the cache on the next call to one of the caching sub-system APIs. Don't assume that it is persistent!

    -
    -
    -
    - - -
    [Index][TOC]
    - - - diff --git a/docs/reference/ft2-cid_fonts.html b/docs/reference/ft2-cid_fonts.html deleted file mode 100644 index cc533b5..0000000 --- a/docs/reference/ft2-cid_fonts.html +++ /dev/null @@ -1,204 +0,0 @@ - - - - -FreeType-2.4.9 API Reference - - - - - - -
    [Index][TOC]
    -

    FreeType-2.4.9 API Reference

    - -

    -CID Fonts -

    -

    Synopsis

    - - - - -
    FT_Get_CID_Registry_Ordering_Supplement
    FT_Get_CID_Is_Internally_CID_Keyed
    FT_Get_CID_From_Glyph_Index


    - -
    -

    This section contains the declaration of CID-keyed font specific functions.

    -

    -
    -

    FT_Get_CID_Registry_Ordering_Supplement

    -
    -Defined in FT_CID_H (freetype/ftcid.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Get_CID_Registry_Ordering_Supplement( FT_Face       face,
-                                           const char*  *registry,
-                                           const char*  *ordering,
-                                           FT_Int       *supplement);
-
-

    -
    -

    Retrieve the Registry/Ordering/Supplement triple (also known as the "R/O/S") from a CID-keyed font.

    -

    -
    input
    -

    - - -
    face -

    A handle to the input face.

    -
    -
    -
    output
    -

    - - - - -
    registry -

    The registry, as a C string, owned by the face.

    -
    ordering -

    The ordering, as a C string, owned by the face.

    -
    supplement -

    The supplement.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    This function only works with CID faces, returning an error otherwise.

    -
    -
    since
    -

    2.3.6

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Get_CID_Is_Internally_CID_Keyed

    -
    -Defined in FT_CID_H (freetype/ftcid.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Get_CID_Is_Internally_CID_Keyed( FT_Face   face,
-                                      FT_Bool  *is_cid );
-
-

    -
    -

    Retrieve the type of the input face, CID keyed or not. In constrast to the FT_IS_CID_KEYED macro this function returns successfully also for CID-keyed fonts in an SNFT wrapper.

    -

    -
    input
    -

    - - -
    face -

    A handle to the input face.

    -
    -
    -
    output
    -

    - - -
    is_cid -

    The type of the face as an FT_Bool.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    This function only works with CID faces and OpenType fonts, returning an error otherwise.

    -
    -
    since
    -

    2.3.9

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Get_CID_From_Glyph_Index

    -
    -Defined in FT_CID_H (freetype/ftcid.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Get_CID_From_Glyph_Index( FT_Face   face,
-                               FT_UInt   glyph_index,
-                               FT_UInt  *cid );
-
-

    -
    -

    Retrieve the CID of the input glyph index.

    -

    -
    input
    -

    - - - -
    face -

    A handle to the input face.

    -
    glyph_index -

    The input glyph index.

    -
    -
    -
    output
    -

    - - -
    cid -

    The CID as an FT_UInt.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    This function only works with CID faces and OpenType fonts, returning an error otherwise.

    -
    -
    since
    -

    2.3.9

    -
    -
    -
    - - -
    [Index][TOC]
    - - - diff --git a/docs/reference/ft2-computations.html b/docs/reference/ft2-computations.html deleted file mode 100644 index 82a2a27..0000000 --- a/docs/reference/ft2-computations.html +++ /dev/null @@ -1,832 +0,0 @@ - - - - -FreeType-2.4.9 API Reference - - - - - - -
    [Index][TOC]
    -

    FreeType-2.4.9 API Reference

    - -

    -Computations -

    -

    Synopsis

    - - - - - - - - - -
    FT_MulDivFT_Matrix_InvertFT_Tan
    FT_MulFixFT_AngleFT_Atan2
    FT_DivFixFT_ANGLE_PIFT_Angle_Diff
    FT_RoundFixFT_ANGLE_2PIFT_Vector_Unit
    FT_CeilFixFT_ANGLE_PI2FT_Vector_Rotate
    FT_FloorFixFT_ANGLE_PI4FT_Vector_Length
    FT_Vector_TransformFT_SinFT_Vector_Polarize
    FT_Matrix_MultiplyFT_CosFT_Vector_From_Polar


    - -
    -

    This section contains various functions used to perform computations on 16.16 fixed-float numbers or 2d vectors.

    -

    -
    -

    FT_MulDiv

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  FT_EXPORT( FT_Long )
-  FT_MulDiv( FT_Long  a,
-             FT_Long  b,
-             FT_Long  c );
-
-

    -
    -

    A very simple function used to perform the computation ‘(a*b)/c’ with maximal accuracy (it uses a 64-bit intermediate integer whenever necessary).

    -

    This function isn't necessarily as fast as some processor specific operations, but is at least completely portable.

    -

    -
    input
    -

    - - - - -
    a -

    The first multiplier.

    -
    b -

    The second multiplier.

    -
    c -

    The divisor.

    -
    -
    -
    return
    -

    The result of ‘(a*b)/c’. This function never traps when trying to divide by zero; it simply returns ‘MaxInt’ or ‘MinInt’ depending on the signs of ‘a’ and ‘b’.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_MulFix

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  FT_EXPORT( FT_Long )
-  FT_MulFix( FT_Long  a,
-             FT_Long  b );
-
-

    -
    -

    A very simple function used to perform the computation ‘(a*b)/0x10000’ with maximal accuracy. Most of the time this is used to multiply a given value by a 16.16 fixed float factor.

    -

    -
    input
    -

    - - - -
    a -

    The first multiplier.

    -
    b -

    The second multiplier. Use a 16.16 factor here whenever possible (see note below).

    -
    -
    -
    return
    -

    The result of ‘(a*b)/0x10000’.

    -
    -
    note
    -

    This function has been optimized for the case where the absolute value of ‘a’ is less than 2048, and ‘b’ is a 16.16 scaling factor. As this happens mainly when scaling from notional units to fractional pixels in FreeType, it resulted in noticeable speed improvements between versions 2.x and 1.x.

    -

    As a conclusion, always try to place a 16.16 factor as the second argument of this function; this can make a great difference.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_DivFix

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  FT_EXPORT( FT_Long )
-  FT_DivFix( FT_Long  a,
-             FT_Long  b );
-
-

    -
    -

    A very simple function used to perform the computation ‘(a*0x10000)/b’ with maximal accuracy. Most of the time, this is used to divide a given value by a 16.16 fixed float factor.

    -

    -
    input
    -

    - - - -
    a -

    The first multiplier.

    -
    b -

    The second multiplier. Use a 16.16 factor here whenever possible (see note below).

    -
    -
    -
    return
    -

    The result of ‘(a*0x10000)/b’.

    -
    -
    note
    -

    The optimization for FT_DivFix() is simple: If (a << 16) fits in 32 bits, then the division is computed directly. Otherwise, we use a specialized version of FT_MulDiv.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_RoundFix

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  FT_EXPORT( FT_Fixed )
-  FT_RoundFix( FT_Fixed  a );
-
-

    -
    -

    A very simple function used to round a 16.16 fixed number.

    -

    -
    input
    -

    - - -
    a -

    The number to be rounded.

    -
    -
    -
    return
    -

    The result of ‘(a + 0x8000) & -0x10000’.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_CeilFix

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  FT_EXPORT( FT_Fixed )
-  FT_CeilFix( FT_Fixed  a );
-
-

    -
    -

    A very simple function used to compute the ceiling function of a 16.16 fixed number.

    -

    -
    input
    -

    - - -
    a -

    The number for which the ceiling function is to be computed.

    -
    -
    -
    return
    -

    The result of ‘(a + 0x10000 - 1) & -0x10000’.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_FloorFix

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  FT_EXPORT( FT_Fixed )
-  FT_FloorFix( FT_Fixed  a );
-
-

    -
    -

    A very simple function used to compute the floor function of a 16.16 fixed number.

    -

    -
    input
    -

    - - -
    a -

    The number for which the floor function is to be computed.

    -
    -
    -
    return
    -

    The result of ‘a & -0x10000’.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Vector_Transform

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  FT_EXPORT( void )
-  FT_Vector_Transform( FT_Vector*        vec,
-                       const FT_Matrix*  matrix );
-
-

    -
    -

    Transform a single vector through a 2x2 matrix.

    -

    -
    inout
    -

    - - -
    vector -

    The target vector to transform.

    -
    -
    -
    input
    -

    - - -
    matrix -

    A pointer to the source 2x2 matrix.

    -
    -
    -
    note
    -

    The result is undefined if either ‘vector’ or ‘matrix’ is invalid.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Matrix_Multiply

    -
    -Defined in FT_GLYPH_H (freetype/ftglyph.h). -

    -
    -
-  FT_EXPORT( void )
-  FT_Matrix_Multiply( const FT_Matrix*  a,
-                      FT_Matrix*        b );
-
-

    -
    -

    Perform the matrix operation ‘b = a*b’.

    -

    -
    input
    -

    - - -
    a -

    A pointer to matrix ‘a’.

    -
    -
    -
    inout
    -

    - - -
    b -

    A pointer to matrix ‘b’.

    -
    -
    -
    note
    -

    The result is undefined if either ‘a’ or ‘b’ is zero.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Matrix_Invert

    -
    -Defined in FT_GLYPH_H (freetype/ftglyph.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Matrix_Invert( FT_Matrix*  matrix );
-
-

    -
    -

    Invert a 2x2 matrix. Return an error if it can't be inverted.

    -

    -
    inout
    -

    - - -
    matrix -

    A pointer to the target matrix. Remains untouched in case of error.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Angle

    -
    -Defined in FT_TRIGONOMETRY_H (freetype/fttrigon.h). -

    -
    -
-  typedef FT_Fixed  FT_Angle;
-
-

    -
    -

    This type is used to model angle values in FreeType. Note that the angle is a 16.16 fixed float value expressed in degrees.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_ANGLE_PI

    -
    -Defined in FT_TRIGONOMETRY_H (freetype/fttrigon.h). -

    -
    -
-#define FT_ANGLE_PI  ( 180L << 16 )
-
-

    -
    -

    The angle pi expressed in FT_Angle units.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_ANGLE_2PI

    -
    -Defined in FT_TRIGONOMETRY_H (freetype/fttrigon.h). -

    -
    -
-#define FT_ANGLE_2PI  ( FT_ANGLE_PI * 2 )
-
-

    -
    -

    The angle 2*pi expressed in FT_Angle units.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_ANGLE_PI2

    -
    -Defined in FT_TRIGONOMETRY_H (freetype/fttrigon.h). -

    -
    -
-#define FT_ANGLE_PI2  ( FT_ANGLE_PI / 2 )
-
-

    -
    -

    The angle pi/2 expressed in FT_Angle units.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_ANGLE_PI4

    -
    -Defined in FT_TRIGONOMETRY_H (freetype/fttrigon.h). -

    -
    -
-#define FT_ANGLE_PI4  ( FT_ANGLE_PI / 4 )
-
-

    -
    -

    The angle pi/4 expressed in FT_Angle units.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Sin

    -
    -Defined in FT_TRIGONOMETRY_H (freetype/fttrigon.h). -

    -
    -
-  FT_EXPORT( FT_Fixed )
-  FT_Sin( FT_Angle  angle );
-
-

    -
    -

    Return the sinus of a given angle in fixed point format.

    -

    -
    input
    -

    - - -
    angle -

    The input angle.

    -
    -
    -
    return
    -

    The sinus value.

    -
    -
    note
    -

    If you need both the sinus and cosinus for a given angle, use the function FT_Vector_Unit.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Cos

    -
    -Defined in FT_TRIGONOMETRY_H (freetype/fttrigon.h). -

    -
    -
-  FT_EXPORT( FT_Fixed )
-  FT_Cos( FT_Angle  angle );
-
-

    -
    -

    Return the cosinus of a given angle in fixed point format.

    -

    -
    input
    -

    - - -
    angle -

    The input angle.

    -
    -
    -
    return
    -

    The cosinus value.

    -
    -
    note
    -

    If you need both the sinus and cosinus for a given angle, use the function FT_Vector_Unit.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Tan

    -
    -Defined in FT_TRIGONOMETRY_H (freetype/fttrigon.h). -

    -
    -
-  FT_EXPORT( FT_Fixed )
-  FT_Tan( FT_Angle  angle );
-
-

    -
    -

    Return the tangent of a given angle in fixed point format.

    -

    -
    input
    -

    - - -
    angle -

    The input angle.

    -
    -
    -
    return
    -

    The tangent value.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Atan2

    -
    -Defined in FT_TRIGONOMETRY_H (freetype/fttrigon.h). -

    -
    -
-  FT_EXPORT( FT_Angle )
-  FT_Atan2( FT_Fixed  x,
-            FT_Fixed  y );
-
-

    -
    -

    Return the arc-tangent corresponding to a given vector (x,y) in the 2d plane.

    -

    -
    input
    -

    - - - -
    x -

    The horizontal vector coordinate.

    -
    y -

    The vertical vector coordinate.

    -
    -
    -
    return
    -

    The arc-tangent value (i.e. angle).

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Angle_Diff

    -
    -Defined in FT_TRIGONOMETRY_H (freetype/fttrigon.h). -

    -
    -
-  FT_EXPORT( FT_Angle )
-  FT_Angle_Diff( FT_Angle  angle1,
-                 FT_Angle  angle2 );
-
-

    -
    -

    Return the difference between two angles. The result is always constrained to the ]-PI..PI] interval.

    -

    -
    input
    -

    - - - -
    angle1 -

    First angle.

    -
    angle2 -

    Second angle.

    -
    -
    -
    return
    -

    Constrained value of ‘value2-value1’.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Vector_Unit

    -
    -Defined in FT_TRIGONOMETRY_H (freetype/fttrigon.h). -

    -
    -
-  FT_EXPORT( void )
-  FT_Vector_Unit( FT_Vector*  vec,
-                  FT_Angle    angle );
-
-

    -
    -

    Return the unit vector corresponding to a given angle. After the call, the value of ‘vec.x’ will be ‘sin(angle)’, and the value of ‘vec.y’ will be ‘cos(angle)’.

    -

    This function is useful to retrieve both the sinus and cosinus of a given angle quickly.

    -

    -
    output
    -

    - - -
    vec -

    The address of target vector.

    -
    -
    -
    input
    -

    - - -
    angle -

    The address of angle.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Vector_Rotate

    -
    -Defined in FT_TRIGONOMETRY_H (freetype/fttrigon.h). -

    -
    -
-  FT_EXPORT( void )
-  FT_Vector_Rotate( FT_Vector*  vec,
-                    FT_Angle    angle );
-
-

    -
    -

    Rotate a vector by a given angle.

    -

    -
    inout
    -

    - - -
    vec -

    The address of target vector.

    -
    -
    -
    input
    -

    - - -
    angle -

    The address of angle.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Vector_Length

    -
    -Defined in FT_TRIGONOMETRY_H (freetype/fttrigon.h). -

    -
    -
-  FT_EXPORT( FT_Fixed )
-  FT_Vector_Length( FT_Vector*  vec );
-
-

    -
    -

    Return the length of a given vector.

    -

    -
    input
    -

    - - -
    vec -

    The address of target vector.

    -
    -
    -
    return
    -

    The vector length, expressed in the same units that the original vector coordinates.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Vector_Polarize

    -
    -Defined in FT_TRIGONOMETRY_H (freetype/fttrigon.h). -

    -
    -
-  FT_EXPORT( void )
-  FT_Vector_Polarize( FT_Vector*  vec,
-                      FT_Fixed   *length,
-                      FT_Angle   *angle );
-
-

    -
    -

    Compute both the length and angle of a given vector.

    -

    -
    input
    -

    - - -
    vec -

    The address of source vector.

    -
    -
    -
    output
    -

    - - - -
    length -

    The vector length.

    -
    angle -

    The vector angle.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Vector_From_Polar

    -
    -Defined in FT_TRIGONOMETRY_H (freetype/fttrigon.h). -

    -
    -
-  FT_EXPORT( void )
-  FT_Vector_From_Polar( FT_Vector*  vec,
-                        FT_Fixed    length,
-                        FT_Angle    angle );
-
-

    -
    -

    Compute vector coordinates from a length and angle.

    -

    -
    output
    -

    - - -
    vec -

    The address of source vector.

    -
    -
    -
    input
    -

    - - - -
    length -

    The vector length.

    -
    angle -

    The vector angle.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - - - diff --git a/docs/reference/ft2-font_formats.html b/docs/reference/ft2-font_formats.html deleted file mode 100644 index 661480e..0000000 --- a/docs/reference/ft2-font_formats.html +++ /dev/null @@ -1,84 +0,0 @@ - - - - -FreeType-2.4.9 API Reference - - - - - - -
    [Index][TOC]
    -

    FreeType-2.4.9 API Reference

    - -

    -Font Formats -

    -

    Synopsis

    - - -
    FT_Get_X11_Font_Format


    - -
    -

    The single function in this section can be used to get the font format. Note that this information is not needed normally; however, there are special cases (like in PDF devices) where it is important to differentiate, in spite of FreeType's uniform API.

    -

    This function is in the X11/xf86 namespace for historical reasons and in no way depends on that windowing system.

    -

    -
    -

    FT_Get_X11_Font_Format

    -
    -Defined in FT_XFREE86_H (freetype/ftxf86.h). -

    -
    -
-  FT_EXPORT( const char* )
-  FT_Get_X11_Font_Format( FT_Face  face );
-
-

    -
    -

    Return a string describing the format of a given face, using values which can be used as an X11 FONT_PROPERTY. Possible values are ‘TrueType’, ‘Type 1’, ‘BDF’, ‘PCF’, ‘Type 42’, ‘CID Type 1’, ‘CFF’, ‘PFR’, and ‘Windows FNT’.

    -

    -
    input
    -

    - - -
    face -

    Input face handle.

    -
    -
    -
    return
    -

    Font format string. NULL in case of error.

    -
    -
    -
    - - -
    [Index][TOC]
    - - - diff --git a/docs/reference/ft2-gasp_table.html b/docs/reference/ft2-gasp_table.html deleted file mode 100644 index 8199778..0000000 --- a/docs/reference/ft2-gasp_table.html +++ /dev/null @@ -1,142 +0,0 @@ - - - - -FreeType-2.4.9 API Reference - - - - - - -
    [Index][TOC]
    -

    FreeType-2.4.9 API Reference

    - -

    -Gasp Table -

    -

    Synopsis

    - - -
    FT_GASP_XXXFT_Get_Gasp


    - -
    -

    The function FT_Get_Gasp can be used to query a TrueType or OpenType font for specific entries in its ‘gasp’ table, if any. This is mainly useful when implementing native TrueType hinting with the bytecode interpreter to duplicate the Windows text rendering results.

    -

    -
    -

    FT_GASP_XXX

    -
    -Defined in FT_GASP_H (freetype/ftgasp.h). -

    -
    -
-#define FT_GASP_NO_TABLE               -1
-#define FT_GASP_DO_GRIDFIT           0x01
-#define FT_GASP_DO_GRAY              0x02
-#define FT_GASP_SYMMETRIC_SMOOTHING  0x08
-#define FT_GASP_SYMMETRIC_GRIDFIT    0x10
-
-

    -
    -

    A list of values and/or bit-flags returned by the FT_Get_Gasp function.

    -

    -
    values
    -

    - - - - - - - - -
    FT_GASP_NO_TABLE -

    This special value means that there is no GASP table in this face. It is up to the client to decide what to do.

    -
    FT_GASP_DO_GRIDFIT -

    Grid-fitting and hinting should be performed at the specified ppem. This really means TrueType bytecode interpretation. If this bit is not set, no hinting gets applied.

    -
    FT_GASP_DO_GRAY -

    Anti-aliased rendering should be performed at the specified ppem. If not set, do monochrome rendering.

    -
    FT_GASP_SYMMETRIC_SMOOTHING
    -

    If set, smoothing along multiple axes must be used with ClearType.

    -
    FT_GASP_SYMMETRIC_GRIDFIT
    -

    Grid-fitting must be used with ClearType's symmetric smoothing.

    -
    -
    -
    note
    -

    The bit-flags ‘FT_GASP_DO_GRIDFIT’ and ‘FT_GASP_DO_GRAY’ are to be used for standard font rasterization only. Independently of that, ‘FT_GASP_SYMMETRIC_SMOOTHING’ and ‘FT_GASP_SYMMETRIC_GRIDFIT’ are to be used if ClearType is enabled (and ‘FT_GASP_DO_GRIDFIT’ and ‘FT_GASP_DO_GRAY’ are consequently ignored).

    -

    ‘ClearType’ is Microsoft's implementation of LCD rendering, partly protected by patents.

    -
    -
    since
    -

    2.3.0

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Get_Gasp

    -
    -Defined in FT_GASP_H (freetype/ftgasp.h). -

    -
    -
-  FT_EXPORT( FT_Int )
-  FT_Get_Gasp( FT_Face  face,
-               FT_UInt  ppem );
-
-

    -
    -

    Read the ‘gasp’ table from a TrueType or OpenType font file and return the entry corresponding to a given character pixel size.

    -

    -
    input
    -

    - - - -
    face -

    The source face handle.

    -
    ppem -

    The vertical character pixel size.

    -
    -
    -
    return
    -

    Bit flags (see FT_GASP_XXX), or FT_GASP_NO_TABLE if there is no ‘gasp’ table in the face.

    -
    -
    since
    -

    2.3.0

    -
    -
    -
    - - -
    [Index][TOC]
    - - - diff --git a/docs/reference/ft2-glyph_management.html b/docs/reference/ft2-glyph_management.html deleted file mode 100644 index f9ba910..0000000 --- a/docs/reference/ft2-glyph_management.html +++ /dev/null @@ -1,673 +0,0 @@ - - - - -FreeType-2.4.9 API Reference - - - - - - -
    [Index][TOC]
    -

    FreeType-2.4.9 API Reference

    - -

    -Glyph Management -

    -

    Synopsis

    - - - - - - -
    FT_GlyphFT_OutlineGlyphRecft_glyph_bbox_xxx
    FT_GlyphRecFT_Get_GlyphFT_Glyph_Get_CBox
    FT_BitmapGlyphFT_Glyph_CopyFT_Glyph_To_Bitmap
    FT_BitmapGlyphRecFT_Glyph_TransformFT_Done_Glyph
    FT_OutlineGlyphFT_Glyph_BBox_Mode


    - -
    -

    This section contains definitions used to manage glyph data through generic FT_Glyph objects. Each of them can contain a bitmap, a vector outline, or even images in other formats.

    -

    -
    -

    FT_Glyph

    -
    -Defined in FT_GLYPH_H (freetype/ftglyph.h). -

    -
    -
-  typedef struct FT_GlyphRec_*  FT_Glyph;
-
-

    -
    -

    Handle to an object used to model generic glyph images. It is a pointer to the FT_GlyphRec structure and can contain a glyph bitmap or pointer.

    -

    -
    note
    -

    Glyph objects are not owned by the library. You must thus release them manually (through FT_Done_Glyph) before calling FT_Done_FreeType.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_GlyphRec

    -
    -Defined in FT_GLYPH_H (freetype/ftglyph.h). -

    -
    -
-  typedef struct  FT_GlyphRec_
-  {
-    FT_Library             library;
-    const FT_Glyph_Class*  clazz;
-    FT_Glyph_Format        format;
-    FT_Vector              advance;
-
-  } FT_GlyphRec;
-
-

    -
    -

    The root glyph structure contains a given glyph image plus its advance width in 16.16 fixed float format.

    -

    -
    fields
    -

    - - - - - -
    library -

    A handle to the FreeType library object.

    -
    clazz -

    A pointer to the glyph's class. Private.

    -
    format -

    The format of the glyph's image.

    -
    advance -

    A 16.16 vector that gives the glyph's advance width.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_BitmapGlyph

    -
    -Defined in FT_GLYPH_H (freetype/ftglyph.h). -

    -
    -
-  typedef struct FT_BitmapGlyphRec_*  FT_BitmapGlyph;
-
-

    -
    -

    A handle to an object used to model a bitmap glyph image. This is a sub-class of FT_Glyph, and a pointer to FT_BitmapGlyphRec.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_BitmapGlyphRec

    -
    -Defined in FT_GLYPH_H (freetype/ftglyph.h). -

    -
    -
-  typedef struct  FT_BitmapGlyphRec_
-  {
-    FT_GlyphRec  root;
-    FT_Int       left;
-    FT_Int       top;
-    FT_Bitmap    bitmap;
-
-  } FT_BitmapGlyphRec;
-
-

    -
    -

    A structure used for bitmap glyph images. This really is a ‘sub-class’ of FT_GlyphRec.

    -

    -
    fields
    -

    - - - - - -
    root -

    The root FT_Glyph fields.

    -
    left -

    The left-side bearing, i.e., the horizontal distance from the current pen position to the left border of the glyph bitmap.

    -
    top -

    The top-side bearing, i.e., the vertical distance from the current pen position to the top border of the glyph bitmap. This distance is positive for upwards y!

    -
    bitmap -

    A descriptor for the bitmap.

    -
    -
    -
    note
    -

    You can typecast an FT_Glyph to FT_BitmapGlyph if you have ‘glyph->format == FT_GLYPH_FORMAT_BITMAP’. This lets you access the bitmap's contents easily.

    -

    The corresponding pixel buffer is always owned by FT_BitmapGlyph and is thus created and destroyed with it.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_OutlineGlyph

    -
    -Defined in FT_GLYPH_H (freetype/ftglyph.h). -

    -
    -
-  typedef struct FT_OutlineGlyphRec_*  FT_OutlineGlyph;
-
-

    -
    -

    A handle to an object used to model an outline glyph image. This is a sub-class of FT_Glyph, and a pointer to FT_OutlineGlyphRec.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_OutlineGlyphRec

    -
    -Defined in FT_GLYPH_H (freetype/ftglyph.h). -

    -
    -
-  typedef struct  FT_OutlineGlyphRec_
-  {
-    FT_GlyphRec  root;
-    FT_Outline   outline;
-
-  } FT_OutlineGlyphRec;
-
-

    -
    -

    A structure used for outline (vectorial) glyph images. This really is a ‘sub-class’ of FT_GlyphRec.

    -

    -
    fields
    -

    - - - -
    root -

    The root FT_Glyph fields.

    -
    outline -

    A descriptor for the outline.

    -
    -
    -
    note
    -

    You can typecast an FT_Glyph to FT_OutlineGlyph if you have ‘glyph->format == FT_GLYPH_FORMAT_OUTLINE’. This lets you access the outline's content easily.

    -

    As the outline is extracted from a glyph slot, its coordinates are expressed normally in 26.6 pixels, unless the flag FT_LOAD_NO_SCALE was used in FT_Load_Glyph() or FT_Load_Char().

    -

    The outline's tables are always owned by the object and are destroyed with it.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Get_Glyph

    -
    -Defined in FT_GLYPH_H (freetype/ftglyph.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Get_Glyph( FT_GlyphSlot  slot,
-                FT_Glyph     *aglyph );
-
-

    -
    -

    A function used to extract a glyph image from a slot. Note that the created FT_Glyph object must be released with FT_Done_Glyph.

    -

    -
    input
    -

    - - -
    slot -

    A handle to the source glyph slot.

    -
    -
    -
    output
    -

    - - -
    aglyph -

    A handle to the glyph object.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Glyph_Copy

    -
    -Defined in FT_GLYPH_H (freetype/ftglyph.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Glyph_Copy( FT_Glyph   source,
-                 FT_Glyph  *target );
-
-

    -
    -

    A function used to copy a glyph image. Note that the created FT_Glyph object must be released with FT_Done_Glyph.

    -

    -
    input
    -

    - - -
    source -

    A handle to the source glyph object.

    -
    -
    -
    output
    -

    - - -
    target -

    A handle to the target glyph object. 0 in case of error.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Glyph_Transform

    -
    -Defined in FT_GLYPH_H (freetype/ftglyph.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Glyph_Transform( FT_Glyph    glyph,
-                      FT_Matrix*  matrix,
-                      FT_Vector*  delta );
-
-

    -
    -

    Transform a glyph image if its format is scalable.

    -

    -
    inout
    -

    - - -
    glyph -

    A handle to the target glyph object.

    -
    -
    -
    input
    -

    - - - -
    matrix -

    A pointer to a 2x2 matrix to apply.

    -
    delta -

    A pointer to a 2d vector to apply. Coordinates are expressed in 1/64th of a pixel.

    -
    -
    -
    return
    -

    FreeType error code (if not 0, the glyph format is not scalable).

    -
    -
    note
    -

    The 2x2 transformation matrix is also applied to the glyph's advance vector.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Glyph_BBox_Mode

    -
    -Defined in FT_GLYPH_H (freetype/ftglyph.h). -

    -
    -
-  typedef enum  FT_Glyph_BBox_Mode_
-  {
-    FT_GLYPH_BBOX_UNSCALED  = 0,
-    FT_GLYPH_BBOX_SUBPIXELS = 0,
-    FT_GLYPH_BBOX_GRIDFIT   = 1,
-    FT_GLYPH_BBOX_TRUNCATE  = 2,
-    FT_GLYPH_BBOX_PIXELS    = 3
-
-  } FT_Glyph_BBox_Mode;
-
-

    -
    -

    The mode how the values of FT_Glyph_Get_CBox are returned.

    -

    -
    values
    -

    - - - - - - - -
    FT_GLYPH_BBOX_UNSCALED -

    Return unscaled font units.

    -
    FT_GLYPH_BBOX_SUBPIXELS
    -

    Return unfitted 26.6 coordinates.

    -
    FT_GLYPH_BBOX_GRIDFIT -

    Return grid-fitted 26.6 coordinates.

    -
    FT_GLYPH_BBOX_TRUNCATE -

    Return coordinates in integer pixels.

    -
    FT_GLYPH_BBOX_PIXELS -

    Return grid-fitted pixel coordinates.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    ft_glyph_bbox_xxx

    -
    -Defined in FT_GLYPH_H (freetype/ftglyph.h). -

    -
    -
-#define ft_glyph_bbox_unscaled   FT_GLYPH_BBOX_UNSCALED
-#define ft_glyph_bbox_subpixels  FT_GLYPH_BBOX_SUBPIXELS
-#define ft_glyph_bbox_gridfit    FT_GLYPH_BBOX_GRIDFIT
-#define ft_glyph_bbox_truncate   FT_GLYPH_BBOX_TRUNCATE
-#define ft_glyph_bbox_pixels     FT_GLYPH_BBOX_PIXELS
-
-

    -
    -

    These constants are deprecated. Use the corresponding FT_Glyph_BBox_Mode values instead.

    -

    -
    values
    -

    - - - - - - - -
    ft_glyph_bbox_unscaled -

    See FT_GLYPH_BBOX_UNSCALED.

    -
    ft_glyph_bbox_subpixels
    -

    See FT_GLYPH_BBOX_SUBPIXELS.

    -
    ft_glyph_bbox_gridfit -

    See FT_GLYPH_BBOX_GRIDFIT.

    -
    ft_glyph_bbox_truncate -

    See FT_GLYPH_BBOX_TRUNCATE.

    -
    ft_glyph_bbox_pixels -

    See FT_GLYPH_BBOX_PIXELS.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Glyph_Get_CBox

    -
    -Defined in FT_GLYPH_H (freetype/ftglyph.h). -

    -
    -
-  FT_EXPORT( void )
-  FT_Glyph_Get_CBox( FT_Glyph  glyph,
-                     FT_UInt   bbox_mode,
-                     FT_BBox  *acbox );
-
-

    -
    -

    Return a glyph's ‘control box’. The control box encloses all the outline's points, including Bézier control points. Though it coincides with the exact bounding box for most glyphs, it can be slightly larger in some situations (like when rotating an outline which contains Bézier outside arcs).

    -

    Computing the control box is very fast, while getting the bounding box can take much more time as it needs to walk over all segments and arcs in the outline. To get the latter, you can use the ‘ftbbox’ component which is dedicated to this single task.

    -

    -
    input
    -

    - - - -
    glyph -

    A handle to the source glyph object.

    -
    mode -

    The mode which indicates how to interpret the returned bounding box values.

    -
    -
    -
    output
    -

    - - -
    acbox -

    The glyph coordinate bounding box. Coordinates are expressed in 1/64th of pixels if it is grid-fitted.

    -
    -
    -
    note
    -

    Coordinates are relative to the glyph origin, using the y upwards convention.

    -

    If the glyph has been loaded with FT_LOAD_NO_SCALE, ‘bbox_mode’ must be set to FT_GLYPH_BBOX_UNSCALED to get unscaled font units in 26.6 pixel format. The value FT_GLYPH_BBOX_SUBPIXELS is another name for this constant.

    -

    If the font is tricky and the glyph has been loaded with FT_LOAD_NO_SCALE, the resulting CBox is meaningless. To get reasonable values for the CBox it is necessary to load the glyph at a large ppem value (so that the hinting instructions can properly shift and scale the subglyphs), then extracting the CBox which can be eventually converted back to font units.

    -

    Note that the maximum coordinates are exclusive, which means that one can compute the width and height of the glyph image (be it in integer or 26.6 pixels) as:

    -
    -  width  = bbox.xMax - bbox.xMin;                                  
-  height = bbox.yMax - bbox.yMin;                                  
-
    -

    Note also that for 26.6 coordinates, if ‘bbox_mode’ is set to FT_GLYPH_BBOX_GRIDFIT, the coordinates will also be grid-fitted, which corresponds to:

    -
    -  bbox.xMin = FLOOR(bbox.xMin);                                    
-  bbox.yMin = FLOOR(bbox.yMin);                                    
-  bbox.xMax = CEILING(bbox.xMax);                                  
-  bbox.yMax = CEILING(bbox.yMax);                                  
-
    -

    To get the bbox in pixel coordinates, set ‘bbox_mode’ to FT_GLYPH_BBOX_TRUNCATE.

    -

    To get the bbox in grid-fitted pixel coordinates, set ‘bbox_mode’ to FT_GLYPH_BBOX_PIXELS.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Glyph_To_Bitmap

    -
    -Defined in FT_GLYPH_H (freetype/ftglyph.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Glyph_To_Bitmap( FT_Glyph*       the_glyph,
-                      FT_Render_Mode  render_mode,
-                      FT_Vector*      origin,
-                      FT_Bool         destroy );
-
-

    -
    -

    Convert a given glyph object to a bitmap glyph object.

    -

    -
    inout
    -

    - - -
    the_glyph -

    A pointer to a handle to the target glyph.

    -
    -
    -
    input
    -

    - - - - -
    render_mode -

    An enumeration that describes how the data is rendered.

    -
    origin -

    A pointer to a vector used to translate the glyph image before rendering. Can be 0 (if no translation). The origin is expressed in 26.6 pixels.

    -
    destroy -

    A boolean that indicates that the original glyph image should be destroyed by this function. It is never destroyed in case of error.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    This function does nothing if the glyph format isn't scalable.

    -

    The glyph image is translated with the ‘origin’ vector before rendering.

    -

    The first parameter is a pointer to an FT_Glyph handle, that will be replaced by this function (with newly allocated data). Typically, you would use (omitting error handling):

    -

    -
    -  FT_Glyph        glyph;                                         
-  FT_BitmapGlyph  glyph_bitmap;                                  
-                                                                 
-                                                                 
-  // load glyph                                                  
-  error = FT_Load_Char( face, glyph_index, FT_LOAD_DEFAUT );     
-                                                                 
-  // extract glyph image                                         
-  error = FT_Get_Glyph( face->glyph, &glyph );                   
-                                                                 
-  // convert to a bitmap (default render mode + destroying old)  
-  if ( glyph->format != FT_GLYPH_FORMAT_BITMAP )                 
-  {                                                              
-    error = FT_Glyph_To_Bitmap( &glyph, FT_RENDER_MODE_NORMAL,   
-                                0, 1 );                          
-    if ( error ) // `glyph' unchanged                            
-      ...                                                        
-  }                                                              
-                                                                 
-  // access bitmap content by typecasting                        
-  glyph_bitmap = (FT_BitmapGlyph)glyph;                          
-                                                                 
-  // do funny stuff with it, like blitting/drawing               
-  ...                                                            
-                                                                 
-  // discard glyph image (bitmap or not)                         
-  FT_Done_Glyph( glyph );                                        
-
    -

    -

    Here another example, again without error handling:

    -

    -
    -  FT_Glyph  glyphs[MAX_GLYPHS]                                   
-                                                                 
-                                                                 
-  ...                                                            
-                                                                 
-  for ( idx = 0; i < MAX_GLYPHS; i++ )                           
-    error = FT_Load_Glyph( face, idx, FT_LOAD_DEFAULT ) ||       
-            FT_Get_Glyph ( face->glyph, &glyph[idx] );           
-                                                                 
-  ...                                                            
-                                                                 
-  for ( idx = 0; i < MAX_GLYPHS; i++ )                           
-  {                                                              
-    FT_Glyph  bitmap = glyphs[idx];                              
-                                                                 
-                                                                 
-    ...                                                          
-                                                                 
-    // after this call, `bitmap' no longer points into           
-    // the `glyphs' array (and the old value isn't destroyed)    
-    FT_Glyph_To_Bitmap( &bitmap, FT_RENDER_MODE_MONO, 0, 0 );    
-                                                                 
-    ...                                                          
-                                                                 
-    FT_Done_Glyph( bitmap );                                     
-  }                                                              
-                                                                 
-  ...                                                            
-                                                                 
-  for ( idx = 0; i < MAX_GLYPHS; i++ )                           
-    FT_Done_Glyph( glyphs[idx] );                                
-
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Done_Glyph

    -
    -Defined in FT_GLYPH_H (freetype/ftglyph.h). -

    -
    -
-  FT_EXPORT( void )
-  FT_Done_Glyph( FT_Glyph  glyph );
-
-

    -
    -

    Destroy a given glyph.

    -

    -
    input
    -

    - - -
    glyph -

    A handle to the target glyph object.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - - - diff --git a/docs/reference/ft2-glyph_stroker.html b/docs/reference/ft2-glyph_stroker.html deleted file mode 100644 index 441ea6d..0000000 --- a/docs/reference/ft2-glyph_stroker.html +++ /dev/null @@ -1,938 +0,0 @@ - - - - -FreeType-2.4.9 API Reference - - - - - - -
    [Index][TOC]
    -

    FreeType-2.4.9 API Reference

    - -

    -Glyph Stroker -

    -

    Synopsis

    - - - - - - - - - - - - -
    FT_StrokerFT_Stroker_EndSubPath
    FT_Stroker_LineJoinFT_Stroker_LineTo
    FT_Stroker_LineCapFT_Stroker_ConicTo
    FT_StrokerBorderFT_Stroker_CubicTo
    FT_Outline_GetInsideBorderFT_Stroker_GetBorderCounts
    FT_Outline_GetOutsideBorderFT_Stroker_ExportBorder
    FT_Stroker_NewFT_Stroker_GetCounts
    FT_Stroker_SetFT_Stroker_Export
    FT_Stroker_RewindFT_Stroker_Done
    FT_Stroker_ParseOutlineFT_Glyph_Stroke
    FT_Stroker_BeginSubPathFT_Glyph_StrokeBorder


    - -
    -

    This component generates stroked outlines of a given vectorial glyph. It also allows you to retrieve the ‘outside’ and/or the ‘inside’ borders of the stroke.

    -

    This can be useful to generate ‘bordered’ glyph, i.e., glyphs displayed with a coloured (and anti-aliased) border around their shape.

    -

    -
    -

    FT_Stroker

    -
    -Defined in FT_STROKER_H (freetype/ftstroke.h). -

    -
    -
-  typedef struct FT_StrokerRec_*  FT_Stroker;
-
-

    -
    -

    Opaque handler to a path stroker object.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Stroker_LineJoin

    -
    -Defined in FT_STROKER_H (freetype/ftstroke.h). -

    -
    -
-  typedef enum  FT_Stroker_LineJoin_
-  {
-    FT_STROKER_LINEJOIN_ROUND          = 0,
-    FT_STROKER_LINEJOIN_BEVEL          = 1,
-    FT_STROKER_LINEJOIN_MITER_VARIABLE = 2,
-    FT_STROKER_LINEJOIN_MITER          = FT_STROKER_LINEJOIN_MITER_VARIABLE,
-    FT_STROKER_LINEJOIN_MITER_FIXED    = 3
-
-  } FT_Stroker_LineJoin;
-
-

    -
    -

    These values determine how two joining lines are rendered in a stroker.

    -

    -
    values
    -

    - - - - - - - - - - - -
    FT_STROKER_LINEJOIN_ROUND
    -

    Used to render rounded line joins. Circular arcs are used to join two lines smoothly.

    -
    FT_STROKER_LINEJOIN_BEVEL
    -

    Used to render beveled line joins. The outer corner of the joined lines is filled by enclosing the triangular region of the corner with a straight line between the outer corners of each stroke.

    -
    FT_STROKER_LINEJOIN_MITER_FIXED
    -

    Used to render mitered line joins, with fixed bevels if the miter limit is exceeded. The outer edges of the strokes for the two segments are extended until they meet at an angle. If the segments meet at too sharp an angle (such that the miter would extend from the intersection of the segments a distance greater than the product of the miter limit value and the border radius), then a bevel join (see above) is used instead. This prevents long spikes being created. FT_STROKER_LINEJOIN_MITER_FIXED generates a miter line join as used in PostScript and PDF.

    -
    FT_STROKER_LINEJOIN_MITER_VARIABLE
    -

    -
    FT_STROKER_LINEJOIN_MITER
    -

    Used to render mitered line joins, with variable bevels if the miter limit is exceeded. The intersection of the strokes is clipped at a line perpendicular to the bisector of the angle between the strokes, at the distance from the intersection of the segments equal to the product of the miter limit value and the border radius. This prevents long spikes being created. FT_STROKER_LINEJOIN_MITER_VARIABLE generates a mitered line join as used in XPS. FT_STROKER_LINEJOIN_MITER is an alias for FT_STROKER_LINEJOIN_MITER_VARIABLE, retained for backwards compatibility.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Stroker_LineCap

    -
    -Defined in FT_STROKER_H (freetype/ftstroke.h). -

    -
    -
-  typedef enum  FT_Stroker_LineCap_
-  {
-    FT_STROKER_LINECAP_BUTT = 0,
-    FT_STROKER_LINECAP_ROUND,
-    FT_STROKER_LINECAP_SQUARE
-
-  } FT_Stroker_LineCap;
-
-

    -
    -

    These values determine how the end of opened sub-paths are rendered in a stroke.

    -

    -
    values
    -

    - - - - - - - -
    FT_STROKER_LINECAP_BUTT
    -

    The end of lines is rendered as a full stop on the last point itself.

    -
    FT_STROKER_LINECAP_ROUND
    -

    The end of lines is rendered as a half-circle around the last point.

    -
    FT_STROKER_LINECAP_SQUARE
    -

    The end of lines is rendered as a square around the last point.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_StrokerBorder

    -
    -Defined in FT_STROKER_H (freetype/ftstroke.h). -

    -
    -
-  typedef enum  FT_StrokerBorder_
-  {
-    FT_STROKER_BORDER_LEFT = 0,
-    FT_STROKER_BORDER_RIGHT
-
-  } FT_StrokerBorder;
-
-

    -
    -

    These values are used to select a given stroke border in FT_Stroker_GetBorderCounts and FT_Stroker_ExportBorder.

    -

    -
    values
    -

    - - - - -
    FT_STROKER_BORDER_LEFT -

    Select the left border, relative to the drawing direction.

    -
    FT_STROKER_BORDER_RIGHT
    -

    Select the right border, relative to the drawing direction.

    -
    -
    -
    note
    -

    Applications are generally interested in the ‘inside’ and ‘outside’ borders. However, there is no direct mapping between these and the ‘left’ and ‘right’ ones, since this really depends on the glyph's drawing orientation, which varies between font formats.

    -

    You can however use FT_Outline_GetInsideBorder and FT_Outline_GetOutsideBorder to get these.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Outline_GetInsideBorder

    -
    -Defined in FT_STROKER_H (freetype/ftstroke.h). -

    -
    -
-  FT_EXPORT( FT_StrokerBorder )
-  FT_Outline_GetInsideBorder( FT_Outline*  outline );
-
-

    -
    -

    Retrieve the FT_StrokerBorder value corresponding to the ‘inside’ borders of a given outline.

    -

    -
    input
    -

    - - -
    outline -

    The source outline handle.

    -
    -
    -
    return
    -

    The border index. FT_STROKER_BORDER_RIGHT for empty or invalid outlines.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Outline_GetOutsideBorder

    -
    -Defined in FT_STROKER_H (freetype/ftstroke.h). -

    -
    -
-  FT_EXPORT( FT_StrokerBorder )
-  FT_Outline_GetOutsideBorder( FT_Outline*  outline );
-
-

    -
    -

    Retrieve the FT_StrokerBorder value corresponding to the ‘outside’ borders of a given outline.

    -

    -
    input
    -

    - - -
    outline -

    The source outline handle.

    -
    -
    -
    return
    -

    The border index. FT_STROKER_BORDER_LEFT for empty or invalid outlines.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Stroker_New

    -
    -Defined in FT_STROKER_H (freetype/ftstroke.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Stroker_New( FT_Library   library,
-                  FT_Stroker  *astroker );
-
-

    -
    -

    Create a new stroker object.

    -

    -
    input
    -

    - - -
    library -

    FreeType library handle.

    -
    -
    -
    output
    -

    - - -
    astroker -

    A new stroker object handle. NULL in case of error.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Stroker_Set

    -
    -Defined in FT_STROKER_H (freetype/ftstroke.h). -

    -
    -
-  FT_EXPORT( void )
-  FT_Stroker_Set( FT_Stroker           stroker,
-                  FT_Fixed             radius,
-                  FT_Stroker_LineCap   line_cap,
-                  FT_Stroker_LineJoin  line_join,
-                  FT_Fixed             miter_limit );
-
-

    -
    -

    Reset a stroker object's attributes.

    -

    -
    input
    -

    - - - - - - -
    stroker -

    The target stroker handle.

    -
    radius -

    The border radius.

    -
    line_cap -

    The line cap style.

    -
    line_join -

    The line join style.

    -
    miter_limit -

    The miter limit for the FT_STROKER_LINEJOIN_MITER_FIXED and FT_STROKER_LINEJOIN_MITER_VARIABLE line join styles, expressed as 16.16 fixed point value.

    -
    -
    -
    note
    -

    The radius is expressed in the same units as the outline coordinates.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Stroker_Rewind

    -
    -Defined in FT_STROKER_H (freetype/ftstroke.h). -

    -
    -
-  FT_EXPORT( void )
-  FT_Stroker_Rewind( FT_Stroker  stroker );
-
-

    -
    -

    Reset a stroker object without changing its attributes. You should call this function before beginning a new series of calls to FT_Stroker_BeginSubPath or FT_Stroker_EndSubPath.

    -

    -
    input
    -

    - - -
    stroker -

    The target stroker handle.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Stroker_ParseOutline

    -
    -Defined in FT_STROKER_H (freetype/ftstroke.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Stroker_ParseOutline( FT_Stroker   stroker,
-                           FT_Outline*  outline,
-                           FT_Bool      opened );
-
-

    -
    -

    A convenience function used to parse a whole outline with the stroker. The resulting outline(s) can be retrieved later by functions like FT_Stroker_GetCounts and FT_Stroker_Export.

    -

    -
    input
    -

    - - - - -
    stroker -

    The target stroker handle.

    -
    outline -

    The source outline.

    -
    opened -

    A boolean. If 1, the outline is treated as an open path instead of a closed one.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    If ‘opened’ is 0 (the default), the outline is treated as a closed path, and the stroker generates two distinct ‘border’ outlines.

    -

    If ‘opened’ is 1, the outline is processed as an open path, and the stroker generates a single ‘stroke’ outline.

    -

    This function calls FT_Stroker_Rewind automatically.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Stroker_BeginSubPath

    -
    -Defined in FT_STROKER_H (freetype/ftstroke.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Stroker_BeginSubPath( FT_Stroker  stroker,
-                           FT_Vector*  to,
-                           FT_Bool     open );
-
-

    -
    -

    Start a new sub-path in the stroker.

    -

    -
    input
    -

    - - - - -
    stroker -

    The target stroker handle.

    -
    to -

    A pointer to the start vector.

    -
    open -

    A boolean. If 1, the sub-path is treated as an open one.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    This function is useful when you need to stroke a path that is not stored as an FT_Outline object.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Stroker_EndSubPath

    -
    -Defined in FT_STROKER_H (freetype/ftstroke.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Stroker_EndSubPath( FT_Stroker  stroker );
-
-

    -
    -

    Close the current sub-path in the stroker.

    -

    -
    input
    -

    - - -
    stroker -

    The target stroker handle.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    You should call this function after FT_Stroker_BeginSubPath. If the subpath was not ‘opened’, this function ‘draws’ a single line segment to the start position when needed.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Stroker_LineTo

    -
    -Defined in FT_STROKER_H (freetype/ftstroke.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Stroker_LineTo( FT_Stroker  stroker,
-                     FT_Vector*  to );
-
-

    -
    -

    ‘Draw’ a single line segment in the stroker's current sub-path, from the last position.

    -

    -
    input
    -

    - - - -
    stroker -

    The target stroker handle.

    -
    to -

    A pointer to the destination point.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    You should call this function between FT_Stroker_BeginSubPath and FT_Stroker_EndSubPath.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Stroker_ConicTo

    -
    -Defined in FT_STROKER_H (freetype/ftstroke.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Stroker_ConicTo( FT_Stroker  stroker,
-                      FT_Vector*  control,
-                      FT_Vector*  to );
-
-

    -
    -

    ‘Draw’ a single quadratic Bézier in the stroker's current sub-path, from the last position.

    -

    -
    input
    -

    - - - - -
    stroker -

    The target stroker handle.

    -
    control -

    A pointer to a Bézier control point.

    -
    to -

    A pointer to the destination point.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    You should call this function between FT_Stroker_BeginSubPath and FT_Stroker_EndSubPath.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Stroker_CubicTo

    -
    -Defined in FT_STROKER_H (freetype/ftstroke.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Stroker_CubicTo( FT_Stroker  stroker,
-                      FT_Vector*  control1,
-                      FT_Vector*  control2,
-                      FT_Vector*  to );
-
-

    -
    -

    ‘Draw’ a single cubic Bézier in the stroker's current sub-path, from the last position.

    -

    -
    input
    -

    - - - - - -
    stroker -

    The target stroker handle.

    -
    control1 -

    A pointer to the first Bézier control point.

    -
    control2 -

    A pointer to second Bézier control point.

    -
    to -

    A pointer to the destination point.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    You should call this function between FT_Stroker_BeginSubPath and FT_Stroker_EndSubPath.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Stroker_GetBorderCounts

    -
    -Defined in FT_STROKER_H (freetype/ftstroke.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Stroker_GetBorderCounts( FT_Stroker        stroker,
-                              FT_StrokerBorder  border,
-                              FT_UInt          *anum_points,
-                              FT_UInt          *anum_contours );
-
-

    -
    -

    Call this function once you have finished parsing your paths with the stroker. It returns the number of points and contours necessary to export one of the ‘border’ or ‘stroke’ outlines generated by the stroker.

    -

    -
    input
    -

    - - - -
    stroker -

    The target stroker handle.

    -
    border -

    The border index.

    -
    -
    -
    output
    -

    - - - -
    anum_points -

    The number of points.

    -
    anum_contours -

    The number of contours.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    When an outline, or a sub-path, is ‘closed’, the stroker generates two independent ‘border’ outlines, named ‘left’ and ‘right’.

    -

    When the outline, or a sub-path, is ‘opened’, the stroker merges the ‘border’ outlines with caps. The ‘left’ border receives all points, while the ‘right’ border becomes empty.

    -

    Use the function FT_Stroker_GetCounts instead if you want to retrieve the counts associated to both borders.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Stroker_ExportBorder

    -
    -Defined in FT_STROKER_H (freetype/ftstroke.h). -

    -
    -
-  FT_EXPORT( void )
-  FT_Stroker_ExportBorder( FT_Stroker        stroker,
-                           FT_StrokerBorder  border,
-                           FT_Outline*       outline );
-
-

    -
    -

    Call this function after FT_Stroker_GetBorderCounts to export the corresponding border to your own FT_Outline structure.

    -

    Note that this function appends the border points and contours to your outline, but does not try to resize its arrays.

    -

    -
    input
    -

    - - - - -
    stroker -

    The target stroker handle.

    -
    border -

    The border index.

    -
    outline -

    The target outline handle.

    -
    -
    -
    note
    -

    Always call this function after FT_Stroker_GetBorderCounts to get sure that there is enough room in your FT_Outline object to receive all new data.

    -

    When an outline, or a sub-path, is ‘closed’, the stroker generates two independent ‘border’ outlines, named ‘left’ and ‘right’

    -

    When the outline, or a sub-path, is ‘opened’, the stroker merges the ‘border’ outlines with caps. The ‘left’ border receives all points, while the ‘right’ border becomes empty.

    -

    Use the function FT_Stroker_Export instead if you want to retrieve all borders at once.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Stroker_GetCounts

    -
    -Defined in FT_STROKER_H (freetype/ftstroke.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Stroker_GetCounts( FT_Stroker  stroker,
-                        FT_UInt    *anum_points,
-                        FT_UInt    *anum_contours );
-
-

    -
    -

    Call this function once you have finished parsing your paths with the stroker. It returns the number of points and contours necessary to export all points/borders from the stroked outline/path.

    -

    -
    input
    -

    - - -
    stroker -

    The target stroker handle.

    -
    -
    -
    output
    -

    - - - -
    anum_points -

    The number of points.

    -
    anum_contours -

    The number of contours.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Stroker_Export

    -
    -Defined in FT_STROKER_H (freetype/ftstroke.h). -

    -
    -
-  FT_EXPORT( void )
-  FT_Stroker_Export( FT_Stroker   stroker,
-                     FT_Outline*  outline );
-
-

    -
    -

    Call this function after FT_Stroker_GetBorderCounts to export all borders to your own FT_Outline structure.

    -

    Note that this function appends the border points and contours to your outline, but does not try to resize its arrays.

    -

    -
    input
    -

    - - - -
    stroker -

    The target stroker handle.

    -
    outline -

    The target outline handle.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Stroker_Done

    -
    -Defined in FT_STROKER_H (freetype/ftstroke.h). -

    -
    -
-  FT_EXPORT( void )
-  FT_Stroker_Done( FT_Stroker  stroker );
-
-

    -
    -

    Destroy a stroker object.

    -

    -
    input
    -

    - - -
    stroker -

    A stroker handle. Can be NULL.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Glyph_Stroke

    -
    -Defined in FT_STROKER_H (freetype/ftstroke.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Glyph_Stroke( FT_Glyph    *pglyph,
-                   FT_Stroker   stroker,
-                   FT_Bool      destroy );
-
-

    -
    -

    Stroke a given outline glyph object with a given stroker.

    -

    -
    inout
    -

    - - -
    pglyph -

    Source glyph handle on input, new glyph handle on output.

    -
    -
    -
    input
    -

    - - - -
    stroker -

    A stroker handle.

    -
    destroy -

    A Boolean. If 1, the source glyph object is destroyed on success.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    The source glyph is untouched in case of error.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Glyph_StrokeBorder

    -
    -Defined in FT_STROKER_H (freetype/ftstroke.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Glyph_StrokeBorder( FT_Glyph    *pglyph,
-                         FT_Stroker   stroker,
-                         FT_Bool      inside,
-                         FT_Bool      destroy );
-
-

    -
    -

    Stroke a given outline glyph object with a given stroker, but only return either its inside or outside border.

    -

    -
    inout
    -

    - - -
    pglyph -

    Source glyph handle on input, new glyph handle on output.

    -
    -
    -
    input
    -

    - - - - -
    stroker -

    A stroker handle.

    -
    inside -

    A Boolean. If 1, return the inside border, otherwise the outside border.

    -
    destroy -

    A Boolean. If 1, the source glyph object is destroyed on success.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    The source glyph is untouched in case of error.

    -
    -
    -
    - - -
    [Index][TOC]
    - - - diff --git a/docs/reference/ft2-glyph_variants.html b/docs/reference/ft2-glyph_variants.html deleted file mode 100644 index 04b5f97..0000000 --- a/docs/reference/ft2-glyph_variants.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - -FreeType-2.4.9 API Reference - - - - - - -
    [Index][TOC]
    -

    FreeType-2.4.9 API Reference

    - -

    -Glyph Variants -

    -

    Synopsis

    - - - - -
    FT_Face_GetCharVariantIndexFT_Face_GetVariantsOfChar
    FT_Face_GetCharVariantIsDefaultFT_Face_GetCharsOfVariant
    FT_Face_GetVariantSelectors


    - -
    -

    Many CJK characters have variant forms. They are a sort of grey area somewhere between being totally irrelevant and semantically distinct; for this reason, the Unicode consortium decided to introduce Ideographic Variation Sequences (IVS), consisting of a Unicode base character and one of 240 variant selectors (U+E0100-U+E01EF), instead of further extending the already huge code range for CJK characters.

    -

    An IVS is registered and unique; for further details please refer to Unicode Technical Report #37, the Ideographic Variation Database. To date (October 2007), the character with the most variants is U+908A, having 8 such IVS.

    -

    Adobe and MS decided to support IVS with a new cmap subtable (format 14). It is an odd subtable because it is not a mapping of input code points to glyphs, but contains lists of all variants supported by the font.

    -

    A variant may be either ‘default’ or ‘non-default’. A default variant is the one you will get for that code point if you look it up in the standard Unicode cmap. A non-default variant is a different glyph.

    -

    -
    -

    FT_Face_GetCharVariantIndex

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  FT_EXPORT( FT_UInt )
-  FT_Face_GetCharVariantIndex( FT_Face   face,
-                               FT_ULong  charcode,
-                               FT_ULong  variantSelector );
-
-

    -
    -

    Return the glyph index of a given character code as modified by the variation selector.

    -

    -
    input
    -

    - - - - -
    face -

    A handle to the source face object.

    -
    charcode -

    The character code point in Unicode.

    -
    variantSelector -

    The Unicode code point of the variation selector.

    -
    -
    -
    return
    -

    The glyph index. 0 means either ‘undefined character code’, or ‘undefined selector code’, or ‘no variation selector cmap subtable’, or ‘current CharMap is not Unicode’.

    -
    -
    note
    -

    If you use FreeType to manipulate the contents of font files directly, be aware that the glyph index returned by this function doesn't always correspond to the internal indices used within the file. This is done to ensure that value 0 always corresponds to the ‘missing glyph’.

    -

    This function is only meaningful if a) the font has a variation selector cmap sub table, and b) the current charmap has a Unicode encoding.

    -
    -
    since
    -

    2.3.6

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Face_GetCharVariantIsDefault

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  FT_EXPORT( FT_Int )
-  FT_Face_GetCharVariantIsDefault( FT_Face   face,
-                                   FT_ULong  charcode,
-                                   FT_ULong  variantSelector );
-
-

    -
    -

    Check whether this variant of this Unicode character is the one to be found in the ‘cmap’.

    -

    -
    input
    -

    - - - - -
    face -

    A handle to the source face object.

    -
    charcode -

    The character codepoint in Unicode.

    -
    variantSelector -

    The Unicode codepoint of the variation selector.

    -
    -
    -
    return
    -

    1 if found in the standard (Unicode) cmap, 0 if found in the variation selector cmap, or -1 if it is not a variant.

    -
    -
    note
    -

    This function is only meaningful if the font has a variation selector cmap subtable.

    -
    -
    since
    -

    2.3.6

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Face_GetVariantSelectors

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  FT_EXPORT( FT_UInt32* )
-  FT_Face_GetVariantSelectors( FT_Face  face );
-
-

    -
    -

    Return a zero-terminated list of Unicode variant selectors found in the font.

    -

    -
    input
    -

    - - -
    face -

    A handle to the source face object.

    -
    -
    -
    return
    -

    A pointer to an array of selector code points, or NULL if there is no valid variant selector cmap subtable.

    -
    -
    note
    -

    The last item in the array is 0; the array is owned by the FT_Face object but can be overwritten or released on the next call to a FreeType function.

    -
    -
    since
    -

    2.3.6

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Face_GetVariantsOfChar

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  FT_EXPORT( FT_UInt32* )
-  FT_Face_GetVariantsOfChar( FT_Face   face,
-                             FT_ULong  charcode );
-
-

    -
    -

    Return a zero-terminated list of Unicode variant selectors found for the specified character code.

    -

    -
    input
    -

    - - - -
    face -

    A handle to the source face object.

    -
    charcode -

    The character codepoint in Unicode.

    -
    -
    -
    return
    -

    A pointer to an array of variant selector code points which are active for the given character, or NULL if the corresponding list is empty.

    -
    -
    note
    -

    The last item in the array is 0; the array is owned by the FT_Face object but can be overwritten or released on the next call to a FreeType function.

    -
    -
    since
    -

    2.3.6

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Face_GetCharsOfVariant

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  FT_EXPORT( FT_UInt32* )
-  FT_Face_GetCharsOfVariant( FT_Face   face,
-                             FT_ULong  variantSelector );
-
-

    -
    -

    Return a zero-terminated list of Unicode character codes found for the specified variant selector.

    -

    -
    input
    -

    - - - -
    face -

    A handle to the source face object.

    -
    variantSelector -

    The variant selector code point in Unicode.

    -
    -
    -
    return
    -

    A list of all the code points which are specified by this selector (both default and non-default codes are returned) or NULL if there is no valid cmap or the variant selector is invalid.

    -
    -
    note
    -

    The last item in the array is 0; the array is owned by the FT_Face object but can be overwritten or released on the next call to a FreeType function.

    -
    -
    since
    -

    2.3.6

    -
    -
    -
    - - -
    [Index][TOC]
    - - - diff --git a/docs/reference/ft2-gx_validation.html b/docs/reference/ft2-gx_validation.html deleted file mode 100644 index f9a239a..0000000 --- a/docs/reference/ft2-gx_validation.html +++ /dev/null @@ -1,356 +0,0 @@ - - - - -FreeType-2.4.9 API Reference - - - - - - -
    [Index][TOC]
    -

    FreeType-2.4.9 API Reference

    - -

    -TrueTypeGX/AAT Validation -

    -

    Synopsis

    - - - - -
    FT_VALIDATE_GX_LENGTHFT_TrueTypeGX_FreeFT_ClassicKern_Free
    FT_VALIDATE_GXXXXFT_VALIDATE_CKERNXXX
    FT_TrueTypeGX_ValidateFT_ClassicKern_Validate


    - -
    -

    This section contains the declaration of functions to validate some TrueTypeGX tables (feat, mort, morx, bsln, just, kern, opbd, trak, prop, lcar).

    -

    -
    -

    FT_VALIDATE_GX_LENGTH

    -
    -Defined in FT_GX_VALIDATE_H (freetype/ftgxval.h). -

    -
    -
-#define FT_VALIDATE_GX_LENGTH     (FT_VALIDATE_GX_LAST_INDEX + 1)
-
-

    -
    -

    The number of tables checked in this module. Use it as a parameter for the ‘table-length’ argument of function FT_TrueTypeGX_Validate.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_VALIDATE_GXXXX

    -
    -Defined in FT_GX_VALIDATE_H (freetype/ftgxval.h). -

    -
    -
-#define FT_VALIDATE_feat  FT_VALIDATE_GX_BITFIELD( feat )
-#define FT_VALIDATE_mort  FT_VALIDATE_GX_BITFIELD( mort )
-#define FT_VALIDATE_morx  FT_VALIDATE_GX_BITFIELD( morx )
-#define FT_VALIDATE_bsln  FT_VALIDATE_GX_BITFIELD( bsln )
-#define FT_VALIDATE_just  FT_VALIDATE_GX_BITFIELD( just )
-#define FT_VALIDATE_kern  FT_VALIDATE_GX_BITFIELD( kern )
-#define FT_VALIDATE_opbd  FT_VALIDATE_GX_BITFIELD( opbd )
-#define FT_VALIDATE_trak  FT_VALIDATE_GX_BITFIELD( trak )
-#define FT_VALIDATE_prop  FT_VALIDATE_GX_BITFIELD( prop )
-#define FT_VALIDATE_lcar  FT_VALIDATE_GX_BITFIELD( lcar )
-
-#define FT_VALIDATE_GX  ( FT_VALIDATE_feat | \
-                          FT_VALIDATE_mort | \
-                          FT_VALIDATE_morx | \
-                          FT_VALIDATE_bsln | \
-                          FT_VALIDATE_just | \
-                          FT_VALIDATE_kern | \
-                          FT_VALIDATE_opbd | \
-                          FT_VALIDATE_trak | \
-                          FT_VALIDATE_prop | \
-                          FT_VALIDATE_lcar )
-
-

    -
    -

    A list of bit-field constants used with FT_TrueTypeGX_Validate to indicate which TrueTypeGX/AAT Type tables should be validated.

    -

    -
    values
    -

    - - - - - - - - - - - - -
    FT_VALIDATE_feat -

    Validate ‘feat’ table.

    -
    FT_VALIDATE_mort -

    Validate ‘mort’ table.

    -
    FT_VALIDATE_morx -

    Validate ‘morx’ table.

    -
    FT_VALIDATE_bsln -

    Validate ‘bsln’ table.

    -
    FT_VALIDATE_just -

    Validate ‘just’ table.

    -
    FT_VALIDATE_kern -

    Validate ‘kern’ table.

    -
    FT_VALIDATE_opbd -

    Validate ‘opbd’ table.

    -
    FT_VALIDATE_trak -

    Validate ‘trak’ table.

    -
    FT_VALIDATE_prop -

    Validate ‘prop’ table.

    -
    FT_VALIDATE_lcar -

    Validate ‘lcar’ table.

    -
    FT_VALIDATE_GX -

    Validate all TrueTypeGX tables (feat, mort, morx, bsln, just, kern, opbd, trak, prop and lcar).

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_TrueTypeGX_Validate

    -
    -Defined in FT_GX_VALIDATE_H (freetype/ftgxval.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_TrueTypeGX_Validate( FT_Face   face,
-                          FT_UInt   validation_flags,
-                          FT_Bytes  tables[FT_VALIDATE_GX_LENGTH],
-                          FT_UInt   table_length );
-
-

    -
    -

    Validate various TrueTypeGX tables to assure that all offsets and indices are valid. The idea is that a higher-level library which actually does the text layout can access those tables without error checking (which can be quite time consuming).

    -

    -
    input
    -

    - - - - -
    face -

    A handle to the input face.

    -
    validation_flags -

    A bit field which specifies the tables to be validated. See FT_VALIDATE_GXXXX for possible values.

    -
    table_length -

    The size of the ‘tables’ array. Normally, FT_VALIDATE_GX_LENGTH should be passed.

    -
    -
    -
    output
    -

    - - -
    tables -

    The array where all validated sfnt tables are stored. The array itself must be allocated by a client.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    This function only works with TrueTypeGX fonts, returning an error otherwise.

    -

    After use, the application should deallocate the buffers pointed to by each ‘tables’ element, by calling FT_TrueTypeGX_Free. A NULL value indicates that the table either doesn't exist in the font, the application hasn't asked for validation, or the validator doesn't have the ability to validate the sfnt table.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_TrueTypeGX_Free

    -
    -Defined in FT_GX_VALIDATE_H (freetype/ftgxval.h). -

    -
    -
-  FT_EXPORT( void )
-  FT_TrueTypeGX_Free( FT_Face   face,
-                      FT_Bytes  table );
-
-

    -
    -

    Free the buffer allocated by TrueTypeGX validator.

    -

    -
    input
    -

    - - - -
    face -

    A handle to the input face.

    -
    table -

    The pointer to the buffer allocated by FT_TrueTypeGX_Validate.

    -
    -
    -
    note
    -

    This function must be used to free the buffer allocated by FT_TrueTypeGX_Validate only.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_VALIDATE_CKERNXXX

    -
    -Defined in FT_GX_VALIDATE_H (freetype/ftgxval.h). -

    -
    -
-#define FT_VALIDATE_MS     ( FT_VALIDATE_GX_START << 0 )
-#define FT_VALIDATE_APPLE  ( FT_VALIDATE_GX_START << 1 )
-
-#define FT_VALIDATE_CKERN  ( FT_VALIDATE_MS | FT_VALIDATE_APPLE )
-
-

    -
    -

    A list of bit-field constants used with FT_ClassicKern_Validate to indicate the classic kern dialect or dialects. If the selected type doesn't fit, FT_ClassicKern_Validate regards the table as invalid.

    -

    -
    values
    -

    - - - - -
    FT_VALIDATE_MS -

    Handle the ‘kern’ table as a classic Microsoft kern table.

    -
    FT_VALIDATE_APPLE -

    Handle the ‘kern’ table as a classic Apple kern table.

    -
    FT_VALIDATE_CKERN -

    Handle the ‘kern’ as either classic Apple or Microsoft kern table.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_ClassicKern_Validate

    -
    -Defined in FT_GX_VALIDATE_H (freetype/ftgxval.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_ClassicKern_Validate( FT_Face    face,
-                           FT_UInt    validation_flags,
-                           FT_Bytes  *ckern_table );
-
-

    -
    -

    Validate classic (16-bit format) kern table to assure that the offsets and indices are valid. The idea is that a higher-level library which actually does the text layout can access those tables without error checking (which can be quite time consuming).

    -

    The ‘kern’ table validator in FT_TrueTypeGX_Validate deals with both the new 32-bit format and the classic 16-bit format, while FT_ClassicKern_Validate only supports the classic 16-bit format.

    -

    -
    input
    -

    - - - -
    face -

    A handle to the input face.

    -
    validation_flags -

    A bit field which specifies the dialect to be validated. See FT_VALIDATE_CKERNXXX for possible values.

    -
    -
    -
    output
    -

    - - -
    ckern_table -

    A pointer to the kern table.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    After use, the application should deallocate the buffers pointed to by ‘ckern_table’, by calling FT_ClassicKern_Free. A NULL value indicates that the table doesn't exist in the font.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_ClassicKern_Free

    -
    -Defined in FT_GX_VALIDATE_H (freetype/ftgxval.h). -

    -
    -
-  FT_EXPORT( void )
-  FT_ClassicKern_Free( FT_Face   face,
-                       FT_Bytes  table );
-
-

    -
    -

    Free the buffer allocated by classic Kern validator.

    -

    -
    input
    -

    - - - -
    face -

    A handle to the input face.

    -
    table -

    The pointer to the buffer that is allocated by FT_ClassicKern_Validate.

    -
    -
    -
    note
    -

    This function must be used to free the buffer allocated by FT_ClassicKern_Validate only.

    -
    -
    -
    - - -
    [Index][TOC]
    - - - diff --git a/docs/reference/ft2-gzip.html b/docs/reference/ft2-gzip.html deleted file mode 100644 index 698dc74..0000000 --- a/docs/reference/ft2-gzip.html +++ /dev/null @@ -1,94 +0,0 @@ - - - - -FreeType-2.4.9 API Reference - - - - - - -
    [Index][TOC]
    -

    FreeType-2.4.9 API Reference

    - -

    -GZIP Streams -

    -

    Synopsis

    - - -
    FT_Stream_OpenGzip


    - -
    -

    This section contains the declaration of Gzip-specific functions.

    -

    -
    -

    FT_Stream_OpenGzip

    -
    -Defined in FT_GZIP_H (freetype/ftgzip.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Stream_OpenGzip( FT_Stream  stream,
-                      FT_Stream  source );
-
-

    -
    -

    Open a new stream to parse gzip-compressed font files. This is mainly used to support the compressed ‘*.pcf.gz’ fonts that come with XFree86.

    -

    -
    input
    -

    - - - -
    stream -

    The target embedding stream.

    -
    source -

    The source stream.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    The source stream must be opened before calling this function.

    -

    Calling the internal function ‘FT_Stream_Close’ on the new stream will not call ‘FT_Stream_Close’ on the source stream. None of the stream objects will be released to the heap.

    -

    The stream implementation is very basic and resets the decompression process each time seeking backwards is needed within the stream.

    -

    In certain builds of the library, gzip compression recognition is automatically handled when calling FT_New_Face or FT_Open_Face. This means that if no font driver is capable of handling the raw compressed file, the library will try to open a gzipped stream from it and re-open the face with it.

    -

    This function may return ‘FT_Err_Unimplemented_Feature’ if your build of FreeType was not compiled with zlib support.

    -
    -
    -
    - - -
    [Index][TOC]
    - - - diff --git a/docs/reference/ft2-header_file_macros.html b/docs/reference/ft2-header_file_macros.html deleted file mode 100644 index b94ef5e..0000000 --- a/docs/reference/ft2-header_file_macros.html +++ /dev/null @@ -1,853 +0,0 @@ - - - - -FreeType-2.4.9 API Reference - - - - - - -
    [Index][TOC]
    -

    FreeType-2.4.9 API Reference

    - -

    -Header File Macros -

    -

    Synopsis

    - - - - - - - - - - - - - - - - - - - - - - - - - -
    FT_CONFIG_CONFIG_HFT_WINFONTS_H
    FT_CONFIG_STANDARD_LIBRARY_HFT_GLYPH_H
    FT_CONFIG_OPTIONS_HFT_BITMAP_H
    FT_CONFIG_MODULES_HFT_BBOX_H
    FT_FREETYPE_HFT_CACHE_H
    FT_ERRORS_HFT_CACHE_IMAGE_H
    FT_MODULE_ERRORS_HFT_CACHE_SMALL_BITMAPS_H
    FT_SYSTEM_HFT_CACHE_CHARMAP_H
    FT_IMAGE_HFT_MAC_H
    FT_TYPES_HFT_MULTIPLE_MASTERS_H
    FT_LIST_HFT_SFNT_NAMES_H
    FT_OUTLINE_HFT_OPENTYPE_VALIDATE_H
    FT_SIZES_HFT_GX_VALIDATE_H
    FT_MODULE_HFT_PFR_H
    FT_RENDER_HFT_STROKER_H
    FT_TYPE1_TABLES_HFT_SYNTHESIS_H
    FT_TRUETYPE_IDS_HFT_XFREE86_H
    FT_TRUETYPE_TABLES_HFT_TRIGONOMETRY_H
    FT_TRUETYPE_TAGS_HFT_LCD_FILTER_H
    FT_BDF_HFT_UNPATENTED_HINTING_H
    FT_CID_HFT_INCREMENTAL_H
    FT_GZIP_HFT_GASP_H
    FT_LZW_HFT_ADVANCES_H
    FT_BZIP2_H


    - -
    -

    The following macros are defined to the name of specific FreeType 2 header files. They can be used directly in #include statements as in:

    -
    -  #include FT_FREETYPE_H                                           
-  #include FT_MULTIPLE_MASTERS_H                                   
-  #include FT_GLYPH_H                                              
-
    -

    There are several reasons why we are now using macros to name public header files. The first one is that such macros are not limited to the infamous 8.3 naming rule required by DOS (and ‘FT_MULTIPLE_MASTERS_H’ is a lot more meaningful than ‘ftmm.h’).

    -

    The second reason is that it allows for more flexibility in the way FreeType 2 is installed on a given system.

    -

    -
    -

    FT_CONFIG_CONFIG_H

    -
    -
-#ifndef FT_CONFIG_CONFIG_H
-#define FT_CONFIG_CONFIG_H  <freetype/config/ftconfig.h>
-#endif
-
-

    -
    -

    A macro used in #include statements to name the file containing FreeType 2 configuration data.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_CONFIG_STANDARD_LIBRARY_H

    -
    -
-#ifndef FT_CONFIG_STANDARD_LIBRARY_H
-#define FT_CONFIG_STANDARD_LIBRARY_H  <freetype/config/ftstdlib.h>
-#endif
-
-

    -
    -

    A macro used in #include statements to name the file containing FreeType 2 interface to the standard C library functions.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_CONFIG_OPTIONS_H

    -
    -
-#ifndef FT_CONFIG_OPTIONS_H
-#define FT_CONFIG_OPTIONS_H  <freetype/config/ftoption.h>
-#endif
-
-

    -
    -

    A macro used in #include statements to name the file containing FreeType 2 project-specific configuration options.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_CONFIG_MODULES_H

    -
    -
-#ifndef FT_CONFIG_MODULES_H
-#define FT_CONFIG_MODULES_H  <freetype/config/ftmodule.h>
-#endif
-
-

    -
    -

    A macro used in #include statements to name the file containing the list of FreeType 2 modules that are statically linked to new library instances in FT_Init_FreeType.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_FREETYPE_H

    -
    -
-#define FT_FREETYPE_H  <freetype/freetype.h>
-
-

    -
    -

    A macro used in #include statements to name the file containing the base FreeType 2 API.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_ERRORS_H

    -
    -
-#define FT_ERRORS_H  <freetype/fterrors.h>
-
-

    -
    -

    A macro used in #include statements to name the file containing the list of FreeType 2 error codes (and messages).

    -

    It is included by FT_FREETYPE_H.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_MODULE_ERRORS_H

    -
    -
-#define FT_MODULE_ERRORS_H  <freetype/ftmoderr.h>
-
-

    -
    -

    A macro used in #include statements to name the file containing the list of FreeType 2 module error offsets (and messages).

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_SYSTEM_H

    -
    -
-#define FT_SYSTEM_H  <freetype/ftsystem.h>
-
-

    -
    -

    A macro used in #include statements to name the file containing the FreeType 2 interface to low-level operations (i.e., memory management and stream i/o).

    -

    It is included by FT_FREETYPE_H.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_IMAGE_H

    -
    -
-#define FT_IMAGE_H  <freetype/ftimage.h>
-
-

    -
    -

    A macro used in #include statements to name the file containing type definitions related to glyph images (i.e., bitmaps, outlines, scan-converter parameters).

    -

    It is included by FT_FREETYPE_H.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_TYPES_H

    -
    -
-#define FT_TYPES_H  <freetype/fttypes.h>
-
-

    -
    -

    A macro used in #include statements to name the file containing the basic data types defined by FreeType 2.

    -

    It is included by FT_FREETYPE_H.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_LIST_H

    -
    -
-#define FT_LIST_H  <freetype/ftlist.h>
-
-

    -
    -

    A macro used in #include statements to name the file containing the list management API of FreeType 2.

    -

    (Most applications will never need to include this file.)

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_OUTLINE_H

    -
    -
-#define FT_OUTLINE_H  <freetype/ftoutln.h>
-
-

    -
    -

    A macro used in #include statements to name the file containing the scalable outline management API of FreeType 2.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_SIZES_H

    -
    -
-#define FT_SIZES_H  <freetype/ftsizes.h>
-
-

    -
    -

    A macro used in #include statements to name the file containing the API which manages multiple FT_Size objects per face.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_MODULE_H

    -
    -
-#define FT_MODULE_H  <freetype/ftmodapi.h>
-
-

    -
    -

    A macro used in #include statements to name the file containing the module management API of FreeType 2.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_RENDER_H

    -
    -
-#define FT_RENDER_H  <freetype/ftrender.h>
-
-

    -
    -

    A macro used in #include statements to name the file containing the renderer module management API of FreeType 2.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_TYPE1_TABLES_H

    -
    -
-#define FT_TYPE1_TABLES_H  <freetype/t1tables.h>
-
-

    -
    -

    A macro used in #include statements to name the file containing the types and API specific to the Type 1 format.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_TRUETYPE_IDS_H

    -
    -
-#define FT_TRUETYPE_IDS_H  <freetype/ttnameid.h>
-
-

    -
    -

    A macro used in #include statements to name the file containing the enumeration values which identify name strings, languages, encodings, etc. This file really contains a large set of constant macro definitions, taken from the TrueType and OpenType specifications.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_TRUETYPE_TABLES_H

    -
    -
-#define FT_TRUETYPE_TABLES_H  <freetype/tttables.h>
-
-

    -
    -

    A macro used in #include statements to name the file containing the types and API specific to the TrueType (as well as OpenType) format.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_TRUETYPE_TAGS_H

    -
    -
-#define FT_TRUETYPE_TAGS_H  <freetype/tttags.h>
-
-

    -
    -

    A macro used in #include statements to name the file containing the definitions of TrueType four-byte ‘tags’ which identify blocks in SFNT-based font formats (i.e., TrueType and OpenType).

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_BDF_H

    -
    -
-#define FT_BDF_H  <freetype/ftbdf.h>
-
-

    -
    -

    A macro used in #include statements to name the file containing the definitions of an API which accesses BDF-specific strings from a face.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_CID_H

    -
    -
-#define FT_CID_H  <freetype/ftcid.h>
-
-

    -
    -

    A macro used in #include statements to name the file containing the definitions of an API which access CID font information from a face.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_GZIP_H

    -
    -
-#define FT_GZIP_H  <freetype/ftgzip.h>
-
-

    -
    -

    A macro used in #include statements to name the file containing the definitions of an API which supports gzip-compressed files.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_LZW_H

    -
    -
-#define FT_LZW_H  <freetype/ftlzw.h>
-
-

    -
    -

    A macro used in #include statements to name the file containing the definitions of an API which supports LZW-compressed files.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_BZIP2_H

    -
    -
-#define FT_BZIP2_H  <freetype/ftbzip2.h>
-
-

    -
    -

    A macro used in #include statements to name the file containing the definitions of an API which supports bzip2-compressed files.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_WINFONTS_H

    -
    -
-#define FT_WINFONTS_H   <freetype/ftwinfnt.h>
-
-

    -
    -

    A macro used in #include statements to name the file containing the definitions of an API which supports Windows FNT files.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_GLYPH_H

    -
    -
-#define FT_GLYPH_H  <freetype/ftglyph.h>
-
-

    -
    -

    A macro used in #include statements to name the file containing the API of the optional glyph management component.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_BITMAP_H

    -
    -
-#define FT_BITMAP_H  <freetype/ftbitmap.h>
-
-

    -
    -

    A macro used in #include statements to name the file containing the API of the optional bitmap conversion component.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_BBOX_H

    -
    -
-#define FT_BBOX_H  <freetype/ftbbox.h>
-
-

    -
    -

    A macro used in #include statements to name the file containing the API of the optional exact bounding box computation routines.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_CACHE_H

    -
    -
-#define FT_CACHE_H  <freetype/ftcache.h>
-
-

    -
    -

    A macro used in #include statements to name the file containing the API of the optional FreeType 2 cache sub-system.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_CACHE_IMAGE_H

    -
    -
-#define FT_CACHE_IMAGE_H  FT_CACHE_H
-
-

    -
    -

    A macro used in #include statements to name the file containing the ‘glyph image’ API of the FreeType 2 cache sub-system.

    -

    It is used to define a cache for FT_Glyph elements. You can also use the API defined in FT_CACHE_SMALL_BITMAPS_H if you only need to store small glyph bitmaps, as it will use less memory.

    -

    This macro is deprecated. Simply include FT_CACHE_H to have all glyph image-related cache declarations.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_CACHE_SMALL_BITMAPS_H

    -
    -
-#define FT_CACHE_SMALL_BITMAPS_H  FT_CACHE_H
-
-

    -
    -

    A macro used in #include statements to name the file containing the ‘small bitmaps’ API of the FreeType 2 cache sub-system.

    -

    It is used to define a cache for small glyph bitmaps in a relatively memory-efficient way. You can also use the API defined in FT_CACHE_IMAGE_H if you want to cache arbitrary glyph images, including scalable outlines.

    -

    This macro is deprecated. Simply include FT_CACHE_H to have all small bitmaps-related cache declarations.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_CACHE_CHARMAP_H

    -
    -
-#define FT_CACHE_CHARMAP_H  FT_CACHE_H
-
-

    -
    -

    A macro used in #include statements to name the file containing the ‘charmap’ API of the FreeType 2 cache sub-system.

    -

    This macro is deprecated. Simply include FT_CACHE_H to have all charmap-based cache declarations.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_MAC_H

    -
    -
-#define FT_MAC_H  <freetype/ftmac.h>
-
-

    -
    -

    A macro used in #include statements to name the file containing the Macintosh-specific FreeType 2 API. The latter is used to access fonts embedded in resource forks.

    -

    This header file must be explicitly included by client applications compiled on the Mac (note that the base API still works though).

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_MULTIPLE_MASTERS_H

    -
    -
-#define FT_MULTIPLE_MASTERS_H  <freetype/ftmm.h>
-
-

    -
    -

    A macro used in #include statements to name the file containing the optional multiple-masters management API of FreeType 2.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_SFNT_NAMES_H

    -
    -
-#define FT_SFNT_NAMES_H  <freetype/ftsnames.h>
-
-

    -
    -

    A macro used in #include statements to name the file containing the optional FreeType 2 API which accesses embedded ‘name’ strings in SFNT-based font formats (i.e., TrueType and OpenType).

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_OPENTYPE_VALIDATE_H

    -
    -
-#define FT_OPENTYPE_VALIDATE_H  <freetype/ftotval.h>
-
-

    -
    -

    A macro used in #include statements to name the file containing the optional FreeType 2 API which validates OpenType tables (BASE, GDEF, GPOS, GSUB, JSTF).

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_GX_VALIDATE_H

    -
    -
-#define FT_GX_VALIDATE_H  <freetype/ftgxval.h>
-
-

    -
    -

    A macro used in #include statements to name the file containing the optional FreeType 2 API which validates TrueTypeGX/AAT tables (feat, mort, morx, bsln, just, kern, opbd, trak, prop).

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_PFR_H

    -
    -
-#define FT_PFR_H  <freetype/ftpfr.h>
-
-

    -
    -

    A macro used in #include statements to name the file containing the FreeType 2 API which accesses PFR-specific data.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_STROKER_H

    -
    -
-#define FT_STROKER_H  <freetype/ftstroke.h>
-
-

    -
    -

    A macro used in #include statements to name the file containing the FreeType 2 API which provides functions to stroke outline paths.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_SYNTHESIS_H

    -
    -
-#define FT_SYNTHESIS_H  <freetype/ftsynth.h>
-
-

    -
    -

    A macro used in #include statements to name the file containing the FreeType 2 API which performs artificial obliquing and emboldening.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_XFREE86_H

    -
    -
-#define FT_XFREE86_H  <freetype/ftxf86.h>
-
-

    -
    -

    A macro used in #include statements to name the file containing the FreeType 2 API which provides functions specific to the XFree86 and X.Org X11 servers.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_TRIGONOMETRY_H

    -
    -
-#define FT_TRIGONOMETRY_H  <freetype/fttrigon.h>
-
-

    -
    -

    A macro used in #include statements to name the file containing the FreeType 2 API which performs trigonometric computations (e.g., cosines and arc tangents).

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_LCD_FILTER_H

    -
    -
-#define FT_LCD_FILTER_H  <freetype/ftlcdfil.h>
-
-

    -
    -

    A macro used in #include statements to name the file containing the FreeType 2 API which performs color filtering for subpixel rendering.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_UNPATENTED_HINTING_H

    -
    -
-#define FT_UNPATENTED_HINTING_H  <freetype/ttunpat.h>
-
-

    -
    -

    A macro used in #include statements to name the file containing the FreeType 2 API which performs color filtering for subpixel rendering.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_INCREMENTAL_H

    -
    -
-#define FT_INCREMENTAL_H  <freetype/ftincrem.h>
-
-

    -
    -

    A macro used in #include statements to name the file containing the FreeType 2 API which performs color filtering for subpixel rendering.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_GASP_H

    -
    -
-#define FT_GASP_H  <freetype/ftgasp.h>
-
-

    -
    -

    A macro used in #include statements to name the file containing the FreeType 2 API which returns entries from the TrueType GASP table.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_ADVANCES_H

    -
    -
-#define FT_ADVANCES_H  <freetype/ftadvanc.h>
-
-

    -
    -

    A macro used in #include statements to name the file containing the FreeType 2 API which returns individual and ranged glyph advances.

    -

    -
    -
    - - -
    [Index][TOC]
    - - - diff --git a/docs/reference/ft2-incremental.html b/docs/reference/ft2-incremental.html deleted file mode 100644 index cb14e16..0000000 --- a/docs/reference/ft2-incremental.html +++ /dev/null @@ -1,401 +0,0 @@ - - - - -FreeType-2.4.9 API Reference - - - - - - -
    [Index][TOC]
    -

    FreeType-2.4.9 API Reference

    - -

    -Incremental Loading -

    -

    Synopsis

    - - - - - - -
    FT_IncrementalFT_Incremental_GetGlyphMetricsFunc
    FT_Incremental_MetricsRecFT_Incremental_FuncsRec
    FT_Incremental_MetricsFT_Incremental_InterfaceRec
    FT_Incremental_GetGlyphDataFuncFT_Incremental_Interface
    FT_Incremental_FreeGlyphDataFuncFT_PARAM_TAG_INCREMENTAL


    - -
    -

    This section contains various functions used to perform so-called ‘incremental’ glyph loading. This is a mode where all glyphs loaded from a given FT_Face are provided by the client application,

    -

    Apart from that, all other tables are loaded normally from the font file. This mode is useful when FreeType is used within another engine, e.g., a PostScript Imaging Processor.

    -

    To enable this mode, you must use FT_Open_Face, passing an FT_Parameter with the FT_PARAM_TAG_INCREMENTAL tag and an FT_Incremental_Interface value. See the comments for FT_Incremental_InterfaceRec for an example.

    -

    -
    -

    FT_Incremental

    -
    -Defined in FT_INCREMENTAL_H (freetype/ftincrem.h). -

    -
    -
-  typedef struct FT_IncrementalRec_*  FT_Incremental;
-
-

    -
    -

    An opaque type describing a user-provided object used to implement ‘incremental’ glyph loading within FreeType. This is used to support embedded fonts in certain environments (e.g., PostScript interpreters), where the glyph data isn't in the font file, or must be overridden by different values.

    -

    -
    note
    -

    It is up to client applications to create and implement FT_Incremental objects, as long as they provide implementations for the methods FT_Incremental_GetGlyphDataFunc, FT_Incremental_FreeGlyphDataFunc and FT_Incremental_GetGlyphMetricsFunc.

    -

    See the description of FT_Incremental_InterfaceRec to understand how to use incremental objects with FreeType.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Incremental_MetricsRec

    -
    -Defined in FT_INCREMENTAL_H (freetype/ftincrem.h). -

    -
    -
-  typedef struct  FT_Incremental_MetricsRec_
-  {
-    FT_Long  bearing_x;
-    FT_Long  bearing_y;
-    FT_Long  advance;
-    FT_Long  advance_v;     /* since 2.3.12 */
-
-  } FT_Incremental_MetricsRec;
-
-

    -
    -

    A small structure used to contain the basic glyph metrics returned by the FT_Incremental_GetGlyphMetricsFunc method.

    -

    -
    fields
    -

    - - - - - -
    bearing_x -

    Left bearing, in font units.

    -
    bearing_y -

    Top bearing, in font units.

    -
    advance -

    Horizontal component of glyph advance, in font units.

    -
    advance_v -

    Vertical component of glyph advance, in font units.

    -
    -
    -
    note
    -

    These correspond to horizontal or vertical metrics depending on the value of the ‘vertical’ argument to the function FT_Incremental_GetGlyphMetricsFunc.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Incremental_Metrics

    -
    -Defined in FT_INCREMENTAL_H (freetype/ftincrem.h). -

    -
    -
-   typedef struct FT_Incremental_MetricsRec_*  FT_Incremental_Metrics;
-
-

    -
    -

    A handle to an FT_Incremental_MetricsRec structure.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Incremental_GetGlyphDataFunc

    -
    -Defined in FT_INCREMENTAL_H (freetype/ftincrem.h). -

    -
    -
-  typedef FT_Error
-  (*FT_Incremental_GetGlyphDataFunc)( FT_Incremental  incremental,
-                                      FT_UInt         glyph_index,
-                                      FT_Data*        adata );
-
-

    -
    -

    A function called by FreeType to access a given glyph's data bytes during FT_Load_Glyph or FT_Load_Char if incremental loading is enabled.

    -

    Note that the format of the glyph's data bytes depends on the font file format. For TrueType, it must correspond to the raw bytes within the ‘glyf’ table. For PostScript formats, it must correspond to the unencrypted charstring bytes, without any ‘lenIV’ header. It is undefined for any other format.

    -

    -
    input
    -

    - - - -
    incremental -

    Handle to an opaque FT_Incremental handle provided by the client application.

    -
    glyph_index -

    Index of relevant glyph.

    -
    -
    -
    output
    -

    - - -
    adata -

    A structure describing the returned glyph data bytes (which will be accessed as a read-only byte block).

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    If this function returns successfully the method FT_Incremental_FreeGlyphDataFunc will be called later to release the data bytes.

    -

    Nested calls to FT_Incremental_GetGlyphDataFunc can happen for compound glyphs.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Incremental_FreeGlyphDataFunc

    -
    -Defined in FT_INCREMENTAL_H (freetype/ftincrem.h). -

    -
    -
-  typedef void
-  (*FT_Incremental_FreeGlyphDataFunc)( FT_Incremental  incremental,
-                                       FT_Data*        data );
-
-

    -
    -

    A function used to release the glyph data bytes returned by a successful call to FT_Incremental_GetGlyphDataFunc.

    -

    -
    input
    -

    - - - -
    incremental -

    A handle to an opaque FT_Incremental handle provided by the client application.

    -
    data -

    A structure describing the glyph data bytes (which will be accessed as a read-only byte block).

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Incremental_GetGlyphMetricsFunc

    -
    -Defined in FT_INCREMENTAL_H (freetype/ftincrem.h). -

    -
    -
-  typedef FT_Error
-  (*FT_Incremental_GetGlyphMetricsFunc)
-                      ( FT_Incremental              incremental,
-                        FT_UInt                     glyph_index,
-                        FT_Bool                     vertical,
-                        FT_Incremental_MetricsRec  *ametrics );
-
-

    -
    -

    A function used to retrieve the basic metrics of a given glyph index before accessing its data. This is necessary because, in certain formats like TrueType, the metrics are stored in a different place from the glyph images proper.

    -

    -
    input
    -

    - - - - - -
    incremental -

    A handle to an opaque FT_Incremental handle provided by the client application.

    -
    glyph_index -

    Index of relevant glyph.

    -
    vertical -

    If true, return vertical metrics.

    -
    ametrics -

    This parameter is used for both input and output. The original glyph metrics, if any, in font units. If metrics are not available all the values must be set to zero.

    -
    -
    -
    output
    -

    - - -
    ametrics -

    The replacement glyph metrics in font units.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Incremental_FuncsRec

    -
    -Defined in FT_INCREMENTAL_H (freetype/ftincrem.h). -

    -
    -
-  typedef struct  FT_Incremental_FuncsRec_
-  {
-    FT_Incremental_GetGlyphDataFunc     get_glyph_data;
-    FT_Incremental_FreeGlyphDataFunc    free_glyph_data;
-    FT_Incremental_GetGlyphMetricsFunc  get_glyph_metrics;
-
-  } FT_Incremental_FuncsRec;
-
-

    -
    -

    A table of functions for accessing fonts that load data incrementally. Used in FT_Incremental_InterfaceRec.

    -

    -
    fields
    -

    - - - - -
    get_glyph_data -

    The function to get glyph data. Must not be null.

    -
    free_glyph_data -

    The function to release glyph data. Must not be null.

    -
    get_glyph_metrics -

    The function to get glyph metrics. May be null if the font does not provide overriding glyph metrics.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Incremental_InterfaceRec

    -
    -Defined in FT_INCREMENTAL_H (freetype/ftincrem.h). -

    -
    -
-  typedef struct  FT_Incremental_InterfaceRec_
-  {
-    const FT_Incremental_FuncsRec*  funcs;
-    FT_Incremental                  object;
-
-  } FT_Incremental_InterfaceRec;
-
-

    -
    -

    A structure to be used with FT_Open_Face to indicate that the user wants to support incremental glyph loading. You should use it with FT_PARAM_TAG_INCREMENTAL as in the following example:

    -
    -  FT_Incremental_InterfaceRec  inc_int;
-  FT_Parameter                 parameter;
-  FT_Open_Args                 open_args;
-
-
-  // set up incremental descriptor
-  inc_int.funcs  = my_funcs;
-  inc_int.object = my_object;
-
-  // set up optional parameter
-  parameter.tag  = FT_PARAM_TAG_INCREMENTAL;
-  parameter.data = &inc_int;
-
-  // set up FT_Open_Args structure
-  open_args.flags      = FT_OPEN_PATHNAME | FT_OPEN_PARAMS;
-  open_args.pathname   = my_font_pathname;
-  open_args.num_params = 1;
-  open_args.params     = &parameter; // we use one optional argument
-
-  // open the font
-  error = FT_Open_Face( library, &open_args, index, &face );
-  ...
-
    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Incremental_Interface

    -
    -Defined in FT_INCREMENTAL_H (freetype/ftincrem.h). -

    -
    -
-  typedef FT_Incremental_InterfaceRec*   FT_Incremental_Interface;
-
-

    -
    -

    A pointer to an FT_Incremental_InterfaceRec structure.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_PARAM_TAG_INCREMENTAL

    -
    -Defined in FT_INCREMENTAL_H (freetype/ftincrem.h). -

    -
    -
-#define FT_PARAM_TAG_INCREMENTAL  FT_MAKE_TAG( 'i', 'n', 'c', 'r' )
-
-

    -
    -

    A constant used as the tag of FT_Parameter structures to indicate an incremental loading object to be used by FreeType.

    -

    -
    -
    - - -
    [Index][TOC]
    - - - diff --git a/docs/reference/ft2-index.html b/docs/reference/ft2-index.html deleted file mode 100644 index fb674a2..0000000 --- a/docs/reference/ft2-index.html +++ /dev/null @@ -1,294 +0,0 @@ - - - - -FreeType-2.4.9 API Reference - - - - - -
    [TOC]
    -

    FreeType-2.4.9 API Reference

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    BDF_PROPERTY_TYPE_ATOMFT_LcdFilterFT_Stroker_ParseOutline
    BDF_PROPERTY_TYPE_CARDINALFT_LIST_HFT_Stroker_Rewind
    BDF_PROPERTY_TYPE_INTEGERFT_LibraryFT_Stroker_Set
    BDF_PROPERTY_TYPE_NONEFT_Library_SetLcdFilterFT_StrokerBorder
    BDF_PropertyFT_Library_SetLcdFilterWeightsFT_SUBGLYPH_FLAG_2X2
    BDF_PropertyRecFT_Library_VersionFT_SUBGLYPH_FLAG_ARGS_ARE_WORDS
    CID_FaceDictFT_ListFT_SUBGLYPH_FLAG_ARGS_ARE_XY_VALUES
    CID_FaceDictRecFT_List_AddFT_SUBGLYPH_FLAG_ROUND_XY_TO_GRID
    CID_FaceInfoFT_List_DestructorFT_SUBGLYPH_FLAG_SCALE
    CID_FaceInfoRecFT_List_FinalizeFT_SUBGLYPH_FLAG_USE_MY_METRICS
    CID_InfoFT_List_FindFT_SUBGLYPH_FLAG_XXX
    FREETYPE_MAJORFT_List_InsertFT_SUBGLYPH_FLAG_XY_SCALE
    FREETYPE_MINORFT_List_IterateFT_SubGlyph
    FREETYPE_PATCHFT_List_IteratorFT_SYNTHESIS_H
    FREETYPE_XXXFT_List_RemoveFT_SYSTEM_H
    FT_Activate_SizeFT_List_UpFT_Tag
    FT_ADVANCE_FLAG_FAST_ONLYFT_ListNodeFT_Tan
    FT_ADVANCES_HFT_ListNodeRecFT_TRIGONOMETRY_H
    FT_Add_Default_ModulesFT_ListRecFT_TRUETYPE_ENGINE_TYPE_NONE
    FT_Add_ModuleFT_LOAD_CROP_BITMAPFT_TRUETYPE_ENGINE_TYPE_PATENTED
    FT_Alloc_FuncFT_LOAD_DEFAULTFT_TRUETYPE_ENGINE_TYPE_UNPATENTED
    FT_ANGLE_2PIFT_LOAD_FORCE_AUTOHINTFT_TRUETYPE_IDS_H
    FT_ANGLE_PIFT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTHFT_TRUETYPE_TABLES_H
    FT_ANGLE_PI2FT_LOAD_IGNORE_TRANSFORMFT_TRUETYPE_TAGS_H
    FT_ANGLE_PI4FT_LOAD_LINEAR_DESIGNFT_TrueTypeEngineType
    FT_AngleFT_LOAD_MONOCHROMEFT_TrueTypeGX_Free
    FT_Angle_DiffFT_LOAD_NO_AUTOHINTFT_TrueTypeGX_Validate
    FT_Atan2FT_LOAD_NO_BITMAPFT_TYPE1_TABLES_H
    FT_Attach_FileFT_LOAD_NO_HINTINGFT_TYPES_H
    FT_Attach_StreamFT_LOAD_NO_RECURSEFT_UFWord
    FT_BBOX_HFT_LOAD_NO_SCALEFT_UInt
    FT_BBoxFT_LOAD_PEDANTICFT_UInt16
    FT_BDF_HFT_LOAD_RENDERFT_UInt32
    FT_BITMAP_HFT_LOAD_TARGET_LCDFT_ULong
    FT_BitmapFT_LOAD_TARGET_LCD_VFT_UNPATENTED_HINTING_H
    FT_Bitmap_ConvertFT_LOAD_TARGET_LIGHTFT_UnitVector
    FT_Bitmap_CopyFT_LOAD_TARGET_MODEFT_UShort
    FT_Bitmap_DoneFT_LOAD_TARGET_MONOFT_VALIDATE_APPLE
    FT_Bitmap_EmboldenFT_LOAD_TARGET_NORMALFT_VALIDATE_BASE
    FT_Bitmap_NewFT_LOAD_TARGET_XXXFT_VALIDATE_bsln
    FT_Bitmap_SizeFT_LOAD_VERTICAL_LAYOUTFT_VALIDATE_CKERN
    FT_BitmapGlyphFT_LOAD_XXXFT_VALIDATE_CKERNXXX
    FT_BitmapGlyphRecFT_Load_CharFT_VALIDATE_feat
    FT_BoolFT_Load_GlyphFT_VALIDATE_GDEF
    FT_ByteFT_Load_Sfnt_TableFT_VALIDATE_GPOS
    FT_BytesFT_LongFT_VALIDATE_GSUB
    FT_BZIP2_HFT_LZW_HFT_VALIDATE_GX
    FT_CACHE_CHARMAP_HFT_MAC_HFT_VALIDATE_GX_LENGTH
    FT_CACHE_HFT_MAKE_TAGFT_VALIDATE_GXXXX
    FT_CACHE_IMAGE_HFT_MatrixFT_VALIDATE_JSTF
    FT_CACHE_SMALL_BITMAPS_HFT_Matrix_InvertFT_VALIDATE_just
    FT_CeilFixFT_Matrix_MultiplyFT_VALIDATE_kern
    FT_CharFT_MemoryFT_VALIDATE_lcar
    FT_CharMapFT_MemoryRecFT_VALIDATE_MATH
    FT_CharMapRecFT_MM_AxisFT_VALIDATE_MS
    FT_CID_HFT_MM_VarFT_VALIDATE_mort
    FT_ClassicKern_FreeFT_MODULE_ERRORS_HFT_VALIDATE_morx
    FT_ClassicKern_ValidateFT_MODULE_HFT_VALIDATE_OT
    FT_CONFIG_CONFIG_HFT_ModuleFT_VALIDATE_OTXXX
    FT_CONFIG_MODULES_HFT_Module_ClassFT_VALIDATE_opbd
    FT_CONFIG_OPTIONS_HFT_Module_ConstructorFT_VALIDATE_prop
    FT_CONFIG_STANDARD_LIBRARY_HFT_Module_DestructorFT_VALIDATE_trak
    FT_CosFT_Module_RequesterFT_Var_Axis
    FT_DataFT_MULTIPLE_MASTERS_HFT_Var_Named_Style
    FT_DivFixFT_MulDivFT_Vector
    FT_Done_FaceFT_MulFixFT_Vector_From_Polar
    FT_Done_FreeTypeFT_Multi_MasterFT_Vector_Length
    FT_Done_GlyphFT_New_FaceFT_Vector_Polarize
    FT_Done_LibraryFT_New_Face_From_FONDFT_Vector_Rotate
    FT_Done_SizeFT_New_Face_From_FSRefFT_Vector_Transform
    FT_DriverFT_New_Face_From_FSSpecFT_Vector_Unit
    FT_ENC_TAGFT_New_LibraryFT_WINFONTS_H
    FT_ENCODING_ADOBE_CUSTOMFT_New_Memory_FaceFT_WinFNT_Header
    FT_ENCODING_ADOBE_EXPERTFT_New_SizeFT_WinFNT_HeaderRec
    FT_ENCODING_ADOBE_LATIN_1FT_OffsetFT_WinFNT_ID_CP1250
    FT_ENCODING_ADOBE_STANDARDFT_OPEN_DRIVERFT_WinFNT_ID_CP1251
    FT_ENCODING_APPLE_ROMANFT_OPEN_MEMORYFT_WinFNT_ID_CP1252
    FT_ENCODING_BIG5FT_OPEN_PARAMSFT_WinFNT_ID_CP1253
    FT_ENCODING_GB2312FT_OPEN_PATHNAMEFT_WinFNT_ID_CP1254
    FT_ENCODING_JOHABFT_OPEN_STREAMFT_WinFNT_ID_CP1255
    FT_ENCODING_MS_BIG5FT_OPEN_XXXFT_WinFNT_ID_CP1256
    FT_ENCODING_MS_GB2312FT_OPENTYPE_VALIDATE_HFT_WinFNT_ID_CP1257
    FT_ENCODING_MS_JOHABFT_Open_ArgsFT_WinFNT_ID_CP1258
    FT_ENCODING_MS_SJISFT_Open_FaceFT_WinFNT_ID_CP1361
    FT_ENCODING_MS_SYMBOLFT_OpenType_FreeFT_WinFNT_ID_CP874
    FT_ENCODING_MS_WANSUNGFT_OpenType_ValidateFT_WinFNT_ID_CP932
    FT_ENCODING_NONEFT_ORIENTATION_FILL_LEFTFT_WinFNT_ID_CP936
    FT_ENCODING_OLD_LATIN_2FT_ORIENTATION_FILL_RIGHTFT_WinFNT_ID_CP949
    FT_ENCODING_SJISFT_ORIENTATION_NONEFT_WinFNT_ID_CP950
    FT_ENCODING_UNICODEFT_ORIENTATION_POSTSCRIPTFT_WinFNT_ID_DEFAULT
    FT_ENCODING_WANSUNGFT_ORIENTATION_TRUETYPEFT_WinFNT_ID_MAC
    FT_EncodingFT_OrientationFT_WinFNT_ID_OEM
    FT_ERRORS_HFT_OUTLINE_EVEN_ODD_FILLFT_WinFNT_ID_SYMBOL
    FT_ErrorFT_OUTLINE_FLAGSFT_WinFNT_ID_XXX
    FT_F26Dot6FT_OUTLINE_HFT_XFREE86_H
    FT_F2Dot14FT_OUTLINE_HIGH_PRECISIONFTC_CMapCache
    FT_FACE_FLAG_CID_KEYEDFT_OUTLINE_IGNORE_DROPOUTSFTC_CMapCache_Lookup
    FT_FACE_FLAG_EXTERNAL_STREAMFT_OUTLINE_INCLUDE_STUBSFTC_CMapCache_New
    FT_FACE_FLAG_FAST_GLYPHSFT_OUTLINE_NONEFTC_Face_Requester
    FT_FACE_FLAG_FIXED_SIZESFT_OUTLINE_OWNERFTC_FaceID
    FT_FACE_FLAG_FIXED_WIDTHFT_OUTLINE_REVERSE_FILLFTC_ImageCache
    FT_FACE_FLAG_GLYPH_NAMESFT_OUTLINE_SINGLE_PASSFTC_ImageCache_Lookup
    FT_FACE_FLAG_HINTERFT_OUTLINE_SMART_DROPOUTSFTC_ImageCache_LookupScaler
    FT_FACE_FLAG_HORIZONTALFT_OutlineFTC_ImageCache_New
    FT_FACE_FLAG_KERNINGFT_Outline_CheckFTC_ImageType
    FT_FACE_FLAG_MULTIPLE_MASTERSFT_Outline_ConicToFuncFTC_ImageTypeRec
    FT_FACE_FLAG_SCALABLEFT_Outline_CopyFTC_Manager
    FT_FACE_FLAG_SFNTFT_Outline_CubicToFuncFTC_Manager_Done
    FT_FACE_FLAG_TRICKYFT_Outline_DecomposeFTC_Manager_LookupFace
    FT_FACE_FLAG_VERTICALFT_Outline_DoneFTC_Manager_LookupSize
    FT_FACE_FLAG_XXXFT_Outline_EmboldenFTC_Manager_New
    FT_FaceFT_Outline_FuncsFTC_Manager_RemoveFaceID
    FT_Face_CheckTrueTypePatentsFT_Outline_Get_BBoxFTC_Manager_Reset
    FT_Face_GetCharsOfVariantFT_Outline_Get_BitmapFTC_Node
    FT_Face_GetCharVariantIndexFT_Outline_Get_CBoxFTC_Node_Unref
    FT_Face_GetCharVariantIsDefaultFT_Outline_Get_OrientationFTC_SBit
    FT_Face_GetVariantSelectorsFT_Outline_GetInsideBorderFTC_SBitCache
    FT_Face_GetVariantsOfCharFT_Outline_GetOutsideBorderFTC_SBitCache_Lookup
    FT_Face_InternalFT_Outline_LineToFuncFTC_SBitCache_LookupScaler
    FT_Face_SetUnpatentedHintingFT_Outline_MoveToFuncFTC_SBitCache_New
    FT_FaceRecFT_Outline_NewFTC_SBitRec
    FT_FixedFT_Outline_RenderFTC_Scaler
    FT_FloorFixFT_Outline_ReverseFTC_ScalerRec
    FT_FREETYPE_HFT_Outline_Transformft_encoding_xxx
    FT_Free_FuncFT_Outline_Translateft_glyph_bbox_gridfit
    FT_FSTYPE_BITMAP_EMBEDDING_ONLYFT_OutlineGlyphft_glyph_bbox_pixels
    FT_FSTYPE_EDITABLE_EMBEDDINGFT_OutlineGlyphRecft_glyph_bbox_subpixels
    FT_FSTYPE_INSTALLABLE_EMBEDDINGFT_PARAM_TAG_IGNORE_PREFERRED_FAMILYft_glyph_bbox_truncate
    FT_FSTYPE_NO_SUBSETTINGFT_PARAM_TAG_IGNORE_PREFERRED_SUBFAMILYft_glyph_bbox_unscaled
    FT_FSTYPE_PREVIEW_AND_PRINT_EMBEDDINGFT_PARAM_TAG_INCREMENTALft_glyph_bbox_xxx
    FT_FSTYPE_RESTRICTED_LICENSE_EMBEDDINGFT_PARAM_TAG_UNPATENTED_HINTINGft_glyph_format_bitmap
    FT_FSTYPE_XXXFT_Palette_Modeft_glyph_format_composite
    FT_FWordFT_Parameterft_glyph_format_none
    FT_GASP_DO_GRAYFT_PFR_Hft_glyph_format_outline
    FT_GASP_DO_GRIDFITFT_PIXEL_MODE_GRAYft_glyph_format_plotter
    FT_GASP_HFT_PIXEL_MODE_GRAY2ft_glyph_format_xxx
    FT_GASP_NO_TABLEFT_PIXEL_MODE_GRAY4ft_kerning_default
    FT_GASP_SYMMETRIC_GRIDFITFT_PIXEL_MODE_LCDft_kerning_unfitted
    FT_GASP_SYMMETRIC_SMOOTHINGFT_PIXEL_MODE_LCD_Vft_kerning_unscaled
    FT_GASP_XXXFT_PIXEL_MODE_MONOft_open_driver
    FT_GenericFT_PIXEL_MODE_NONEft_open_memory
    FT_Generic_FinalizerFT_Pixel_Modeft_open_params
    FT_Get_AdvanceFT_Pointerft_open_pathname
    FT_Get_AdvancesFT_Posft_open_stream
    FT_Get_BDF_Charset_IDFT_PropertyTypeft_outline_even_odd_fill
    FT_Get_BDF_PropertyFT_PtrDistft_outline_flags
    FT_Get_Char_IndexFT_RASTER_FLAG_AAft_outline_high_precision
    FT_Get_Charmap_IndexFT_RASTER_FLAG_CLIPft_outline_ignore_dropouts
    FT_Get_CID_From_Glyph_IndexFT_RASTER_FLAG_DEFAULTft_outline_none
    FT_Get_CID_Is_Internally_CID_KeyedFT_RASTER_FLAG_DIRECTft_outline_owner
    FT_Get_CID_Registry_Ordering_SupplementFT_RASTER_FLAG_XXXft_outline_reverse_fill
    FT_Get_CMap_FormatFT_Rasterft_outline_single_pass
    FT_Get_CMap_Language_IDFT_Raster_BitSet_Funcft_palette_mode_rgb
    FT_Get_First_CharFT_Raster_BitTest_Funcft_palette_mode_rgba
    FT_Get_FSType_FlagsFT_Raster_DoneFuncft_pixel_mode_grays
    FT_Get_GaspFT_Raster_Funcsft_pixel_mode_mono
    FT_Get_GlyphFT_Raster_NewFuncft_pixel_mode_none
    FT_Get_Glyph_NameFT_Raster_Paramsft_pixel_mode_pal2
    FT_Get_KerningFT_Raster_RenderFuncft_pixel_mode_pal4
    FT_Get_MM_VarFT_Raster_ResetFuncft_pixel_mode_xxx
    FT_Get_ModuleFT_Raster_SetModeFuncft_render_mode_mono
    FT_Get_Multi_MasterFT_RENDER_Hft_render_mode_normal
    FT_Get_Name_IndexFT_RENDER_MODE_LCDft_render_mode_xxx
    FT_Get_Next_CharFT_RENDER_MODE_LCD_VPS_Dict_Keys
    FT_Get_PFR_AdvanceFT_RENDER_MODE_LIGHTPS_FontInfo
    FT_Get_PFR_KerningFT_RENDER_MODE_MONOPS_FontInfoRec
    FT_Get_PFR_MetricsFT_RENDER_MODE_NORMALPS_Private
    FT_Get_Postscript_NameFT_Realloc_FuncPS_PrivateRec
    FT_Get_PS_Font_InfoFT_Reference_FaceT1_Blend_Flags
    FT_Get_PS_Font_PrivateFT_Reference_LibraryT1_EncodingType
    FT_Get_PS_Font_ValueFT_Remove_ModuleT1_FontInfo
    FT_Get_RendererFT_Render_GlyphT1_Private
    FT_Get_Sfnt_NameFT_Render_ModeTT_ADOBE_ID_CUSTOM
    FT_Get_Sfnt_Name_CountFT_RendererTT_ADOBE_ID_EXPERT
    FT_Get_Sfnt_TableFT_Renderer_ClassTT_ADOBE_ID_LATIN_1
    FT_Get_SubGlyph_InfoFT_Request_SizeTT_ADOBE_ID_STANDARD
    FT_Get_Track_KerningFT_RoundFixTT_ADOBE_ID_XXX
    FT_Get_TrueType_Engine_TypeFT_Select_CharmapTT_APPLE_ID_DEFAULT
    FT_Get_WinFNT_HeaderFT_Select_SizeTT_APPLE_ID_ISO_10646
    FT_Get_X11_Font_FormatFT_Set_Char_SizeTT_APPLE_ID_UNICODE_1_1
    FT_GetFile_From_Mac_ATS_NameFT_Set_CharmapTT_APPLE_ID_UNICODE_2_0
    FT_GetFile_From_Mac_NameFT_Set_Debug_HookTT_APPLE_ID_UNICODE_32
    FT_GetFilePath_From_Mac_ATS_NameFT_Set_MM_Blend_CoordinatesTT_APPLE_ID_VARIANT_SELECTOR
    FT_GLYPH_BBOX_GRIDFITFT_Set_MM_Design_CoordinatesTT_APPLE_ID_XXX
    FT_GLYPH_BBOX_PIXELSFT_Set_Pixel_SizesTT_Header
    FT_GLYPH_BBOX_SUBPIXELSFT_Set_RendererTT_HoriHeader
    FT_GLYPH_BBOX_TRUNCATEFT_Set_TransformTT_ISO_ID_10646
    FT_GLYPH_BBOX_UNSCALEDFT_Set_Var_Blend_CoordinatesTT_ISO_ID_7BIT_ASCII
    FT_GLYPH_FORMAT_BITMAPFT_Set_Var_Design_CoordinatesTT_ISO_ID_8859_1
    FT_GLYPH_FORMAT_COMPOSITEFT_SFNT_NAMES_HTT_ISO_ID_XXX
    FT_GLYPH_FORMAT_NONEFT_Sfnt_Table_InfoTT_MAC_ID_ARABIC
    FT_GLYPH_FORMAT_OUTLINEFT_Sfnt_TagTT_MAC_ID_ARMENIAN
    FT_GLYPH_FORMAT_PLOTTERFT_SfntNameTT_MAC_ID_BENGALI
    FT_GLYPH_HFT_ShortTT_MAC_ID_BURMESE
    FT_GlyphFT_SIZE_REQUEST_TYPE_BBOXTT_MAC_ID_DEVANAGARI
    FT_Glyph_BBox_ModeFT_SIZE_REQUEST_TYPE_CELLTT_MAC_ID_GEEZ
    FT_Glyph_CopyFT_SIZE_REQUEST_TYPE_NOMINALTT_MAC_ID_GEORGIAN
    FT_Glyph_FormatFT_SIZE_REQUEST_TYPE_REAL_DIMTT_MAC_ID_GREEK
    FT_Glyph_Get_CBoxFT_SIZE_REQUEST_TYPE_SCALESTT_MAC_ID_GUJARATI
    FT_Glyph_MetricsFT_SIZES_HTT_MAC_ID_GURMUKHI
    FT_Glyph_StrokeFT_SinTT_MAC_ID_HEBREW
    FT_Glyph_StrokeBorderFT_SizeTT_MAC_ID_JAPANESE
    FT_Glyph_To_BitmapFT_Size_InternalTT_MAC_ID_KANNADA
    FT_Glyph_TransformFT_Size_MetricsTT_MAC_ID_KHMER
    FT_GlyphRecFT_Size_RequestTT_MAC_ID_KOREAN
    FT_GlyphSlotFT_Size_Request_TypeTT_MAC_ID_LAOTIAN
    FT_GlyphSlot_Own_BitmapFT_Size_RequestRecTT_MAC_ID_MALAYALAM
    FT_GlyphSlotRecFT_SizeRecTT_MAC_ID_MALDIVIAN
    FT_GX_VALIDATE_HFT_Slot_InternalTT_MAC_ID_MONGOLIAN
    FT_GZIP_HFT_SpanTT_MAC_ID_ORIYA
    FT_HAS_FAST_GLYPHSFT_SpanFuncTT_MAC_ID_ROMAN
    FT_HAS_FIXED_SIZESFT_STROKER_BORDER_LEFTTT_MAC_ID_RSYMBOL
    FT_HAS_GLYPH_NAMESFT_STROKER_BORDER_RIGHTTT_MAC_ID_RUSSIAN
    FT_HAS_HORIZONTALFT_STROKER_HTT_MAC_ID_SIMPLIFIED_CHINESE
    FT_HAS_KERNINGFT_STROKER_LINECAP_BUTTTT_MAC_ID_SINDHI
    FT_HAS_MULTIPLE_MASTERSFT_STROKER_LINECAP_ROUNDTT_MAC_ID_SINHALESE
    FT_HAS_VERTICALFT_STROKER_LINECAP_SQUARETT_MAC_ID_SLAVIC
    FT_Has_PS_Glyph_NamesFT_STROKER_LINEJOIN_BEVELTT_MAC_ID_TAMIL
    FT_IMAGE_HFT_STROKER_LINEJOIN_MITERTT_MAC_ID_TELUGU
    FT_IMAGE_TAGFT_STROKER_LINEJOIN_MITER_FIXEDTT_MAC_ID_THAI
    FT_INCREMENTAL_HFT_STROKER_LINEJOIN_MITER_VARIABLETT_MAC_ID_TIBETAN
    FT_IncrementalFT_STROKER_LINEJOIN_ROUNDTT_MAC_ID_TRADITIONAL_CHINESE
    FT_Incremental_FreeGlyphDataFuncFT_STYLE_FLAG_BOLDTT_MAC_ID_UNINTERP
    FT_Incremental_FuncsRecFT_STYLE_FLAG_ITALICTT_MAC_ID_VIETNAMESE
    FT_Incremental_GetGlyphDataFuncFT_STYLE_FLAG_XXXTT_MAC_ID_XXX
    FT_Incremental_GetGlyphMetricsFuncFT_StreamTT_MaxProfile
    FT_Incremental_InterfaceFT_Stream_CloseFuncTT_MS_ID_BIG_5
    FT_Incremental_InterfaceRecFT_Stream_IoFuncTT_MS_ID_GB2312
    FT_Incremental_MetricsFT_Stream_OpenBzip2TT_MS_ID_JOHAB
    FT_Incremental_MetricsRecFT_Stream_OpenGzipTT_MS_ID_SJIS
    FT_Init_FreeTypeFT_Stream_OpenLZWTT_MS_ID_SYMBOL_CS
    FT_IntFT_StreamDescTT_MS_ID_UCS_4
    FT_Int16FT_StreamRecTT_MS_ID_UNICODE_CS
    FT_Int32FT_StringTT_MS_ID_WANSUNG
    FT_IS_CID_KEYEDFT_StrokerTT_MS_ID_XXX
    FT_IS_FIXED_WIDTHFT_Stroker_BeginSubPathTT_OS2
    FT_IS_SCALABLEFT_Stroker_ConicToTT_PCLT
    FT_IS_SFNTFT_Stroker_CubicToTT_PLATFORM_ADOBE
    FT_IS_TRICKYFT_Stroker_DoneTT_PLATFORM_APPLE_UNICODE
    FT_KERNING_DEFAULTFT_Stroker_EndSubPathTT_PLATFORM_CUSTOM
    FT_KERNING_UNFITTEDFT_Stroker_ExportTT_PLATFORM_ISO
    FT_KERNING_UNSCALEDFT_Stroker_ExportBorderTT_PLATFORM_MACINTOSH
    FT_Kerning_ModeFT_Stroker_GetBorderCountsTT_PLATFORM_MICROSOFT
    FT_LCD_FILTER_DEFAULTFT_Stroker_GetCountsTT_PLATFORM_XXX
    FT_LCD_FILTER_HFT_Stroker_LineCapTT_Postscript
    FT_LCD_FILTER_LEGACYFT_Stroker_LineJoinTT_VertHeader
    FT_LCD_FILTER_LIGHTFT_Stroker_LineTo
    FT_LCD_FILTER_NONEFT_Stroker_New
    -
    - -
    [TOC]
    - -
    generated on Thu Mar 8 21:09:06 2012
    - diff --git a/docs/reference/ft2-lcd_filtering.html b/docs/reference/ft2-lcd_filtering.html deleted file mode 100644 index 3e88ceb..0000000 --- a/docs/reference/ft2-lcd_filtering.html +++ /dev/null @@ -1,192 +0,0 @@ - - - - -FreeType-2.4.9 API Reference - - - - - - -
    [Index][TOC]
    -

    FreeType-2.4.9 API Reference

    - -

    -LCD Filtering -

    -

    Synopsis

    - - - -
    FT_LcdFilterFT_Library_SetLcdFilterWeights
    FT_Library_SetLcdFilter


    - -
    -

    The FT_Library_SetLcdFilter API can be used to specify a low-pass filter which is then applied to LCD-optimized bitmaps generated through FT_Render_Glyph. This is useful to reduce color fringes which would occur with unfiltered rendering.

    -

    Note that no filter is active by default, and that this function is not implemented in default builds of the library. You need to #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING in your ‘ftoption.h’ file in order to activate it.

    -

    -
    -

    FT_LcdFilter

    -
    -Defined in FT_LCD_FILTER_H (freetype/ftlcdfil.h). -

    -
    -
-  typedef enum  FT_LcdFilter_
-  {
-    FT_LCD_FILTER_NONE    = 0,
-    FT_LCD_FILTER_DEFAULT = 1,
-    FT_LCD_FILTER_LIGHT   = 2,
-    FT_LCD_FILTER_LEGACY  = 16,
-
-    FT_LCD_FILTER_MAX   /* do not remove */
-
-  } FT_LcdFilter;
-
-

    -
    -

    A list of values to identify various types of LCD filters.

    -

    -
    values
    -

    - - - - - -
    FT_LCD_FILTER_NONE -

    Do not perform filtering. When used with subpixel rendering, this results in sometimes severe color fringes.

    -
    FT_LCD_FILTER_DEFAULT -

    The default filter reduces color fringes considerably, at the cost of a slight blurriness in the output.

    -
    FT_LCD_FILTER_LIGHT -

    The light filter is a variant that produces less blurriness at the cost of slightly more color fringes than the default one. It might be better, depending on taste, your monitor, or your personal vision.

    -
    FT_LCD_FILTER_LEGACY -

    This filter corresponds to the original libXft color filter. It provides high contrast output but can exhibit really bad color fringes if glyphs are not extremely well hinted to the pixel grid. In other words, it only works well if the TrueType bytecode interpreter is enabled and high-quality hinted fonts are used.

    -

    This filter is only provided for comparison purposes, and might be disabled or stay unsupported in the future.

    -
    -
    -
    since
    -

    2.3.0

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Library_SetLcdFilter

    -
    -Defined in FT_LCD_FILTER_H (freetype/ftlcdfil.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Library_SetLcdFilter( FT_Library    library,
-                           FT_LcdFilter  filter );
-
-

    -
    -

    This function is used to apply color filtering to LCD decimated bitmaps, like the ones used when calling FT_Render_Glyph with FT_RENDER_MODE_LCD or FT_RENDER_MODE_LCD_V.

    -

    -
    input
    -

    - - - -
    library -

    A handle to the target library instance.

    -
    filter -

    The filter type.

    -

    You can use FT_LCD_FILTER_NONE here to disable this feature, or FT_LCD_FILTER_DEFAULT to use a default filter that should work well on most LCD screens.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    This feature is always disabled by default. Clients must make an explicit call to this function with a ‘filter’ value other than FT_LCD_FILTER_NONE in order to enable it.

    -

    Due to PATENTS covering subpixel rendering, this function doesn't do anything except returning ‘FT_Err_Unimplemented_Feature’ if the configuration macro FT_CONFIG_OPTION_SUBPIXEL_RENDERING is not defined in your build of the library, which should correspond to all default builds of FreeType.

    -

    The filter affects glyph bitmaps rendered through FT_Render_Glyph, FT_Outline_Get_Bitmap, FT_Load_Glyph, and FT_Load_Char.

    -

    It does not affect the output of FT_Outline_Render and FT_Outline_Get_Bitmap.

    -

    If this feature is activated, the dimensions of LCD glyph bitmaps are either larger or taller than the dimensions of the corresponding outline with regards to the pixel grid. For example, for FT_RENDER_MODE_LCD, the filter adds up to 3 pixels to the left, and up to 3 pixels to the right.

    -

    The bitmap offset values are adjusted correctly, so clients shouldn't need to modify their layout and glyph positioning code when enabling the filter.

    -
    -
    since
    -

    2.3.0

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Library_SetLcdFilterWeights

    -
    -Defined in FT_LCD_FILTER_H (freetype/ftlcdfil.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Library_SetLcdFilterWeights( FT_Library      library,
-                                  unsigned char  *weights );
-
-

    -
    -

    Use this function to override the filter weights selected by FT_Library_SetLcdFilter. By default, FreeType uses the quintuple (0x00, 0x55, 0x56, 0x55, 0x00) for FT_LCD_FILTER_LIGHT, and (0x10, 0x40, 0x70, 0x40, 0x10) for FT_LCD_FILTER_DEFAULT and FT_LCD_FILTER_LEGACY.

    -

    -
    input
    -

    - - - -
    library -

    A handle to the target library instance.

    -
    weights -

    A pointer to an array; the function copies the first five bytes and uses them to specify the filter weights.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    Due to PATENTS covering subpixel rendering, this function doesn't do anything except returning ‘FT_Err_Unimplemented_Feature’ if the configuration macro FT_CONFIG_OPTION_SUBPIXEL_RENDERING is not defined in your build of the library, which should correspond to all default builds of FreeType.

    -

    This function must be called after FT_Library_SetLcdFilter to have any effect.

    -
    -
    since
    -

    2.4.0

    -
    -
    -
    - - -
    [Index][TOC]
    - - - diff --git a/docs/reference/ft2-list_processing.html b/docs/reference/ft2-list_processing.html deleted file mode 100644 index 6b4dc31..0000000 --- a/docs/reference/ft2-list_processing.html +++ /dev/null @@ -1,486 +0,0 @@ - - - - -FreeType-2.4.9 API Reference - - - - - - -
    [Index][TOC]
    -

    FreeType-2.4.9 API Reference

    - -

    -List Processing -

    -

    Synopsis

    - - - - - - -
    FT_ListFT_List_AddFT_List_Iterate
    FT_ListNodeFT_List_InsertFT_List_Destructor
    FT_ListRecFT_List_RemoveFT_List_Finalize
    FT_ListNodeRecFT_List_Up
    FT_List_FindFT_List_Iterator


    - -
    -

    This section contains various definitions related to list processing using doubly-linked nodes.

    -

    -
    -

    FT_List

    -
    -Defined in FT_TYPES_H (freetype/fttypes.h). -

    -
    -
-  typedef struct FT_ListRec_*  FT_List;
-
-

    -
    -

    A handle to a list record (see FT_ListRec).

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_ListNode

    -
    -Defined in FT_TYPES_H (freetype/fttypes.h). -

    -
    -
-  typedef struct FT_ListNodeRec_*  FT_ListNode;
-
-

    -
    -

    Many elements and objects in FreeType are listed through an FT_List record (see FT_ListRec). As its name suggests, an FT_ListNode is a handle to a single list element.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_ListRec

    -
    -Defined in FT_TYPES_H (freetype/fttypes.h). -

    -
    -
-  typedef struct  FT_ListRec_
-  {
-    FT_ListNode  head;
-    FT_ListNode  tail;
-
-  } FT_ListRec;
-
-

    -
    -

    A structure used to hold a simple doubly-linked list. These are used in many parts of FreeType.

    -

    -
    fields
    -

    - - - -
    head -

    The head (first element) of doubly-linked list.

    -
    tail -

    The tail (last element) of doubly-linked list.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_ListNodeRec

    -
    -Defined in FT_TYPES_H (freetype/fttypes.h). -

    -
    -
-  typedef struct  FT_ListNodeRec_
-  {
-    FT_ListNode  prev;
-    FT_ListNode  next;
-    void*        data;
-
-  } FT_ListNodeRec;
-
-

    -
    -

    A structure used to hold a single list element.

    -

    -
    fields
    -

    - - - - -
    prev -

    The previous element in the list. NULL if first.

    -
    next -

    The next element in the list. NULL if last.

    -
    data -

    A typeless pointer to the listed object.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_List_Find

    -
    -Defined in FT_LIST_H (freetype/ftlist.h). -

    -
    -
-  FT_EXPORT( FT_ListNode )
-  FT_List_Find( FT_List  list,
-                void*    data );
-
-

    -
    -

    Find the list node for a given listed object.

    -

    -
    input
    -

    - - - -
    list -

    A pointer to the parent list.

    -
    data -

    The address of the listed object.

    -
    -
    -
    return
    -

    List node. NULL if it wasn't found.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_List_Add

    -
    -Defined in FT_LIST_H (freetype/ftlist.h). -

    -
    -
-  FT_EXPORT( void )
-  FT_List_Add( FT_List      list,
-               FT_ListNode  node );
-
-

    -
    -

    Append an element to the end of a list.

    -

    -
    inout
    -

    - - - -
    list -

    A pointer to the parent list.

    -
    node -

    The node to append.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_List_Insert

    -
    -Defined in FT_LIST_H (freetype/ftlist.h). -

    -
    -
-  FT_EXPORT( void )
-  FT_List_Insert( FT_List      list,
-                  FT_ListNode  node );
-
-

    -
    -

    Insert an element at the head of a list.

    -

    -
    inout
    -

    - - - -
    list -

    A pointer to parent list.

    -
    node -

    The node to insert.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_List_Remove

    -
    -Defined in FT_LIST_H (freetype/ftlist.h). -

    -
    -
-  FT_EXPORT( void )
-  FT_List_Remove( FT_List      list,
-                  FT_ListNode  node );
-
-

    -
    -

    Remove a node from a list. This function doesn't check whether the node is in the list!

    -

    -
    input
    -

    - - -
    node -

    The node to remove.

    -
    -
    -
    inout
    -

    - - -
    list -

    A pointer to the parent list.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_List_Up

    -
    -Defined in FT_LIST_H (freetype/ftlist.h). -

    -
    -
-  FT_EXPORT( void )
-  FT_List_Up( FT_List      list,
-              FT_ListNode  node );
-
-

    -
    -

    Move a node to the head/top of a list. Used to maintain LRU lists.

    -

    -
    inout
    -

    - - - -
    list -

    A pointer to the parent list.

    -
    node -

    The node to move.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_List_Iterator

    -
    -Defined in FT_LIST_H (freetype/ftlist.h). -

    -
    -
-  typedef FT_Error
-  (*FT_List_Iterator)( FT_ListNode  node,
-                       void*        user );
-
-

    -
    -

    An FT_List iterator function which is called during a list parse by FT_List_Iterate.

    -

    -
    input
    -

    - - - -
    node -

    The current iteration list node.

    -
    user -

    A typeless pointer passed to FT_List_Iterate. Can be used to point to the iteration's state.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_List_Iterate

    -
    -Defined in FT_LIST_H (freetype/ftlist.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_List_Iterate( FT_List           list,
-                   FT_List_Iterator  iterator,
-                   void*             user );
-
-

    -
    -

    Parse a list and calls a given iterator function on each element. Note that parsing is stopped as soon as one of the iterator calls returns a non-zero value.

    -

    -
    input
    -

    - - - - -
    list -

    A handle to the list.

    -
    iterator -

    An iterator function, called on each node of the list.

    -
    user -

    A user-supplied field which is passed as the second argument to the iterator.

    -
    -
    -
    return
    -

    The result (a FreeType error code) of the last iterator call.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_List_Destructor

    -
    -Defined in FT_LIST_H (freetype/ftlist.h). -

    -
    -
-  typedef void
-  (*FT_List_Destructor)( FT_Memory  memory,
-                         void*      data,
-                         void*      user );
-
-

    -
    -

    An FT_List iterator function which is called during a list finalization by FT_List_Finalize to destroy all elements in a given list.

    -

    -
    input
    -

    - - - - -
    system -

    The current system object.

    -
    data -

    The current object to destroy.

    -
    user -

    A typeless pointer passed to FT_List_Iterate. It can be used to point to the iteration's state.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_List_Finalize

    -
    -Defined in FT_LIST_H (freetype/ftlist.h). -

    -
    -
-  FT_EXPORT( void )
-  FT_List_Finalize( FT_List             list,
-                    FT_List_Destructor  destroy,
-                    FT_Memory           memory,
-                    void*               user );
-
-

    -
    -

    Destroy all elements in the list as well as the list itself.

    -

    -
    input
    -

    - - - - - -
    list -

    A handle to the list.

    -
    destroy -

    A list destructor that will be applied to each element of the list.

    -
    memory -

    The current memory object which handles deallocation.

    -
    user -

    A user-supplied field which is passed as the last argument to the destructor.

    -
    -
    -
    note
    -

    This function expects that all nodes added by FT_List_Add or FT_List_Insert have been dynamically allocated.

    -
    -
    -
    - - -
    [Index][TOC]
    - - - diff --git a/docs/reference/ft2-lzw.html b/docs/reference/ft2-lzw.html deleted file mode 100644 index 4300364..0000000 --- a/docs/reference/ft2-lzw.html +++ /dev/null @@ -1,94 +0,0 @@ - - - - -FreeType-2.4.9 API Reference - - - - - - -
    [Index][TOC]
    -

    FreeType-2.4.9 API Reference

    - -

    -LZW Streams -

    -

    Synopsis

    - - -
    FT_Stream_OpenLZW


    - -
    -

    This section contains the declaration of LZW-specific functions.

    -

    -
    -

    FT_Stream_OpenLZW

    -
    -Defined in FT_LZW_H (freetype/ftlzw.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Stream_OpenLZW( FT_Stream  stream,
-                     FT_Stream  source );
-
-

    -
    -

    Open a new stream to parse LZW-compressed font files. This is mainly used to support the compressed ‘*.pcf.Z’ fonts that come with XFree86.

    -

    -
    input
    -

    - - - -
    stream -

    The target embedding stream.

    -
    source -

    The source stream.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    The source stream must be opened before calling this function.

    -

    Calling the internal function ‘FT_Stream_Close’ on the new stream will not call ‘FT_Stream_Close’ on the source stream. None of the stream objects will be released to the heap.

    -

    The stream implementation is very basic and resets the decompression process each time seeking backwards is needed within the stream

    -

    In certain builds of the library, LZW compression recognition is automatically handled when calling FT_New_Face or FT_Open_Face. This means that if no font driver is capable of handling the raw compressed file, the library will try to open a LZW stream from it and re-open the face with it.

    -

    This function may return ‘FT_Err_Unimplemented_Feature’ if your build of FreeType was not compiled with LZW support.

    -
    -
    -
    - - -
    [Index][TOC]
    - - - diff --git a/docs/reference/ft2-mac_specific.html b/docs/reference/ft2-mac_specific.html deleted file mode 100644 index 2b862ad..0000000 --- a/docs/reference/ft2-mac_specific.html +++ /dev/null @@ -1,368 +0,0 @@ - - - - -FreeType-2.4.9 API Reference - - - - - - -
    [Index][TOC]
    -

    FreeType-2.4.9 API Reference

    - -

    -Mac Specific Interface -

    -

    Synopsis

    - - - - -
    FT_New_Face_From_FONDFT_GetFilePath_From_Mac_ATS_Name
    FT_GetFile_From_Mac_NameFT_New_Face_From_FSSpec
    FT_GetFile_From_Mac_ATS_NameFT_New_Face_From_FSRef


    - -
    -

    The following definitions are only available if FreeType is compiled on a Macintosh.

    -

    -
    -

    FT_New_Face_From_FOND

    -
    -Defined in FT_MAC_H (freetype/ftmac.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_New_Face_From_FOND( FT_Library  library,
-                         Handle      fond,
-                         FT_Long     face_index,
-                         FT_Face    *aface )
-                       FT_DEPRECATED_ATTRIBUTE;
-
-

    -
    -

    Create a new face object from a FOND resource.

    -

    -
    inout
    -

    - - -
    library -

    A handle to the library resource.

    -
    -
    -
    input
    -

    - - - -
    fond -

    A FOND resource.

    -
    face_index -

    Only supported for the -1 ‘sanity check’ special case.

    -
    -
    -
    output
    -

    - - -
    aface -

    A handle to a new face object.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    notes
    -

    This function can be used to create FT_Face objects from fonts that are installed in the system as follows.

    -
    -  fond = GetResource( 'FOND', fontName );                          
-  error = FT_New_Face_From_FOND( library, fond, 0, &face );        
-
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_GetFile_From_Mac_Name

    -
    -Defined in FT_MAC_H (freetype/ftmac.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_GetFile_From_Mac_Name( const char*  fontName,
-                            FSSpec*      pathSpec,
-                            FT_Long*     face_index )
-                          FT_DEPRECATED_ATTRIBUTE;
-
-

    -
    -

    Return an FSSpec for the disk file containing the named font.

    -

    -
    input
    -

    - - -
    fontName -

    Mac OS name of the font (e.g., Times New Roman Bold).

    -
    -
    -
    output
    -

    - - - -
    pathSpec -

    FSSpec to the file. For passing to FT_New_Face_From_FSSpec.

    -
    face_index -

    Index of the face. For passing to FT_New_Face_From_FSSpec.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_GetFile_From_Mac_ATS_Name

    -
    -Defined in FT_MAC_H (freetype/ftmac.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_GetFile_From_Mac_ATS_Name( const char*  fontName,
-                                FSSpec*      pathSpec,
-                                FT_Long*     face_index )
-                              FT_DEPRECATED_ATTRIBUTE;
-
-

    -
    -

    Return an FSSpec for the disk file containing the named font.

    -

    -
    input
    -

    - - -
    fontName -

    Mac OS name of the font in ATS framework.

    -
    -
    -
    output
    -

    - - - -
    pathSpec -

    FSSpec to the file. For passing to FT_New_Face_From_FSSpec.

    -
    face_index -

    Index of the face. For passing to FT_New_Face_From_FSSpec.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_GetFilePath_From_Mac_ATS_Name

    -
    -Defined in FT_MAC_H (freetype/ftmac.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_GetFilePath_From_Mac_ATS_Name( const char*  fontName,
-                                    UInt8*       path,
-                                    UInt32       maxPathSize,
-                                    FT_Long*     face_index )
-                                  FT_DEPRECATED_ATTRIBUTE;
-
-

    -
    -

    Return a pathname of the disk file and face index for given font name which is handled by ATS framework.

    -

    -
    input
    -

    - - -
    fontName -

    Mac OS name of the font in ATS framework.

    -
    -
    -
    output
    -

    - - - - -
    path -

    Buffer to store pathname of the file. For passing to FT_New_Face. The client must allocate this buffer before calling this function.

    -
    maxPathSize -

    Lengths of the buffer ‘path’ that client allocated.

    -
    face_index -

    Index of the face. For passing to FT_New_Face.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_New_Face_From_FSSpec

    -
    -Defined in FT_MAC_H (freetype/ftmac.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_New_Face_From_FSSpec( FT_Library     library,
-                           const FSSpec  *spec,
-                           FT_Long        face_index,
-                           FT_Face       *aface )
-                         FT_DEPRECATED_ATTRIBUTE;
-
-

    -
    -

    Create a new face object from a given resource and typeface index using an FSSpec to the font file.

    -

    -
    inout
    -

    - - -
    library -

    A handle to the library resource.

    -
    -
    -
    input
    -

    - - - -
    spec -

    FSSpec to the font file.

    -
    face_index -

    The index of the face within the resource. The first face has index 0.

    -
    -
    -
    output
    -

    - - -
    aface -

    A handle to a new face object.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    FT_New_Face_From_FSSpec is identical to FT_New_Face except it accepts an FSSpec instead of a path.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_New_Face_From_FSRef

    -
    -Defined in FT_MAC_H (freetype/ftmac.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_New_Face_From_FSRef( FT_Library    library,
-                          const FSRef  *ref,
-                          FT_Long       face_index,
-                          FT_Face      *aface )
-                        FT_DEPRECATED_ATTRIBUTE;
-
-

    -
    -

    Create a new face object from a given resource and typeface index using an FSRef to the font file.

    -

    -
    inout
    -

    - - -
    library -

    A handle to the library resource.

    -
    -
    -
    input
    -

    - - - -
    spec -

    FSRef to the font file.

    -
    face_index -

    The index of the face within the resource. The first face has index 0.

    -
    -
    -
    output
    -

    - - -
    aface -

    A handle to a new face object.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    FT_New_Face_From_FSRef is identical to FT_New_Face except it accepts an FSRef instead of a path.

    -
    -
    -
    - - -
    [Index][TOC]
    - - - diff --git a/docs/reference/ft2-module_management.html b/docs/reference/ft2-module_management.html deleted file mode 100644 index da119b6..0000000 --- a/docs/reference/ft2-module_management.html +++ /dev/null @@ -1,667 +0,0 @@ - - - - -FreeType-2.4.9 API Reference - - - - - - -
    [Index][TOC]
    -

    FreeType-2.4.9 API Reference

    - -

    -Module Management -

    -

    Synopsis

    - - - - - - -
    FT_Module_ConstructorFT_Get_ModuleFT_Set_Debug_Hook
    FT_Module_DestructorFT_Remove_ModuleFT_Add_Default_Modules
    FT_Module_RequesterFT_Reference_LibraryFT_Renderer_Class
    FT_Module_ClassFT_New_LibraryFT_Get_Renderer
    FT_Add_ModuleFT_Done_LibraryFT_Set_Renderer


    - -
    -

    The definitions below are used to manage modules within FreeType. Modules can be added, upgraded, and removed at runtime.

    -

    -
    -

    FT_Module_Constructor

    -
    -Defined in FT_MODULE_H (freetype/ftmodapi.h). -

    -
    -
-  typedef FT_Error
-  (*FT_Module_Constructor)( FT_Module  module );
-
-

    -
    -

    A function used to initialize (not create) a new module object.

    -

    -
    input
    -

    - - -
    module -

    The module to initialize.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Module_Destructor

    -
    -Defined in FT_MODULE_H (freetype/ftmodapi.h). -

    -
    -
-  typedef void
-  (*FT_Module_Destructor)( FT_Module  module );
-
-

    -
    -

    A function used to finalize (not destroy) a given module object.

    -

    -
    input
    -

    - - -
    module -

    The module to finalize.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Module_Requester

    -
    -Defined in FT_MODULE_H (freetype/ftmodapi.h). -

    -
    -
-  typedef FT_Module_Interface
-  (*FT_Module_Requester)( FT_Module    module,
-                          const char*  name );
-
-

    -
    -

    A function used to query a given module for a specific interface.

    -

    -
    input
    -

    - - - -
    module -

    The module to finalize.

    -
    name -

    The name of the interface in the module.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Module_Class

    -
    -Defined in FT_MODULE_H (freetype/ftmodapi.h). -

    -
    -
-  typedef struct  FT_Module_Class_
-  {
-    FT_ULong               module_flags;
-    FT_Long                module_size;
-    const FT_String*       module_name;
-    FT_Fixed               module_version;
-    FT_Fixed               module_requires;
-
-    const void*            module_interface;
-
-    FT_Module_Constructor  module_init;
-    FT_Module_Destructor   module_done;
-    FT_Module_Requester    get_interface;
-
-  } FT_Module_Class;
-
-

    -
    -

    The module class descriptor.

    -

    -
    fields
    -

    - - - - - - - - - -
    module_flags -

    Bit flags describing the module.

    -
    module_size -

    The size of one module object/instance in bytes.

    -
    module_name -

    The name of the module.

    -
    module_version -

    The version, as a 16.16 fixed number (major.minor).

    -
    module_requires -

    The version of FreeType this module requires, as a 16.16 fixed number (major.minor). Starts at version 2.0, i.e., 0x20000.

    -
    module_init -

    The initializing function.

    -
    module_done -

    The finalizing function.

    -
    get_interface -

    The interface requesting function.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Add_Module

    -
    -Defined in FT_MODULE_H (freetype/ftmodapi.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Add_Module( FT_Library              library,
-                 const FT_Module_Class*  clazz );
-
-

    -
    -

    Add a new module to a given library instance.

    -

    -
    inout
    -

    - - -
    library -

    A handle to the library object.

    -
    -
    -
    input
    -

    - - -
    clazz -

    A pointer to class descriptor for the module.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    An error will be returned if a module already exists by that name, or if the module requires a version of FreeType that is too great.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Get_Module

    -
    -Defined in FT_MODULE_H (freetype/ftmodapi.h). -

    -
    -
-  FT_EXPORT( FT_Module )
-  FT_Get_Module( FT_Library   library,
-                 const char*  module_name );
-
-

    -
    -

    Find a module by its name.

    -

    -
    input
    -

    - - - -
    library -

    A handle to the library object.

    -
    module_name -

    The module's name (as an ASCII string).

    -
    -
    -
    return
    -

    A module handle. 0 if none was found.

    -
    -
    note
    -

    FreeType's internal modules aren't documented very well, and you should look up the source code for details.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Remove_Module

    -
    -Defined in FT_MODULE_H (freetype/ftmodapi.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Remove_Module( FT_Library  library,
-                    FT_Module   module );
-
-

    -
    -

    Remove a given module from a library instance.

    -

    -
    inout
    -

    - - -
    library -

    A handle to a library object.

    -
    -
    -
    input
    -

    - - -
    module -

    A handle to a module object.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    The module object is destroyed by the function in case of success.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Reference_Library

    -
    -Defined in FT_MODULE_H (freetype/ftmodapi.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Reference_Library( FT_Library  library );
-
-

    -
    -

    A counter gets initialized to 1 at the time an FT_Library structure is created. This function increments the counter. FT_Done_Library then only destroys a library if the counter is 1, otherwise it simply decrements the counter.

    -

    This function helps in managing life-cycles of structures which reference FT_Library objects.

    -

    -
    input
    -

    - - -
    library -

    A handle to a target library object.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    since
    -

    2.4.2

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_New_Library

    -
    -Defined in FT_MODULE_H (freetype/ftmodapi.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_New_Library( FT_Memory    memory,
-                  FT_Library  *alibrary );
-
-

    -
    -

    This function is used to create a new FreeType library instance from a given memory object. It is thus possible to use libraries with distinct memory allocators within the same program.

    -

    Normally, you would call this function (followed by a call to FT_Add_Default_Modules or a series of calls to FT_Add_Module) instead of FT_Init_FreeType to initialize the FreeType library.

    -

    Don't use FT_Done_FreeType but FT_Done_Library to destroy a library instance.

    -

    -
    input
    -

    - - -
    memory -

    A handle to the original memory object.

    -
    -
    -
    output
    -

    - - -
    alibrary -

    A pointer to handle of a new library object.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    See the discussion of reference counters in the description of FT_Reference_Library.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Done_Library

    -
    -Defined in FT_MODULE_H (freetype/ftmodapi.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Done_Library( FT_Library  library );
-
-

    -
    -

    Discard a given library object. This closes all drivers and discards all resource objects.

    -

    -
    input
    -

    - - -
    library -

    A handle to the target library.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    See the discussion of reference counters in the description of FT_Reference_Library.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Set_Debug_Hook

    -
    -Defined in FT_MODULE_H (freetype/ftmodapi.h). -

    -
    -
-  FT_EXPORT( void )
-  FT_Set_Debug_Hook( FT_Library         library,
-                     FT_UInt            hook_index,
-                     FT_DebugHook_Func  debug_hook );
-
-

    -
    -

    Set a debug hook function for debugging the interpreter of a font format.

    -

    -
    inout
    -

    - - -
    library -

    A handle to the library object.

    -
    -
    -
    input
    -

    - - - -
    hook_index -

    The index of the debug hook. You should use the values defined in ‘ftobjs.h’, e.g., ‘FT_DEBUG_HOOK_TRUETYPE’.

    -
    debug_hook -

    The function used to debug the interpreter.

    -
    -
    -
    note
    -

    Currently, four debug hook slots are available, but only two (for the TrueType and the Type 1 interpreter) are defined.

    -

    Since the internal headers of FreeType are no longer installed, the symbol ‘FT_DEBUG_HOOK_TRUETYPE’ isn't available publicly. This is a bug and will be fixed in a forthcoming release.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Add_Default_Modules

    -
    -Defined in FT_MODULE_H (freetype/ftmodapi.h). -

    -
    -
-  FT_EXPORT( void )
-  FT_Add_Default_Modules( FT_Library  library );
-
-

    -
    -

    Add the set of default drivers to a given library object. This is only useful when you create a library object with FT_New_Library (usually to plug a custom memory manager).

    -

    -
    inout
    -

    - - -
    library -

    A handle to a new library object.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Renderer_Class

    -
    -Defined in FT_RENDER_H (freetype/ftrender.h). -

    -
    -
-  typedef struct  FT_Renderer_Class_
-  {
-    FT_Module_Class            root;
-
-    FT_Glyph_Format            glyph_format;
-
-    FT_Renderer_RenderFunc     render_glyph;
-    FT_Renderer_TransformFunc  transform_glyph;
-    FT_Renderer_GetCBoxFunc    get_glyph_cbox;
-    FT_Renderer_SetModeFunc    set_mode;
-
-    FT_Raster_Funcs*           raster_class;
-
-  } FT_Renderer_Class;
-
-

    -
    -

    The renderer module class descriptor.

    -

    -
    fields
    -

    - - - - - - - - -
    root -

    The root FT_Module_Class fields.

    -
    glyph_format -

    The glyph image format this renderer handles.

    -
    render_glyph -

    A method used to render the image that is in a given glyph slot into a bitmap.

    -
    transform_glyph -

    A method used to transform the image that is in a given glyph slot.

    -
    get_glyph_cbox -

    A method used to access the glyph's cbox.

    -
    set_mode -

    A method used to pass additional parameters.

    -
    raster_class -

    For FT_GLYPH_FORMAT_OUTLINE renderers only. This is a pointer to its raster's class.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Get_Renderer

    -
    -Defined in FT_RENDER_H (freetype/ftrender.h). -

    -
    -
-  FT_EXPORT( FT_Renderer )
-  FT_Get_Renderer( FT_Library       library,
-                   FT_Glyph_Format  format );
-
-

    -
    -

    Retrieve the current renderer for a given glyph format.

    -

    -
    input
    -

    - - - -
    library -

    A handle to the library object.

    -
    format -

    The glyph format.

    -
    -
    -
    return
    -

    A renderer handle. 0 if none found.

    -
    -
    note
    -

    An error will be returned if a module already exists by that name, or if the module requires a version of FreeType that is too great.

    -

    To add a new renderer, simply use FT_Add_Module. To retrieve a renderer by its name, use FT_Get_Module.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Set_Renderer

    -
    -Defined in FT_RENDER_H (freetype/ftrender.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Set_Renderer( FT_Library     library,
-                   FT_Renderer    renderer,
-                   FT_UInt        num_params,
-                   FT_Parameter*  parameters );
-
-

    -
    -

    Set the current renderer to use, and set additional mode.

    -

    -
    inout
    -

    - - -
    library -

    A handle to the library object.

    -
    -
    -
    input
    -

    - - - - -
    renderer -

    A handle to the renderer object.

    -
    num_params -

    The number of additional parameters.

    -
    parameters -

    Additional parameters.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    In case of success, the renderer will be used to convert glyph images in the renderer's known format into bitmaps.

    -

    This doesn't change the current renderer for other formats.

    -

    Currently, only the B/W renderer, if compiled with FT_RASTER_OPTION_ANTI_ALIASING (providing a 5-levels anti-aliasing mode; this option must be set directly in ‘ftraster.c’ and is undefined by default) accepts a single tag ‘pal5’ to set its gray palette as a character string with 5 elements. Consequently, the third and fourth argument are zero normally.

    -
    -
    -
    - - -
    [Index][TOC]
    - - - diff --git a/docs/reference/ft2-multiple_masters.html b/docs/reference/ft2-multiple_masters.html deleted file mode 100644 index 3f3ad2e..0000000 --- a/docs/reference/ft2-multiple_masters.html +++ /dev/null @@ -1,511 +0,0 @@ - - - - -FreeType-2.4.9 API Reference - - - - - - -
    [Index][TOC]
    -

    FreeType-2.4.9 API Reference

    - -

    -Multiple Masters -

    -

    Synopsis

    - - - - - - - -
    FT_MM_AxisFT_Get_MM_Var
    FT_Multi_MasterFT_Set_MM_Design_Coordinates
    FT_Var_AxisFT_Set_Var_Design_Coordinates
    FT_Var_Named_StyleFT_Set_MM_Blend_Coordinates
    FT_MM_VarFT_Set_Var_Blend_Coordinates
    FT_Get_Multi_Master


    - -
    -

    The following types and functions are used to manage Multiple Master fonts, i.e., the selection of specific design instances by setting design axis coordinates.

    -

    George Williams has extended this interface to make it work with both Type 1 Multiple Masters fonts and GX distortable (var) fonts. Some of these routines only work with MM fonts, others will work with both types. They are similar enough that a consistent interface makes sense.

    -

    -
    -

    FT_MM_Axis

    -
    -Defined in FT_MULTIPLE_MASTERS_H (freetype/ftmm.h). -

    -
    -
-  typedef struct  FT_MM_Axis_
-  {
-    FT_String*  name;
-    FT_Long     minimum;
-    FT_Long     maximum;
-
-  } FT_MM_Axis;
-
-

    -
    -

    A simple structure used to model a given axis in design space for Multiple Masters fonts.

    -

    This structure can't be used for GX var fonts.

    -

    -
    fields
    -

    - - - - -
    name -

    The axis's name.

    -
    minimum -

    The axis's minimum design coordinate.

    -
    maximum -

    The axis's maximum design coordinate.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Multi_Master

    -
    -Defined in FT_MULTIPLE_MASTERS_H (freetype/ftmm.h). -

    -
    -
-  typedef struct  FT_Multi_Master_
-  {
-    FT_UInt     num_axis;
-    FT_UInt     num_designs;
-    FT_MM_Axis  axis[T1_MAX_MM_AXIS];
-
-  } FT_Multi_Master;
-
-

    -
    -

    A structure used to model the axes and space of a Multiple Masters font.

    -

    This structure can't be used for GX var fonts.

    -

    -
    fields
    -

    - - - - -
    num_axis -

    Number of axes. Cannot exceed 4.

    -
    num_designs -

    Number of designs; should be normally 2^num_axis even though the Type 1 specification strangely allows for intermediate designs to be present. This number cannot exceed 16.

    -
    axis -

    A table of axis descriptors.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Var_Axis

    -
    -Defined in FT_MULTIPLE_MASTERS_H (freetype/ftmm.h). -

    -
    -
-  typedef struct  FT_Var_Axis_
-  {
-    FT_String*  name;
-
-    FT_Fixed    minimum;
-    FT_Fixed    def;
-    FT_Fixed    maximum;
-
-    FT_ULong    tag;
-    FT_UInt     strid;
-
-  } FT_Var_Axis;
-
-

    -
    -

    A simple structure used to model a given axis in design space for Multiple Masters and GX var fonts.

    -

    -
    fields
    -

    - - - - - - - -
    name -

    The axis's name. Not always meaningful for GX.

    -
    minimum -

    The axis's minimum design coordinate.

    -
    def -

    The axis's default design coordinate. FreeType computes meaningful default values for MM; it is then an integer value, not in 16.16 format.

    -
    maximum -

    The axis's maximum design coordinate.

    -
    tag -

    The axis's tag (the GX equivalent to ‘name’). FreeType provides default values for MM if possible.

    -
    strid -

    The entry in ‘name’ table (another GX version of ‘name’). Not meaningful for MM.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Var_Named_Style

    -
    -Defined in FT_MULTIPLE_MASTERS_H (freetype/ftmm.h). -

    -
    -
-  typedef struct  FT_Var_Named_Style_
-  {
-    FT_Fixed*  coords;
-    FT_UInt    strid;
-
-  } FT_Var_Named_Style;
-
-

    -
    -

    A simple structure used to model a named style in a GX var font.

    -

    This structure can't be used for MM fonts.

    -

    -
    fields
    -

    - - - -
    coords -

    The design coordinates for this style. This is an array with one entry for each axis.

    -
    strid -

    The entry in ‘name’ table identifying this style.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_MM_Var

    -
    -Defined in FT_MULTIPLE_MASTERS_H (freetype/ftmm.h). -

    -
    -
-  typedef struct  FT_MM_Var_
-  {
-    FT_UInt              num_axis;
-    FT_UInt              num_designs;
-    FT_UInt              num_namedstyles;
-    FT_Var_Axis*         axis;
-    FT_Var_Named_Style*  namedstyle;
-
-  } FT_MM_Var;
-
-

    -
    -

    A structure used to model the axes and space of a Multiple Masters or GX var distortable font.

    -

    Some fields are specific to one format and not to the other.

    -

    -
    fields
    -

    - - - - - - -
    num_axis -

    The number of axes. The maximum value is 4 for MM; no limit in GX.

    -
    num_designs -

    The number of designs; should be normally 2^num_axis for MM fonts. Not meaningful for GX (where every glyph could have a different number of designs).

    -
    num_namedstyles -

    The number of named styles; only meaningful for GX which allows certain design coordinates to have a string ID (in the ‘name’ table) associated with them. The font can tell the user that, for example, Weight=1.5 is ‘Bold’.

    -
    axis -

    A table of axis descriptors. GX fonts contain slightly more data than MM.

    -
    namedstyles -

    A table of named styles. Only meaningful with GX.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Get_Multi_Master

    -
    -Defined in FT_MULTIPLE_MASTERS_H (freetype/ftmm.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Get_Multi_Master( FT_Face           face,
-                       FT_Multi_Master  *amaster );
-
-

    -
    -

    Retrieve the Multiple Master descriptor of a given font.

    -

    This function can't be used with GX fonts.

    -

    -
    input
    -

    - - -
    face -

    A handle to the source face.

    -
    -
    -
    output
    -

    - - -
    amaster -

    The Multiple Masters descriptor.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Get_MM_Var

    -
    -Defined in FT_MULTIPLE_MASTERS_H (freetype/ftmm.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Get_MM_Var( FT_Face      face,
-                 FT_MM_Var*  *amaster );
-
-

    -
    -

    Retrieve the Multiple Master/GX var descriptor of a given font.

    -

    -
    input
    -

    - - -
    face -

    A handle to the source face.

    -
    -
    -
    output
    -

    - - -
    amaster -

    The Multiple Masters/GX var descriptor. Allocates a data structure, which the user must free (a single call to FT_FREE will do it).

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Set_MM_Design_Coordinates

    -
    -Defined in FT_MULTIPLE_MASTERS_H (freetype/ftmm.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Set_MM_Design_Coordinates( FT_Face   face,
-                                FT_UInt   num_coords,
-                                FT_Long*  coords );
-
-

    -
    -

    For Multiple Masters fonts, choose an interpolated font design through design coordinates.

    -

    This function can't be used with GX fonts.

    -

    -
    inout
    -

    - - -
    face -

    A handle to the source face.

    -
    -
    -
    input
    -

    - - - -
    num_coords -

    The number of design coordinates (must be equal to the number of axes in the font).

    -
    coords -

    An array of design coordinates.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Set_Var_Design_Coordinates

    -
    -Defined in FT_MULTIPLE_MASTERS_H (freetype/ftmm.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Set_Var_Design_Coordinates( FT_Face    face,
-                                 FT_UInt    num_coords,
-                                 FT_Fixed*  coords );
-
-

    -
    -

    For Multiple Master or GX Var fonts, choose an interpolated font design through design coordinates.

    -

    -
    inout
    -

    - - -
    face -

    A handle to the source face.

    -
    -
    -
    input
    -

    - - - -
    num_coords -

    The number of design coordinates (must be equal to the number of axes in the font).

    -
    coords -

    An array of design coordinates.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Set_MM_Blend_Coordinates

    -
    -Defined in FT_MULTIPLE_MASTERS_H (freetype/ftmm.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Set_MM_Blend_Coordinates( FT_Face    face,
-                               FT_UInt    num_coords,
-                               FT_Fixed*  coords );
-
-

    -
    -

    For Multiple Masters and GX var fonts, choose an interpolated font design through normalized blend coordinates.

    -

    -
    inout
    -

    - - -
    face -

    A handle to the source face.

    -
    -
    -
    input
    -

    - - - -
    num_coords -

    The number of design coordinates (must be equal to the number of axes in the font).

    -
    coords -

    The design coordinates array (each element must be between 0 and 1.0).

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Set_Var_Blend_Coordinates

    -
    -Defined in FT_MULTIPLE_MASTERS_H (freetype/ftmm.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Set_Var_Blend_Coordinates( FT_Face    face,
-                                FT_UInt    num_coords,
-                                FT_Fixed*  coords );
-
-

    -
    -

    This is another name of FT_Set_MM_Blend_Coordinates.

    -

    -
    -
    - - -
    [Index][TOC]
    - - - diff --git a/docs/reference/ft2-ot_validation.html b/docs/reference/ft2-ot_validation.html deleted file mode 100644 index edc8f76..0000000 --- a/docs/reference/ft2-ot_validation.html +++ /dev/null @@ -1,208 +0,0 @@ - - - - -FreeType-2.4.9 API Reference - - - - - - -
    [Index][TOC]
    -

    FreeType-2.4.9 API Reference

    - -

    -OpenType Validation -

    -

    Synopsis

    - - -
    FT_VALIDATE_OTXXXFT_OpenType_ValidateFT_OpenType_Free


    - -
    -

    This section contains the declaration of functions to validate some OpenType tables (BASE, GDEF, GPOS, GSUB, JSTF, MATH).

    -

    -
    -

    FT_VALIDATE_OTXXX

    -
    -Defined in FT_OPENTYPE_VALIDATE_H (freetype/ftotval.h). -

    -
    -
-#define FT_VALIDATE_BASE  0x0100
-#define FT_VALIDATE_GDEF  0x0200
-#define FT_VALIDATE_GPOS  0x0400
-#define FT_VALIDATE_GSUB  0x0800
-#define FT_VALIDATE_JSTF  0x1000
-#define FT_VALIDATE_MATH  0x2000
-
-#define FT_VALIDATE_OT  FT_VALIDATE_BASE | \
-                        FT_VALIDATE_GDEF | \
-                        FT_VALIDATE_GPOS | \
-                        FT_VALIDATE_GSUB | \
-                        FT_VALIDATE_JSTF | \
-                        FT_VALIDATE_MATH
-
-

    -
    -

    A list of bit-field constants used with FT_OpenType_Validate to indicate which OpenType tables should be validated.

    -

    -
    values
    -

    - - - - - - - - -
    FT_VALIDATE_BASE -

    Validate BASE table.

    -
    FT_VALIDATE_GDEF -

    Validate GDEF table.

    -
    FT_VALIDATE_GPOS -

    Validate GPOS table.

    -
    FT_VALIDATE_GSUB -

    Validate GSUB table.

    -
    FT_VALIDATE_JSTF -

    Validate JSTF table.

    -
    FT_VALIDATE_MATH -

    Validate MATH table.

    -
    FT_VALIDATE_OT -

    Validate all OpenType tables (BASE, GDEF, GPOS, GSUB, JSTF, MATH).

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_OpenType_Validate

    -
    -Defined in FT_OPENTYPE_VALIDATE_H (freetype/ftotval.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_OpenType_Validate( FT_Face    face,
-                        FT_UInt    validation_flags,
-                        FT_Bytes  *BASE_table,
-                        FT_Bytes  *GDEF_table,
-                        FT_Bytes  *GPOS_table,
-                        FT_Bytes  *GSUB_table,
-                        FT_Bytes  *JSTF_table );
-
-

    -
    -

    Validate various OpenType tables to assure that all offsets and indices are valid. The idea is that a higher-level library which actually does the text layout can access those tables without error checking (which can be quite time consuming).

    -

    -
    input
    -

    - - - -
    face -

    A handle to the input face.

    -
    validation_flags -

    A bit field which specifies the tables to be validated. See FT_VALIDATE_OTXXX for possible values.

    -
    -
    -
    output
    -

    - - - - - - -
    BASE_table -

    A pointer to the BASE table.

    -
    GDEF_table -

    A pointer to the GDEF table.

    -
    GPOS_table -

    A pointer to the GPOS table.

    -
    GSUB_table -

    A pointer to the GSUB table.

    -
    JSTF_table -

    A pointer to the JSTF table.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    This function only works with OpenType fonts, returning an error otherwise.

    -

    After use, the application should deallocate the five tables with FT_OpenType_Free. A NULL value indicates that the table either doesn't exist in the font, or the application hasn't asked for validation.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_OpenType_Free

    -
    -Defined in FT_OPENTYPE_VALIDATE_H (freetype/ftotval.h). -

    -
    -
-  FT_EXPORT( void )
-  FT_OpenType_Free( FT_Face   face,
-                    FT_Bytes  table );
-
-

    -
    -

    Free the buffer allocated by OpenType validator.

    -

    -
    input
    -

    - - - -
    face -

    A handle to the input face.

    -
    table -

    The pointer to the buffer that is allocated by FT_OpenType_Validate.

    -
    -
    -
    note
    -

    This function must be used to free the buffer allocated by FT_OpenType_Validate only.

    -
    -
    -
    - - -
    [Index][TOC]
    - - - diff --git a/docs/reference/ft2-outline_processing.html b/docs/reference/ft2-outline_processing.html deleted file mode 100644 index a36f136..0000000 --- a/docs/reference/ft2-outline_processing.html +++ /dev/null @@ -1,1125 +0,0 @@ - - - - -FreeType-2.4.9 API Reference - - - - - - -
    [Index][TOC]
    -

    FreeType-2.4.9 API Reference

    - -

    -Outline Processing -

    -

    Synopsis

    - - - - - - - - - - - - - -
    FT_OutlineFT_Outline_MoveToFunc
    FT_OUTLINE_FLAGSFT_Outline_LineToFunc
    FT_Outline_NewFT_Outline_ConicToFunc
    FT_Outline_DoneFT_Outline_CubicToFunc
    FT_Outline_CopyFT_Outline_Funcs
    FT_Outline_TranslateFT_Outline_Decompose
    FT_Outline_TransformFT_Outline_Get_CBox
    FT_Outline_EmboldenFT_Outline_Get_Bitmap
    FT_Outline_ReverseFT_Outline_Render
    FT_Outline_CheckFT_Orientation
    FT_Outline_Get_BBoxFT_Outline_Get_Orientation
    ft_outline_flags


    - -
    -

    This section contains routines used to create and destroy scalable glyph images known as ‘outlines’. These can also be measured, transformed, and converted into bitmaps and pixmaps.

    -

    -
    -

    FT_Outline

    -
    -Defined in FT_IMAGE_H (freetype/ftimage.h). -

    -
    -
-  typedef struct  FT_Outline_
-  {
-    short       n_contours;      /* number of contours in glyph        */
-    short       n_points;        /* number of points in the glyph      */
-
-    FT_Vector*  points;          /* the outline's points               */
-    char*       tags;            /* the points flags                   */
-    short*      contours;        /* the contour end points             */
-
-    int         flags;           /* outline masks                      */
-
-  } FT_Outline;
-
-  /* Following limits must be consistent with */
-  /* FT_Outline.{n_contours,n_points}         */
-#define FT_OUTLINE_CONTOURS_MAX  SHRT_MAX
-#define FT_OUTLINE_POINTS_MAX    SHRT_MAX
-
-

    -
    -

    This structure is used to describe an outline to the scan-line converter.

    -

    -
    fields
    -

    - - - - - - - -
    n_contours -

    The number of contours in the outline.

    -
    n_points -

    The number of points in the outline.

    -
    points -

    A pointer to an array of ‘n_points’ FT_Vector elements, giving the outline's point coordinates.

    -
    tags -

    A pointer to an array of ‘n_points’ chars, giving each outline point's type.

    -

    If bit 0 is unset, the point is ‘off’ the curve, i.e., a Bézier control point, while it is ‘on’ if set.

    -

    Bit 1 is meaningful for ‘off’ points only. If set, it indicates a third-order Bézier arc control point; and a second-order control point if unset.

    -

    If bit 2 is set, bits 5-7 contain the drop-out mode (as defined in the OpenType specification; the value is the same as the argument to the SCANMODE instruction).

    -

    Bits 3 and 4 are reserved for internal purposes.

    -
    contours -

    An array of ‘n_contours’ shorts, giving the end point of each contour within the outline. For example, the first contour is defined by the points ‘0’ to ‘contours[0]’, the second one is defined by the points ‘contours[0]+1’ to ‘contours[1]’, etc.

    -
    flags -

    A set of bit flags used to characterize the outline and give hints to the scan-converter and hinter on how to convert/grid-fit it. See FT_OUTLINE_FLAGS.

    -
    -
    -
    note
    -

    The B/W rasterizer only checks bit 2 in the ‘tags’ array for the first point of each contour. The drop-out mode as given with FT_OUTLINE_IGNORE_DROPOUTS, FT_OUTLINE_SMART_DROPOUTS, and FT_OUTLINE_INCLUDE_STUBS in ‘flags’ is then overridden.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_OUTLINE_FLAGS

    -
    -Defined in FT_IMAGE_H (freetype/ftimage.h). -

    -
    -
-#define FT_OUTLINE_NONE             0x0
-#define FT_OUTLINE_OWNER            0x1
-#define FT_OUTLINE_EVEN_ODD_FILL    0x2
-#define FT_OUTLINE_REVERSE_FILL     0x4
-#define FT_OUTLINE_IGNORE_DROPOUTS  0x8
-#define FT_OUTLINE_SMART_DROPOUTS   0x10
-#define FT_OUTLINE_INCLUDE_STUBS    0x20
-
-#define FT_OUTLINE_HIGH_PRECISION   0x100
-#define FT_OUTLINE_SINGLE_PASS      0x200
-
-

    -
    -

    A list of bit-field constants use for the flags in an outline's ‘flags’ field.

    -

    -
    values
    -

    - - - - - - - - - - - - - - - - -
    FT_OUTLINE_NONE -

    Value 0 is reserved.

    -
    FT_OUTLINE_OWNER -

    If set, this flag indicates that the outline's field arrays (i.e., ‘points’, ‘flags’, and ‘contours’) are ‘owned’ by the outline object, and should thus be freed when it is destroyed.

    -
    FT_OUTLINE_EVEN_ODD_FILL
    -

    By default, outlines are filled using the non-zero winding rule. If set to 1, the outline will be filled using the even-odd fill rule (only works with the smooth rasterizer).

    -
    FT_OUTLINE_REVERSE_FILL
    -

    By default, outside contours of an outline are oriented in clock-wise direction, as defined in the TrueType specification. This flag is set if the outline uses the opposite direction (typically for Type 1 fonts). This flag is ignored by the scan converter.

    -
    FT_OUTLINE_IGNORE_DROPOUTS
    -

    By default, the scan converter will try to detect drop-outs in an outline and correct the glyph bitmap to ensure consistent shape continuity. If set, this flag hints the scan-line converter to ignore such cases. See below for more information.

    -
    FT_OUTLINE_SMART_DROPOUTS
    -

    Select smart dropout control. If unset, use simple dropout control. Ignored if FT_OUTLINE_IGNORE_DROPOUTS is set. See below for more information.

    -
    FT_OUTLINE_INCLUDE_STUBS
    -

    If set, turn pixels on for ‘stubs’, otherwise exclude them. Ignored if FT_OUTLINE_IGNORE_DROPOUTS is set. See below for more information.

    -
    FT_OUTLINE_HIGH_PRECISION
    -

    This flag indicates that the scan-line converter should try to convert this outline to bitmaps with the highest possible quality. It is typically set for small character sizes. Note that this is only a hint that might be completely ignored by a given scan-converter.

    -
    FT_OUTLINE_SINGLE_PASS -

    This flag is set to force a given scan-converter to only use a single pass over the outline to render a bitmap glyph image. Normally, it is set for very large character sizes. It is only a hint that might be completely ignored by a given scan-converter.

    -
    -
    -
    note
    -

    The flags FT_OUTLINE_IGNORE_DROPOUTS, FT_OUTLINE_SMART_DROPOUTS, and FT_OUTLINE_INCLUDE_STUBS are ignored by the smooth rasterizer.

    -

    There exists a second mechanism to pass the drop-out mode to the B/W rasterizer; see the ‘tags’ field in FT_Outline.

    -

    Please refer to the description of the ‘SCANTYPE’ instruction in the OpenType specification (in file ‘ttinst1.doc’) how simple drop-outs, smart drop-outs, and stubs are defined.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Outline_New

    -
    -Defined in FT_OUTLINE_H (freetype/ftoutln.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Outline_New( FT_Library   library,
-                  FT_UInt      numPoints,
-                  FT_Int       numContours,
-                  FT_Outline  *anoutline );
-
-
-  FT_EXPORT( FT_Error )
-  FT_Outline_New_Internal( FT_Memory    memory,
-                           FT_UInt      numPoints,
-                           FT_Int       numContours,
-                           FT_Outline  *anoutline );
-
-

    -
    -

    Create a new outline of a given size.

    -

    -
    input
    -

    - - - - -
    library -

    A handle to the library object from where the outline is allocated. Note however that the new outline will not necessarily be freed, when destroying the library, by FT_Done_FreeType.

    -
    numPoints -

    The maximal number of points within the outline.

    -
    numContours -

    The maximal number of contours within the outline.

    -
    -
    -
    output
    -

    - - -
    anoutline -

    A handle to the new outline.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    The reason why this function takes a ‘library’ parameter is simply to use the library's memory allocator.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Outline_Done

    -
    -Defined in FT_OUTLINE_H (freetype/ftoutln.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Outline_Done( FT_Library   library,
-                   FT_Outline*  outline );
-
-
-  FT_EXPORT( FT_Error )
-  FT_Outline_Done_Internal( FT_Memory    memory,
-                            FT_Outline*  outline );
-
-

    -
    -

    Destroy an outline created with FT_Outline_New.

    -

    -
    input
    -

    - - - -
    library -

    A handle of the library object used to allocate the outline.

    -
    outline -

    A pointer to the outline object to be discarded.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    If the outline's ‘owner’ field is not set, only the outline descriptor will be released.

    -

    The reason why this function takes an ‘library’ parameter is simply to use ft_mem_free().

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Outline_Copy

    -
    -Defined in FT_OUTLINE_H (freetype/ftoutln.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Outline_Copy( const FT_Outline*  source,
-                   FT_Outline        *target );
-
-

    -
    -

    Copy an outline into another one. Both objects must have the same sizes (number of points & number of contours) when this function is called.

    -

    -
    input
    -

    - - -
    source -

    A handle to the source outline.

    -
    -
    -
    output
    -

    - - -
    target -

    A handle to the target outline.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Outline_Translate

    -
    -Defined in FT_OUTLINE_H (freetype/ftoutln.h). -

    -
    -
-  FT_EXPORT( void )
-  FT_Outline_Translate( const FT_Outline*  outline,
-                        FT_Pos             xOffset,
-                        FT_Pos             yOffset );
-
-

    -
    -

    Apply a simple translation to the points of an outline.

    -

    -
    inout
    -

    - - -
    outline -

    A pointer to the target outline descriptor.

    -
    -
    -
    input
    -

    - - - -
    xOffset -

    The horizontal offset.

    -
    yOffset -

    The vertical offset.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Outline_Transform

    -
    -Defined in FT_OUTLINE_H (freetype/ftoutln.h). -

    -
    -
-  FT_EXPORT( void )
-  FT_Outline_Transform( const FT_Outline*  outline,
-                        const FT_Matrix*   matrix );
-
-

    -
    -

    Apply a simple 2x2 matrix to all of an outline's points. Useful for applying rotations, slanting, flipping, etc.

    -

    -
    inout
    -

    - - -
    outline -

    A pointer to the target outline descriptor.

    -
    -
    -
    input
    -

    - - -
    matrix -

    A pointer to the transformation matrix.

    -
    -
    -
    note
    -

    You can use FT_Outline_Translate if you need to translate the outline's points.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Outline_Embolden

    -
    -Defined in FT_OUTLINE_H (freetype/ftoutln.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Outline_Embolden( FT_Outline*  outline,
-                       FT_Pos       strength );
-
-

    -
    -

    Embolden an outline. The new outline will be at most 4 times ‘strength’ pixels wider and higher. You may think of the left and bottom borders as unchanged.

    -

    Negative ‘strength’ values to reduce the outline thickness are possible also.

    -

    -
    inout
    -

    - - -
    outline -

    A handle to the target outline.

    -
    -
    -
    input
    -

    - - -
    strength -

    How strong the glyph is emboldened. Expressed in 26.6 pixel format.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    The used algorithm to increase or decrease the thickness of the glyph doesn't change the number of points; this means that certain situations like acute angles or intersections are sometimes handled incorrectly.

    -

    If you need ‘better’ metrics values you should call FT_Outline_Get_CBox or FT_Outline_Get_BBox.

    -

    Example call:

    -
    -  FT_Load_Glyph( face, index, FT_LOAD_DEFAULT );                   
-  if ( face->slot->format == FT_GLYPH_FORMAT_OUTLINE )             
-    FT_Outline_Embolden( &face->slot->outline, strength );         
-
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Outline_Reverse

    -
    -Defined in FT_OUTLINE_H (freetype/ftoutln.h). -

    -
    -
-  FT_EXPORT( void )
-  FT_Outline_Reverse( FT_Outline*  outline );
-
-

    -
    -

    Reverse the drawing direction of an outline. This is used to ensure consistent fill conventions for mirrored glyphs.

    -

    -
    inout
    -

    - - -
    outline -

    A pointer to the target outline descriptor.

    -
    -
    -
    note
    -

    This function toggles the bit flag FT_OUTLINE_REVERSE_FILL in the outline's ‘flags’ field.

    -

    It shouldn't be used by a normal client application, unless it knows what it is doing.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Outline_Check

    -
    -Defined in FT_OUTLINE_H (freetype/ftoutln.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Outline_Check( FT_Outline*  outline );
-
-

    -
    -

    Check the contents of an outline descriptor.

    -

    -
    input
    -

    - - -
    outline -

    A handle to a source outline.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Outline_Get_BBox

    -
    -Defined in FT_BBOX_H (freetype/ftbbox.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Outline_Get_BBox( FT_Outline*  outline,
-                       FT_BBox     *abbox );
-
-

    -
    -

    Compute the exact bounding box of an outline. This is slower than computing the control box. However, it uses an advanced algorithm which returns very quickly when the two boxes coincide. Otherwise, the outline Bézier arcs are traversed to extract their extrema.

    -

    -
    input
    -

    - - -
    outline -

    A pointer to the source outline.

    -
    -
    -
    output
    -

    - - -
    abbox -

    The outline's exact bounding box.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    If the font is tricky and the glyph has been loaded with FT_LOAD_NO_SCALE, the resulting BBox is meaningless. To get reasonable values for the BBox it is necessary to load the glyph at a large ppem value (so that the hinting instructions can properly shift and scale the subglyphs), then extracting the BBox which can be eventually converted back to font units.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    ft_outline_flags

    -
    -Defined in FT_IMAGE_H (freetype/ftimage.h). -

    -
    -
-#define ft_outline_none             FT_OUTLINE_NONE
-#define ft_outline_owner            FT_OUTLINE_OWNER
-#define ft_outline_even_odd_fill    FT_OUTLINE_EVEN_ODD_FILL
-#define ft_outline_reverse_fill     FT_OUTLINE_REVERSE_FILL
-#define ft_outline_ignore_dropouts  FT_OUTLINE_IGNORE_DROPOUTS
-#define ft_outline_high_precision   FT_OUTLINE_HIGH_PRECISION
-#define ft_outline_single_pass      FT_OUTLINE_SINGLE_PASS
-
-

    -
    -

    These constants are deprecated. Please use the corresponding FT_OUTLINE_FLAGS values.

    -

    -
    values
    -

    - - - - - - - - - - - - -
    ft_outline_none -

    See FT_OUTLINE_NONE.

    -
    ft_outline_owner -

    See FT_OUTLINE_OWNER.

    -
    ft_outline_even_odd_fill
    -

    See FT_OUTLINE_EVEN_ODD_FILL.

    -
    ft_outline_reverse_fill
    -

    See FT_OUTLINE_REVERSE_FILL.

    -
    ft_outline_ignore_dropouts
    -

    See FT_OUTLINE_IGNORE_DROPOUTS.

    -
    ft_outline_high_precision
    -

    See FT_OUTLINE_HIGH_PRECISION.

    -
    ft_outline_single_pass -

    See FT_OUTLINE_SINGLE_PASS.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Outline_MoveToFunc

    -
    -Defined in FT_IMAGE_H (freetype/ftimage.h). -

    -
    -
-  typedef int
-  (*FT_Outline_MoveToFunc)( const FT_Vector*  to,
-                            void*             user );
-
-#define FT_Outline_MoveTo_Func  FT_Outline_MoveToFunc
-
-

    -
    -

    A function pointer type used to describe the signature of a ‘move to’ function during outline walking/decomposition.

    -

    A ‘move to’ is emitted to start a new contour in an outline.

    -

    -
    input
    -

    - - - -
    to -

    A pointer to the target point of the ‘move to’.

    -
    user -

    A typeless pointer which is passed from the caller of the decomposition function.

    -
    -
    -
    return
    -

    Error code. 0 means success.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Outline_LineToFunc

    -
    -Defined in FT_IMAGE_H (freetype/ftimage.h). -

    -
    -
-  typedef int
-  (*FT_Outline_LineToFunc)( const FT_Vector*  to,
-                            void*             user );
-
-#define FT_Outline_LineTo_Func  FT_Outline_LineToFunc
-
-

    -
    -

    A function pointer type used to describe the signature of a ‘line to’ function during outline walking/decomposition.

    -

    A ‘line to’ is emitted to indicate a segment in the outline.

    -

    -
    input
    -

    - - - -
    to -

    A pointer to the target point of the ‘line to’.

    -
    user -

    A typeless pointer which is passed from the caller of the decomposition function.

    -
    -
    -
    return
    -

    Error code. 0 means success.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Outline_ConicToFunc

    -
    -Defined in FT_IMAGE_H (freetype/ftimage.h). -

    -
    -
-  typedef int
-  (*FT_Outline_ConicToFunc)( const FT_Vector*  control,
-                             const FT_Vector*  to,
-                             void*             user );
-
-#define FT_Outline_ConicTo_Func  FT_Outline_ConicToFunc
-
-

    -
    -

    A function pointer type used to describe the signature of a ‘conic to’ function during outline walking or decomposition.

    -

    A ‘conic to’ is emitted to indicate a second-order Bézier arc in the outline.

    -

    -
    input
    -

    - - - - -
    control -

    An intermediate control point between the last position and the new target in ‘to’.

    -
    to -

    A pointer to the target end point of the conic arc.

    -
    user -

    A typeless pointer which is passed from the caller of the decomposition function.

    -
    -
    -
    return
    -

    Error code. 0 means success.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Outline_CubicToFunc

    -
    -Defined in FT_IMAGE_H (freetype/ftimage.h). -

    -
    -
-  typedef int
-  (*FT_Outline_CubicToFunc)( const FT_Vector*  control1,
-                             const FT_Vector*  control2,
-                             const FT_Vector*  to,
-                             void*             user );
-
-#define FT_Outline_CubicTo_Func  FT_Outline_CubicToFunc
-
-

    -
    -

    A function pointer type used to describe the signature of a ‘cubic to’ function during outline walking or decomposition.

    -

    A ‘cubic to’ is emitted to indicate a third-order Bézier arc.

    -

    -
    input
    -

    - - - - - -
    control1 -

    A pointer to the first Bézier control point.

    -
    control2 -

    A pointer to the second Bézier control point.

    -
    to -

    A pointer to the target end point.

    -
    user -

    A typeless pointer which is passed from the caller of the decomposition function.

    -
    -
    -
    return
    -

    Error code. 0 means success.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Outline_Funcs

    -
    -Defined in FT_IMAGE_H (freetype/ftimage.h). -

    -
    -
-  typedef struct  FT_Outline_Funcs_
-  {
-    FT_Outline_MoveToFunc   move_to;
-    FT_Outline_LineToFunc   line_to;
-    FT_Outline_ConicToFunc  conic_to;
-    FT_Outline_CubicToFunc  cubic_to;
-
-    int                     shift;
-    FT_Pos                  delta;
-
-  } FT_Outline_Funcs;
-
-

    -
    -

    A structure to hold various function pointers used during outline decomposition in order to emit segments, conic, and cubic Béziers.

    -

    -
    fields
    -

    - - - - - - - -
    move_to -

    The ‘move to’ emitter.

    -
    line_to -

    The segment emitter.

    -
    conic_to -

    The second-order Bézier arc emitter.

    -
    cubic_to -

    The third-order Bézier arc emitter.

    -
    shift -

    The shift that is applied to coordinates before they are sent to the emitter.

    -
    delta -

    The delta that is applied to coordinates before they are sent to the emitter, but after the shift.

    -
    -
    -
    note
    -

    The point coordinates sent to the emitters are the transformed version of the original coordinates (this is important for high accuracy during scan-conversion). The transformation is simple:

    -
    -  x' = (x << shift) - delta                                        
-  y' = (x << shift) - delta                                        
-
    -

    Set the values of ‘shift’ and ‘delta’ to 0 to get the original point coordinates.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Outline_Decompose

    -
    -Defined in FT_OUTLINE_H (freetype/ftoutln.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Outline_Decompose( FT_Outline*              outline,
-                        const FT_Outline_Funcs*  func_interface,
-                        void*                    user );
-
-

    -
    -

    Walk over an outline's structure to decompose it into individual segments and Bézier arcs. This function also emits ‘move to’ operations to indicate the start of new contours in the outline.

    -

    -
    input
    -

    - - - -
    outline -

    A pointer to the source target.

    -
    func_interface -

    A table of ‘emitters’, i.e., function pointers called during decomposition to indicate path operations.

    -
    -
    -
    inout
    -

    - - -
    user -

    A typeless pointer which is passed to each emitter during the decomposition. It can be used to store the state during the decomposition.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Outline_Get_CBox

    -
    -Defined in FT_OUTLINE_H (freetype/ftoutln.h). -

    -
    -
-  FT_EXPORT( void )
-  FT_Outline_Get_CBox( const FT_Outline*  outline,
-                       FT_BBox           *acbox );
-
-

    -
    -

    Return an outline's ‘control box’. The control box encloses all the outline's points, including Bézier control points. Though it coincides with the exact bounding box for most glyphs, it can be slightly larger in some situations (like when rotating an outline which contains Bézier outside arcs).

    -

    Computing the control box is very fast, while getting the bounding box can take much more time as it needs to walk over all segments and arcs in the outline. To get the latter, you can use the ‘ftbbox’ component which is dedicated to this single task.

    -

    -
    input
    -

    - - -
    outline -

    A pointer to the source outline descriptor.

    -
    -
    -
    output
    -

    - - -
    acbox -

    The outline's control box.

    -
    -
    -
    note
    -

    See FT_Glyph_Get_CBox for a discussion of tricky fonts.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Outline_Get_Bitmap

    -
    -Defined in FT_OUTLINE_H (freetype/ftoutln.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Outline_Get_Bitmap( FT_Library        library,
-                         FT_Outline*       outline,
-                         const FT_Bitmap  *abitmap );
-
-

    -
    -

    Render an outline within a bitmap. The outline's image is simply OR-ed to the target bitmap.

    -

    -
    input
    -

    - - - -
    library -

    A handle to a FreeType library object.

    -
    outline -

    A pointer to the source outline descriptor.

    -
    -
    -
    inout
    -

    - - -
    abitmap -

    A pointer to the target bitmap descriptor.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    This function does NOT CREATE the bitmap, it only renders an outline image within the one you pass to it! Consequently, the various fields in ‘abitmap’ should be set accordingly.

    -

    It will use the raster corresponding to the default glyph format.

    -

    The value of the ‘num_grays’ field in ‘abitmap’ is ignored. If you select the gray-level rasterizer, and you want less than 256 gray levels, you have to use FT_Outline_Render directly.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Outline_Render

    -
    -Defined in FT_OUTLINE_H (freetype/ftoutln.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Outline_Render( FT_Library         library,
-                     FT_Outline*        outline,
-                     FT_Raster_Params*  params );
-
-

    -
    -

    Render an outline within a bitmap using the current scan-convert. This function uses an FT_Raster_Params structure as an argument, allowing advanced features like direct composition, translucency, etc.

    -

    -
    input
    -

    - - - -
    library -

    A handle to a FreeType library object.

    -
    outline -

    A pointer to the source outline descriptor.

    -
    -
    -
    inout
    -

    - - -
    params -

    A pointer to an FT_Raster_Params structure used to describe the rendering operation.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    You should know what you are doing and how FT_Raster_Params works to use this function.

    -

    The field ‘params.source’ will be set to ‘outline’ before the scan converter is called, which means that the value you give to it is actually ignored.

    -

    The gray-level rasterizer always uses 256 gray levels. If you want less gray levels, you have to provide your own span callback. See the FT_RASTER_FLAG_DIRECT value of the ‘flags’ field in the FT_Raster_Params structure for more details.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Orientation

    -
    -Defined in FT_OUTLINE_H (freetype/ftoutln.h). -

    -
    -
-  typedef enum  FT_Orientation_
-  {
-    FT_ORIENTATION_TRUETYPE   = 0,
-    FT_ORIENTATION_POSTSCRIPT = 1,
-    FT_ORIENTATION_FILL_RIGHT = FT_ORIENTATION_TRUETYPE,
-    FT_ORIENTATION_FILL_LEFT  = FT_ORIENTATION_POSTSCRIPT,
-    FT_ORIENTATION_NONE
-
-  } FT_Orientation;
-
-

    -
    -

    A list of values used to describe an outline's contour orientation.

    -

    The TrueType and PostScript specifications use different conventions to determine whether outline contours should be filled or unfilled.

    -

    -
    values
    -

    - - - - - - - - - - -
    FT_ORIENTATION_TRUETYPE
    -

    According to the TrueType specification, clockwise contours must be filled, and counter-clockwise ones must be unfilled.

    -
    FT_ORIENTATION_POSTSCRIPT
    -

    According to the PostScript specification, counter-clockwise contours must be filled, and clockwise ones must be unfilled.

    -
    FT_ORIENTATION_FILL_RIGHT
    -

    This is identical to FT_ORIENTATION_TRUETYPE, but is used to remember that in TrueType, everything that is to the right of the drawing direction of a contour must be filled.

    -
    FT_ORIENTATION_FILL_LEFT
    -

    This is identical to FT_ORIENTATION_POSTSCRIPT, but is used to remember that in PostScript, everything that is to the left of the drawing direction of a contour must be filled.

    -
    FT_ORIENTATION_NONE -

    The orientation cannot be determined. That is, different parts of the glyph have different orientation.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Outline_Get_Orientation

    -
    -Defined in FT_OUTLINE_H (freetype/ftoutln.h). -

    -
    -
-  FT_EXPORT( FT_Orientation )
-  FT_Outline_Get_Orientation( FT_Outline*  outline );
-
-

    -
    -

    This function analyzes a glyph outline and tries to compute its fill orientation (see FT_Orientation). This is done by computing the direction of each global horizontal and/or vertical extrema within the outline.

    -

    Note that this will return FT_ORIENTATION_TRUETYPE for empty outlines.

    -

    -
    input
    -

    - - -
    outline -

    A handle to the source outline.

    -
    -
    -
    return
    -

    The orientation.

    -
    -
    -
    - - -
    [Index][TOC]
    - - - diff --git a/docs/reference/ft2-pfr_fonts.html b/docs/reference/ft2-pfr_fonts.html deleted file mode 100644 index 6a968f3..0000000 --- a/docs/reference/ft2-pfr_fonts.html +++ /dev/null @@ -1,206 +0,0 @@ - - - - -FreeType-2.4.9 API Reference - - - - - - -
    [Index][TOC]
    -

    FreeType-2.4.9 API Reference

    - -

    -PFR Fonts -

    -

    Synopsis

    - - -
    FT_Get_PFR_MetricsFT_Get_PFR_KerningFT_Get_PFR_Advance


    - -
    -

    This section contains the declaration of PFR-specific functions.

    -

    -
    -

    FT_Get_PFR_Metrics

    -
    -Defined in FT_PFR_H (freetype/ftpfr.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Get_PFR_Metrics( FT_Face    face,
-                      FT_UInt   *aoutline_resolution,
-                      FT_UInt   *ametrics_resolution,
-                      FT_Fixed  *ametrics_x_scale,
-                      FT_Fixed  *ametrics_y_scale );
-
-

    -
    -

    Return the outline and metrics resolutions of a given PFR face.

    -

    -
    input
    -

    - - -
    face -

    Handle to the input face. It can be a non-PFR face.

    -
    -
    -
    output
    -

    - - - - - -
    aoutline_resolution -

    Outline resolution. This is equivalent to ‘face->units_per_EM’ for non-PFR fonts. Optional (parameter can be NULL).

    -
    ametrics_resolution -

    Metrics resolution. This is equivalent to ‘outline_resolution’ for non-PFR fonts. Optional (parameter can be NULL).

    -
    ametrics_x_scale -

    A 16.16 fixed-point number used to scale distance expressed in metrics units to device sub-pixels. This is equivalent to ‘face->size->x_scale’, but for metrics only. Optional (parameter can be NULL).

    -
    ametrics_y_scale -

    Same as ‘ametrics_x_scale’ but for the vertical direction. optional (parameter can be NULL).

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    If the input face is not a PFR, this function will return an error. However, in all cases, it will return valid values.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Get_PFR_Kerning

    -
    -Defined in FT_PFR_H (freetype/ftpfr.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Get_PFR_Kerning( FT_Face     face,
-                      FT_UInt     left,
-                      FT_UInt     right,
-                      FT_Vector  *avector );
-
-

    -
    -

    Return the kerning pair corresponding to two glyphs in a PFR face. The distance is expressed in metrics units, unlike the result of FT_Get_Kerning.

    -

    -
    input
    -

    - - - - -
    face -

    A handle to the input face.

    -
    left -

    Index of the left glyph.

    -
    right -

    Index of the right glyph.

    -
    -
    -
    output
    -

    - - -
    avector -

    A kerning vector.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    This function always return distances in original PFR metrics units. This is unlike FT_Get_Kerning with the FT_KERNING_UNSCALED mode, which always returns distances converted to outline units.

    -

    You can use the value of the ‘x_scale’ and ‘y_scale’ parameters returned by FT_Get_PFR_Metrics to scale these to device sub-pixels.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Get_PFR_Advance

    -
    -Defined in FT_PFR_H (freetype/ftpfr.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Get_PFR_Advance( FT_Face   face,
-                      FT_UInt   gindex,
-                      FT_Pos   *aadvance );
-
-

    -
    -

    Return a given glyph advance, expressed in original metrics units, from a PFR font.

    -

    -
    input
    -

    - - - -
    face -

    A handle to the input face.

    -
    gindex -

    The glyph index.

    -
    -
    -
    output
    -

    - - -
    aadvance -

    The glyph advance in metrics units.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    You can use the ‘x_scale’ or ‘y_scale’ results of FT_Get_PFR_Metrics to convert the advance to device sub-pixels (i.e., 1/64th of pixels).

    -
    -
    -
    - - -
    [Index][TOC]
    - - - diff --git a/docs/reference/ft2-quick_advance.html b/docs/reference/ft2-quick_advance.html deleted file mode 100644 index 80efee1..0000000 --- a/docs/reference/ft2-quick_advance.html +++ /dev/null @@ -1,185 +0,0 @@ - - - - -FreeType-2.4.9 API Reference - - - - - - -
    [Index][TOC]
    -

    FreeType-2.4.9 API Reference

    - -

    -Quick retrieval of advance values -

    -

    Synopsis

    - - - -
    FT_ADVANCE_FLAG_FAST_ONLYFT_Get_Advances
    FT_Get_Advance


    - -
    -

    This section contains functions to quickly extract advance values without handling glyph outlines, if possible.

    -

    -
    -

    FT_ADVANCE_FLAG_FAST_ONLY

    -
    -Defined in FT_ADVANCES_H (freetype/ftadvanc.h). -

    -
    -
-#define FT_ADVANCE_FLAG_FAST_ONLY  0x20000000UL
-
-

    -
    -

    A bit-flag to be OR-ed with the ‘flags’ parameter of the FT_Get_Advance and FT_Get_Advances functions.

    -

    If set, it indicates that you want these functions to fail if the corresponding hinting mode or font driver doesn't allow for very quick advance computation.

    -

    Typically, glyphs which are either unscaled, unhinted, bitmapped, or light-hinted can have their advance width computed very quickly.

    -

    Normal and bytecode hinted modes, which require loading, scaling, and hinting of the glyph outline, are extremely slow by comparison.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Get_Advance

    -
    -Defined in FT_ADVANCES_H (freetype/ftadvanc.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Get_Advance( FT_Face    face,
-                  FT_UInt    gindex,
-                  FT_Int32   load_flags,
-                  FT_Fixed  *padvance );
-
-

    -
    -

    Retrieve the advance value of a given glyph outline in an FT_Face. By default, the unhinted advance is returned in font units.

    -

    -
    input
    -

    - - - - -
    face -

    The source FT_Face handle.

    -
    gindex -

    The glyph index.

    -
    load_flags -

    A set of bit flags similar to those used when calling FT_Load_Glyph, used to determine what kind of advances you need.

    -
    -
    -
    output
    -

    - - -
    padvance -

    The advance value, in either font units or 16.16 format.

    -

    If FT_LOAD_VERTICAL_LAYOUT is set, this is the vertical advance corresponding to a vertical layout. Otherwise, it is the horizontal advance in a horizontal layout.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    This function may fail if you use FT_ADVANCE_FLAG_FAST_ONLY and if the corresponding font backend doesn't have a quick way to retrieve the advances.

    -

    A scaled advance is returned in 16.16 format but isn't transformed by the affine transformation specified by FT_Set_Transform.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Get_Advances

    -
    -Defined in FT_ADVANCES_H (freetype/ftadvanc.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Get_Advances( FT_Face    face,
-                   FT_UInt    start,
-                   FT_UInt    count,
-                   FT_Int32   load_flags,
-                   FT_Fixed  *padvances );
-
-

    -
    -

    Retrieve the advance values of several glyph outlines in an FT_Face. By default, the unhinted advances are returned in font units.

    -

    -
    input
    -

    - - - - - -
    face -

    The source FT_Face handle.

    -
    start -

    The first glyph index.

    -
    count -

    The number of advance values you want to retrieve.

    -
    load_flags -

    A set of bit flags similar to those used when calling FT_Load_Glyph.

    -
    -
    -
    output
    -

    - - -
    padvance -

    The advances, in either font units or 16.16 format. This array must contain at least ‘count’ elements.

    -

    If FT_LOAD_VERTICAL_LAYOUT is set, these are the vertical advances corresponding to a vertical layout. Otherwise, they are the horizontal advances in a horizontal layout.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    This function may fail if you use FT_ADVANCE_FLAG_FAST_ONLY and if the corresponding font backend doesn't have a quick way to retrieve the advances.

    -

    Scaled advances are returned in 16.16 format but aren't transformed by the affine transformation specified by FT_Set_Transform.

    -
    -
    -
    - - -
    [Index][TOC]
    - - - diff --git a/docs/reference/ft2-raster.html b/docs/reference/ft2-raster.html deleted file mode 100644 index 34f2078..0000000 --- a/docs/reference/ft2-raster.html +++ /dev/null @@ -1,606 +0,0 @@ - - - - -FreeType-2.4.9 API Reference - - - - - - -
    [Index][TOC]
    -

    FreeType-2.4.9 API Reference

    - -

    -Scanline Converter -

    -

    Synopsis

    - - - - - - -
    FT_RasterFT_RASTER_FLAG_XXXFT_Raster_SetModeFunc
    FT_SpanFT_Raster_ParamsFT_Raster_RenderFunc
    FT_SpanFuncFT_Raster_NewFuncFT_Raster_Funcs
    FT_Raster_BitTest_FuncFT_Raster_DoneFunc
    FT_Raster_BitSet_FuncFT_Raster_ResetFunc


    - -
    -

    This section contains technical definitions.

    -

    -
    -

    FT_Raster

    -
    -Defined in FT_IMAGE_H (freetype/ftimage.h). -

    -
    -
-  typedef struct FT_RasterRec_*  FT_Raster;
-
-

    -
    -

    A handle (pointer) to a raster object. Each object can be used independently to convert an outline into a bitmap or pixmap.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Span

    -
    -Defined in FT_IMAGE_H (freetype/ftimage.h). -

    -
    -
-  typedef struct  FT_Span_
-  {
-    short           x;
-    unsigned short  len;
-    unsigned char   coverage;
-
-  } FT_Span;
-
-

    -
    -

    A structure used to model a single span of gray (or black) pixels when rendering a monochrome or anti-aliased bitmap.

    -

    -
    fields
    -

    - - - - -
    x -

    The span's horizontal start position.

    -
    len -

    The span's length in pixels.

    -
    coverage -

    The span color/coverage, ranging from 0 (background) to 255 (foreground). Only used for anti-aliased rendering.

    -
    -
    -
    note
    -

    This structure is used by the span drawing callback type named FT_SpanFunc which takes the y coordinate of the span as a a parameter.

    -

    The coverage value is always between 0 and 255. If you want less gray values, the callback function has to reduce them.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_SpanFunc

    -
    -Defined in FT_IMAGE_H (freetype/ftimage.h). -

    -
    -
-  typedef void
-  (*FT_SpanFunc)( int             y,
-                  int             count,
-                  const FT_Span*  spans,
-                  void*           user );
-
-#define FT_Raster_Span_Func  FT_SpanFunc
-
-

    -
    -

    A function used as a call-back by the anti-aliased renderer in order to let client applications draw themselves the gray pixel spans on each scan line.

    -

    -
    input
    -

    - - - - - -
    y -

    The scanline's y coordinate.

    -
    count -

    The number of spans to draw on this scanline.

    -
    spans -

    A table of ‘count’ spans to draw on the scanline.

    -
    user -

    User-supplied data that is passed to the callback.

    -
    -
    -
    note
    -

    This callback allows client applications to directly render the gray spans of the anti-aliased bitmap to any kind of surfaces.

    -

    This can be used to write anti-aliased outlines directly to a given background bitmap, and even perform translucency.

    -

    Note that the ‘count’ field cannot be greater than a fixed value defined by the ‘FT_MAX_GRAY_SPANS’ configuration macro in ‘ftoption.h’. By default, this value is set to 32, which means that if there are more than 32 spans on a given scanline, the callback is called several times with the same ‘y’ parameter in order to draw all callbacks.

    -

    Otherwise, the callback is only called once per scan-line, and only for those scanlines that do have ‘gray’ pixels on them.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Raster_BitTest_Func

    -
    -Defined in FT_IMAGE_H (freetype/ftimage.h). -

    -
    -
-  typedef int
-  (*FT_Raster_BitTest_Func)( int    y,
-                             int    x,
-                             void*  user );
-
-

    -
    -

    THIS TYPE IS DEPRECATED. DO NOT USE IT.

    -

    A function used as a call-back by the monochrome scan-converter to test whether a given target pixel is already set to the drawing ‘color’. These tests are crucial to implement drop-out control per-se the TrueType spec.

    -

    -
    input
    -

    - - - - -
    y -

    The pixel's y coordinate.

    -
    x -

    The pixel's x coordinate.

    -
    user -

    User-supplied data that is passed to the callback.

    -
    -
    -
    return
    -

    1 if the pixel is ‘set’, 0 otherwise.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Raster_BitSet_Func

    -
    -Defined in FT_IMAGE_H (freetype/ftimage.h). -

    -
    -
-  typedef void
-  (*FT_Raster_BitSet_Func)( int    y,
-                            int    x,
-                            void*  user );
-
-

    -
    -

    THIS TYPE IS DEPRECATED. DO NOT USE IT.

    -

    A function used as a call-back by the monochrome scan-converter to set an individual target pixel. This is crucial to implement drop-out control according to the TrueType specification.

    -

    -
    input
    -

    - - - - -
    y -

    The pixel's y coordinate.

    -
    x -

    The pixel's x coordinate.

    -
    user -

    User-supplied data that is passed to the callback.

    -
    -
    -
    return
    -

    1 if the pixel is ‘set’, 0 otherwise.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_RASTER_FLAG_XXX

    -
    -Defined in FT_IMAGE_H (freetype/ftimage.h). -

    -
    -
-#define FT_RASTER_FLAG_DEFAULT  0x0
-#define FT_RASTER_FLAG_AA       0x1
-#define FT_RASTER_FLAG_DIRECT   0x2
-#define FT_RASTER_FLAG_CLIP     0x4
-
-  /* deprecated */
-#define ft_raster_flag_default  FT_RASTER_FLAG_DEFAULT
-#define ft_raster_flag_aa       FT_RASTER_FLAG_AA
-#define ft_raster_flag_direct   FT_RASTER_FLAG_DIRECT
-#define ft_raster_flag_clip     FT_RASTER_FLAG_CLIP
-
-

    -
    -

    A list of bit flag constants as used in the ‘flags’ field of a FT_Raster_Params structure.

    -

    -
    values
    -

    - - - - - -
    FT_RASTER_FLAG_DEFAULT -

    This value is 0.

    -
    FT_RASTER_FLAG_AA -

    This flag is set to indicate that an anti-aliased glyph image should be generated. Otherwise, it will be monochrome (1-bit).

    -
    FT_RASTER_FLAG_DIRECT -

    This flag is set to indicate direct rendering. In this mode, client applications must provide their own span callback. This lets them directly draw or compose over an existing bitmap. If this bit is not set, the target pixmap's buffer must be zeroed before rendering.

    -

    Note that for now, direct rendering is only possible with anti-aliased glyphs.

    -
    FT_RASTER_FLAG_CLIP -

    This flag is only used in direct rendering mode. If set, the output will be clipped to a box specified in the ‘clip_box’ field of the FT_Raster_Params structure.

    -

    Note that by default, the glyph bitmap is clipped to the target pixmap, except in direct rendering mode where all spans are generated if no clipping box is set.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Raster_Params

    -
    -Defined in FT_IMAGE_H (freetype/ftimage.h). -

    -
    -
-  typedef struct  FT_Raster_Params_
-  {
-    const FT_Bitmap*        target;
-    const void*             source;
-    int                     flags;
-    FT_SpanFunc             gray_spans;
-    FT_SpanFunc             black_spans;  /* doesn't work! */
-    FT_Raster_BitTest_Func  bit_test;     /* doesn't work! */
-    FT_Raster_BitSet_Func   bit_set;      /* doesn't work! */
-    void*                   user;
-    FT_BBox                 clip_box;
-
-  } FT_Raster_Params;
-
-

    -
    -

    A structure to hold the arguments used by a raster's render function.

    -

    -
    fields
    -

    - - - - - - - - - - -
    target -

    The target bitmap.

    -
    source -

    A pointer to the source glyph image (e.g., an FT_Outline).

    -
    flags -

    The rendering flags.

    -
    gray_spans -

    The gray span drawing callback.

    -
    black_spans -

    The black span drawing callback. UNIMPLEMENTED!

    -
    bit_test -

    The bit test callback. UNIMPLEMENTED!

    -
    bit_set -

    The bit set callback. UNIMPLEMENTED!

    -
    user -

    User-supplied data that is passed to each drawing callback.

    -
    clip_box -

    An optional clipping box. It is only used in direct rendering mode. Note that coordinates here should be expressed in integer pixels (and not in 26.6 fixed-point units).

    -
    -
    -
    note
    -

    An anti-aliased glyph bitmap is drawn if the FT_RASTER_FLAG_AA bit flag is set in the ‘flags’ field, otherwise a monochrome bitmap is generated.

    -

    If the FT_RASTER_FLAG_DIRECT bit flag is set in ‘flags’, the raster will call the ‘gray_spans’ callback to draw gray pixel spans, in the case of an aa glyph bitmap, it will call ‘black_spans’, and ‘bit_test’ and ‘bit_set’ in the case of a monochrome bitmap. This allows direct composition over a pre-existing bitmap through user-provided callbacks to perform the span drawing/composition.

    -

    Note that the ‘bit_test’ and ‘bit_set’ callbacks are required when rendering a monochrome bitmap, as they are crucial to implement correct drop-out control as defined in the TrueType specification.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Raster_NewFunc

    -
    -Defined in FT_IMAGE_H (freetype/ftimage.h). -

    -
    -
-  typedef int
-  (*FT_Raster_NewFunc)( void*       memory,
-                        FT_Raster*  raster );
-
-#define FT_Raster_New_Func  FT_Raster_NewFunc
-
-

    -
    -

    A function used to create a new raster object.

    -

    -
    input
    -

    - - -
    memory -

    A handle to the memory allocator.

    -
    -
    -
    output
    -

    - - -
    raster -

    A handle to the new raster object.

    -
    -
    -
    return
    -

    Error code. 0 means success.

    -
    -
    note
    -

    The ‘memory’ parameter is a typeless pointer in order to avoid un-wanted dependencies on the rest of the FreeType code. In practice, it is an FT_Memory object, i.e., a handle to the standard FreeType memory allocator. However, this field can be completely ignored by a given raster implementation.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Raster_DoneFunc

    -
    -Defined in FT_IMAGE_H (freetype/ftimage.h). -

    -
    -
-  typedef void
-  (*FT_Raster_DoneFunc)( FT_Raster  raster );
-
-#define FT_Raster_Done_Func  FT_Raster_DoneFunc
-
-

    -
    -

    A function used to destroy a given raster object.

    -

    -
    input
    -

    - - -
    raster -

    A handle to the raster object.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Raster_ResetFunc

    -
    -Defined in FT_IMAGE_H (freetype/ftimage.h). -

    -
    -
-  typedef void
-  (*FT_Raster_ResetFunc)( FT_Raster       raster,
-                          unsigned char*  pool_base,
-                          unsigned long   pool_size );
-
-#define FT_Raster_Reset_Func  FT_Raster_ResetFunc
-
-

    -
    -

    FreeType provides an area of memory called the ‘render pool’, available to all registered rasters. This pool can be freely used during a given scan-conversion but is shared by all rasters. Its content is thus transient.

    -

    This function is called each time the render pool changes, or just after a new raster object is created.

    -

    -
    input
    -

    - - - - -
    raster -

    A handle to the new raster object.

    -
    pool_base -

    The address in memory of the render pool.

    -
    pool_size -

    The size in bytes of the render pool.

    -
    -
    -
    note
    -

    Rasters can ignore the render pool and rely on dynamic memory allocation if they want to (a handle to the memory allocator is passed to the raster constructor). However, this is not recommended for efficiency purposes.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Raster_SetModeFunc

    -
    -Defined in FT_IMAGE_H (freetype/ftimage.h). -

    -
    -
-  typedef int
-  (*FT_Raster_SetModeFunc)( FT_Raster      raster,
-                            unsigned long  mode,
-                            void*          args );
-
-#define FT_Raster_Set_Mode_Func  FT_Raster_SetModeFunc
-
-

    -
    -

    This function is a generic facility to change modes or attributes in a given raster. This can be used for debugging purposes, or simply to allow implementation-specific ‘features’ in a given raster module.

    -

    -
    input
    -

    - - - - -
    raster -

    A handle to the new raster object.

    -
    mode -

    A 4-byte tag used to name the mode or property.

    -
    args -

    A pointer to the new mode/property to use.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Raster_RenderFunc

    -
    -Defined in FT_IMAGE_H (freetype/ftimage.h). -

    -
    -
-  typedef int
-  (*FT_Raster_RenderFunc)( FT_Raster                raster,
-                           const FT_Raster_Params*  params );
-
-#define FT_Raster_Render_Func  FT_Raster_RenderFunc
-
-

    -
    -

    Invoke a given raster to scan-convert a given glyph image into a target bitmap.

    -

    -
    input
    -

    - - - -
    raster -

    A handle to the raster object.

    -
    params -

    A pointer to an FT_Raster_Params structure used to store the rendering parameters.

    -
    -
    -
    return
    -

    Error code. 0 means success.

    -
    -
    note
    -

    The exact format of the source image depends on the raster's glyph format defined in its FT_Raster_Funcs structure. It can be an FT_Outline or anything else in order to support a large array of glyph formats.

    -

    Note also that the render function can fail and return a ‘FT_Err_Unimplemented_Feature’ error code if the raster used does not support direct composition.

    -

    XXX: For now, the standard raster doesn't support direct composition but this should change for the final release (see the files ‘demos/src/ftgrays.c’ and ‘demos/src/ftgrays2.c’ for examples of distinct implementations which support direct composition).

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Raster_Funcs

    -
    -Defined in FT_IMAGE_H (freetype/ftimage.h). -

    -
    -
-  typedef struct  FT_Raster_Funcs_
-  {
-    FT_Glyph_Format        glyph_format;
-    FT_Raster_NewFunc      raster_new;
-    FT_Raster_ResetFunc    raster_reset;
-    FT_Raster_SetModeFunc  raster_set_mode;
-    FT_Raster_RenderFunc   raster_render;
-    FT_Raster_DoneFunc     raster_done;
-
-  } FT_Raster_Funcs;
-
-

    -
    -

    A structure used to describe a given raster class to the library.

    -

    -
    fields
    -

    - - - - - - -
    glyph_format -

    The supported glyph format for this raster.

    -
    raster_new -

    The raster constructor.

    -
    raster_reset -

    Used to reset the render pool within the raster.

    -
    raster_render -

    A function to render a glyph into a given bitmap.

    -
    raster_done -

    The raster destructor.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - - - diff --git a/docs/reference/ft2-sfnt_names.html b/docs/reference/ft2-sfnt_names.html deleted file mode 100644 index ab1312a..0000000 --- a/docs/reference/ft2-sfnt_names.html +++ /dev/null @@ -1,232 +0,0 @@ - - - - -FreeType-2.4.9 API Reference - - - - - - -
    [Index][TOC]
    -

    FreeType-2.4.9 API Reference

    - -

    -SFNT Names -

    -

    Synopsis

    - - - - - - -
    FT_SfntName
    FT_Get_Sfnt_Name_Count
    FT_Get_Sfnt_Name
    FT_PARAM_TAG_IGNORE_PREFERRED_FAMILY
    FT_PARAM_TAG_IGNORE_PREFERRED_SUBFAMILY


    - -
    -

    The TrueType and OpenType specifications allow the inclusion of a special ‘names table’ in font files. This table contains textual (and internationalized) information regarding the font, like family name, copyright, version, etc.

    -

    The definitions below are used to access them if available.

    -

    Note that this has nothing to do with glyph names!

    -

    -
    -

    FT_SfntName

    -
    -Defined in FT_SFNT_NAMES_H (freetype/ftsnames.h). -

    -
    -
-  typedef struct  FT_SfntName_
-  {
-    FT_UShort  platform_id;
-    FT_UShort  encoding_id;
-    FT_UShort  language_id;
-    FT_UShort  name_id;
-
-    FT_Byte*   string;      /* this string is *not* null-terminated! */
-    FT_UInt    string_len;  /* in bytes */
-
-  } FT_SfntName;
-
-

    -
    -

    A structure used to model an SFNT ‘name’ table entry.

    -

    -
    fields
    -

    - - - - - - - -
    platform_id -

    The platform ID for ‘string’.

    -
    encoding_id -

    The encoding ID for ‘string’.

    -
    language_id -

    The language ID for ‘string’.

    -
    name_id -

    An identifier for ‘string’.

    -
    string -

    The ‘name’ string. Note that its format differs depending on the (platform,encoding) pair. It can be a Pascal String, a UTF-16 one, etc.

    -

    Generally speaking, the string is not zero-terminated. Please refer to the TrueType specification for details.

    -
    string_len -

    The length of ‘string’ in bytes.

    -
    -
    -
    note
    -

    Possible values for ‘platform_id’, ‘encoding_id’, ‘language_id’, and ‘name_id’ are given in the file ‘ttnameid.h’. For details please refer to the TrueType or OpenType specification.

    -

    See also TT_PLATFORM_XXX, TT_APPLE_ID_XXX, TT_MAC_ID_XXX, TT_ISO_ID_XXX, and TT_MS_ID_XXX.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Get_Sfnt_Name_Count

    -
    -Defined in FT_SFNT_NAMES_H (freetype/ftsnames.h). -

    -
    -
-  FT_EXPORT( FT_UInt )
-  FT_Get_Sfnt_Name_Count( FT_Face  face );
-
-

    -
    -

    Retrieve the number of name strings in the SFNT ‘name’ table.

    -

    -
    input
    -

    - - -
    face -

    A handle to the source face.

    -
    -
    -
    return
    -

    The number of strings in the ‘name’ table.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Get_Sfnt_Name

    -
    -Defined in FT_SFNT_NAMES_H (freetype/ftsnames.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Get_Sfnt_Name( FT_Face       face,
-                    FT_UInt       idx,
-                    FT_SfntName  *aname );
-
-

    -
    -

    Retrieve a string of the SFNT ‘name’ table for a given index.

    -

    -
    input
    -

    - - - -
    face -

    A handle to the source face.

    -
    idx -

    The index of the ‘name’ string.

    -
    -
    -
    output
    -

    - - -
    aname -

    The indexed FT_SfntName structure.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    The ‘string’ array returned in the ‘aname’ structure is not null-terminated. The application should deallocate it if it is no longer in use.

    -

    Use FT_Get_Sfnt_Name_Count to get the total number of available ‘name’ table entries, then do a loop until you get the right platform, encoding, and name ID.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_PARAM_TAG_IGNORE_PREFERRED_FAMILY

    -
    -Defined in FT_SFNT_NAMES_H (freetype/ftsnames.h). -

    -
    -
-#define FT_PARAM_TAG_IGNORE_PREFERRED_FAMILY  FT_MAKE_TAG( 'i', 'g', 'p', 'f' )
-
-

    -
    -

    A constant used as the tag of FT_Parameter structures to make FT_Open_Face() ignore preferred family subfamily names in ‘name’ table since OpenType version 1.4. For backwards compatibility with legacy systems which has 4-face-per-family restriction.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_PARAM_TAG_IGNORE_PREFERRED_SUBFAMILY

    -
    -Defined in FT_SFNT_NAMES_H (freetype/ftsnames.h). -

    -
    -
-#define FT_PARAM_TAG_IGNORE_PREFERRED_SUBFAMILY  FT_MAKE_TAG( 'i', 'g', 'p', 's' )
-
-

    -
    -

    A constant used as the tag of FT_Parameter structures to make FT_Open_Face() ignore preferred subfamily names in ‘name’ table since OpenType version 1.4. For backwards compatibility with legacy systems which has 4-face-per-family restriction.

    -

    -
    -
    - - -
    [Index][TOC]
    - - - diff --git a/docs/reference/ft2-sizes_management.html b/docs/reference/ft2-sizes_management.html deleted file mode 100644 index 104957b..0000000 --- a/docs/reference/ft2-sizes_management.html +++ /dev/null @@ -1,164 +0,0 @@ - - - - -FreeType-2.4.9 API Reference - - - - - - -
    [Index][TOC]
    -

    FreeType-2.4.9 API Reference

    - -

    -Size Management -

    -

    Synopsis

    - - -
    FT_New_SizeFT_Done_SizeFT_Activate_Size


    - -
    -

    When creating a new face object (e.g., with FT_New_Face), an FT_Size object is automatically created and used to store all pixel-size dependent information, available in the ‘face->size’ field.

    -

    It is however possible to create more sizes for a given face, mostly in order to manage several character pixel sizes of the same font family and style. See FT_New_Size and FT_Done_Size.

    -

    Note that FT_Set_Pixel_Sizes and FT_Set_Char_Size only modify the contents of the current ‘active’ size; you thus need to use FT_Activate_Size to change it.

    -

    99% of applications won't need the functions provided here, especially if they use the caching sub-system, so be cautious when using these.

    -

    -
    -

    FT_New_Size

    -
    -Defined in FT_SIZES_H (freetype/ftsizes.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_New_Size( FT_Face   face,
-               FT_Size*  size );
-
-

    -
    -

    Create a new size object from a given face object.

    -

    -
    input
    -

    - - -
    face -

    A handle to a parent face object.

    -
    -
    -
    output
    -

    - - -
    asize -

    A handle to a new size object.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    You need to call FT_Activate_Size in order to select the new size for upcoming calls to FT_Set_Pixel_Sizes, FT_Set_Char_Size, FT_Load_Glyph, FT_Load_Char, etc.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Done_Size

    -
    -Defined in FT_SIZES_H (freetype/ftsizes.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Done_Size( FT_Size  size );
-
-

    -
    -

    Discard a given size object. Note that FT_Done_Face automatically discards all size objects allocated with FT_New_Size.

    -

    -
    input
    -

    - - -
    size -

    A handle to a target size object.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Activate_Size

    -
    -Defined in FT_SIZES_H (freetype/ftsizes.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Activate_Size( FT_Size  size );
-
-

    -
    -

    Even though it is possible to create several size objects for a given face (see FT_New_Size for details), functions like FT_Load_Glyph or FT_Load_Char only use the one which has been activated last to determine the ‘current character pixel size’.

    -

    This function can be used to ‘activate’ a previously created size object.

    -

    -
    input
    -

    - - -
    size -

    A handle to a target size object.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    If ‘face’ is the size's parent face object, this function changes the value of ‘face->size’ to the input size handle.

    -
    -
    -
    - - -
    [Index][TOC]
    - - - diff --git a/docs/reference/ft2-system_interface.html b/docs/reference/ft2-system_interface.html deleted file mode 100644 index 63b55b3..0000000 --- a/docs/reference/ft2-system_interface.html +++ /dev/null @@ -1,415 +0,0 @@ - - - - -FreeType-2.4.9 API Reference - - - - - - -
    [Index][TOC]
    -

    FreeType-2.4.9 API Reference

    - -

    -System Interface -

    -

    Synopsis

    - - - - - -
    FT_MemoryFT_MemoryRecFT_Stream_CloseFunc
    FT_Alloc_FuncFT_StreamFT_StreamRec
    FT_Free_FuncFT_StreamDesc
    FT_Realloc_FuncFT_Stream_IoFunc


    - -
    -

    This section contains various definitions related to memory management and i/o access. You need to understand this information if you want to use a custom memory manager or you own i/o streams.

    -

    -
    -

    FT_Memory

    -
    -Defined in FT_SYSTEM_H (freetype/ftsystem.h). -

    -
    -
-  typedef struct FT_MemoryRec_*  FT_Memory;
-
-

    -
    -

    A handle to a given memory manager object, defined with an FT_MemoryRec structure.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Alloc_Func

    -
    -Defined in FT_SYSTEM_H (freetype/ftsystem.h). -

    -
    -
-  typedef void*
-  (*FT_Alloc_Func)( FT_Memory  memory,
-                    long       size );
-
-

    -
    -

    A function used to allocate ‘size’ bytes from ‘memory’.

    -

    -
    input
    -

    - - - -
    memory -

    A handle to the source memory manager.

    -
    size -

    The size in bytes to allocate.

    -
    -
    -
    return
    -

    Address of new memory block. 0 in case of failure.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Free_Func

    -
    -Defined in FT_SYSTEM_H (freetype/ftsystem.h). -

    -
    -
-  typedef void
-  (*FT_Free_Func)( FT_Memory  memory,
-                   void*      block );
-
-

    -
    -

    A function used to release a given block of memory.

    -

    -
    input
    -

    - - - -
    memory -

    A handle to the source memory manager.

    -
    block -

    The address of the target memory block.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Realloc_Func

    -
    -Defined in FT_SYSTEM_H (freetype/ftsystem.h). -

    -
    -
-  typedef void*
-  (*FT_Realloc_Func)( FT_Memory  memory,
-                      long       cur_size,
-                      long       new_size,
-                      void*      block );
-
-

    -
    -

    A function used to re-allocate a given block of memory.

    -

    -
    input
    -

    - - - - - -
    memory -

    A handle to the source memory manager.

    -
    cur_size -

    The block's current size in bytes.

    -
    new_size -

    The block's requested new size.

    -
    block -

    The block's current address.

    -
    -
    -
    return
    -

    New block address. 0 in case of memory shortage.

    -
    -
    note
    -

    In case of error, the old block must still be available.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_MemoryRec

    -
    -Defined in FT_SYSTEM_H (freetype/ftsystem.h). -

    -
    -
-  struct  FT_MemoryRec_
-  {
-    void*            user;
-    FT_Alloc_Func    alloc;
-    FT_Free_Func     free;
-    FT_Realloc_Func  realloc;
-  };
-
-

    -
    -

    A structure used to describe a given memory manager to FreeType 2.

    -

    -
    fields
    -

    - - - - - -
    user -

    A generic typeless pointer for user data.

    -
    alloc -

    A pointer type to an allocation function.

    -
    free -

    A pointer type to an memory freeing function.

    -
    realloc -

    A pointer type to a reallocation function.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Stream

    -
    -Defined in FT_SYSTEM_H (freetype/ftsystem.h). -

    -
    -
-  typedef struct FT_StreamRec_*  FT_Stream;
-
-

    -
    -

    A handle to an input stream.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_StreamDesc

    -
    -Defined in FT_SYSTEM_H (freetype/ftsystem.h). -

    -
    -
-  typedef union  FT_StreamDesc_
-  {
-    long   value;
-    void*  pointer;
-
-  } FT_StreamDesc;
-
-

    -
    -

    A union type used to store either a long or a pointer. This is used to store a file descriptor or a ‘FILE*’ in an input stream.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Stream_IoFunc

    -
    -Defined in FT_SYSTEM_H (freetype/ftsystem.h). -

    -
    -
-  typedef unsigned long
-  (*FT_Stream_IoFunc)( FT_Stream       stream,
-                       unsigned long   offset,
-                       unsigned char*  buffer,
-                       unsigned long   count );
-
-

    -
    -

    A function used to seek and read data from a given input stream.

    -

    -
    input
    -

    - - - - - -
    stream -

    A handle to the source stream.

    -
    offset -

    The offset of read in stream (always from start).

    -
    buffer -

    The address of the read buffer.

    -
    count -

    The number of bytes to read from the stream.

    -
    -
    -
    return
    -

    The number of bytes effectively read by the stream.

    -
    -
    note
    -

    This function might be called to perform a seek or skip operation with a ‘count’ of 0. A non-zero return value then indicates an error.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Stream_CloseFunc

    -
    -Defined in FT_SYSTEM_H (freetype/ftsystem.h). -

    -
    -
-  typedef void
-  (*FT_Stream_CloseFunc)( FT_Stream  stream );
-
-

    -
    -

    A function used to close a given input stream.

    -

    -
    input
    -

    - - -
    stream -

    A handle to the target stream.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_StreamRec

    -
    -Defined in FT_SYSTEM_H (freetype/ftsystem.h). -

    -
    -
-  typedef struct  FT_StreamRec_
-  {
-    unsigned char*       base;
-    unsigned long        size;
-    unsigned long        pos;
-
-    FT_StreamDesc        descriptor;
-    FT_StreamDesc        pathname;
-    FT_Stream_IoFunc     read;
-    FT_Stream_CloseFunc  close;
-
-    FT_Memory            memory;
-    unsigned char*       cursor;
-    unsigned char*       limit;
-
-  } FT_StreamRec;
-
-

    -
    -

    A structure used to describe an input stream.

    -

    -
    input
    -

    - - - - - - - - - - - -
    base -

    For memory-based streams, this is the address of the first stream byte in memory. This field should always be set to NULL for disk-based streams.

    -
    size -

    The stream size in bytes.

    -
    pos -

    The current position within the stream.

    -
    descriptor -

    This field is a union that can hold an integer or a pointer. It is used by stream implementations to store file descriptors or ‘FILE*’ pointers.

    -
    pathname -

    This field is completely ignored by FreeType. However, it is often useful during debugging to use it to store the stream's filename (where available).

    -
    read -

    The stream's input function.

    -
    close -

    The stream's close function.

    -
    memory -

    The memory manager to use to preload frames. This is set internally by FreeType and shouldn't be touched by stream implementations.

    -
    cursor -

    This field is set and used internally by FreeType when parsing frames.

    -
    limit -

    This field is set and used internally by FreeType when parsing frames.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - - - diff --git a/docs/reference/ft2-toc.html b/docs/reference/ft2-toc.html deleted file mode 100644 index 9410b9e..0000000 --- a/docs/reference/ft2-toc.html +++ /dev/null @@ -1,219 +0,0 @@ - - - - -FreeType-2.4.9 API Reference - - - - - -
    [Index]
    -

    FreeType-2.4.9 API Reference

    - -

    Table of Contents

    -

    General Remarks

    • - - -
      -User allocation -

      How client applications should allocate FreeType data structures.

      -
      -
    -

    Core API

    -

    Format-Specific API

    -

    Cache Sub-System

    • - - -
      -Cache Sub-System -

      How to cache face, size, and glyph data with FreeType 2.

      -
      -
    -

    Support API

    -

    Miscellaneous

    -

    Global Index

    -
    - - -
    [Index]
    - -
    generated on Thu Mar 8 21:09:06 2012
    - diff --git a/docs/reference/ft2-truetype_engine.html b/docs/reference/ft2-truetype_engine.html deleted file mode 100644 index 02c67e9..0000000 --- a/docs/reference/ft2-truetype_engine.html +++ /dev/null @@ -1,132 +0,0 @@ - - - - -FreeType-2.4.9 API Reference - - - - - - -
    [Index][TOC]
    -

    FreeType-2.4.9 API Reference

    - -

    -The TrueType Engine -

    -

    Synopsis

    - - -
    FT_TrueTypeEngineTypeFT_Get_TrueType_Engine_Type


    - -
    -

    This section contains a function used to query the level of TrueType bytecode support compiled in this version of the library.

    -

    -
    -

    FT_TrueTypeEngineType

    -
    -Defined in FT_MODULE_H (freetype/ftmodapi.h). -

    -
    -
-  typedef enum  FT_TrueTypeEngineType_
-  {
-    FT_TRUETYPE_ENGINE_TYPE_NONE = 0,
-    FT_TRUETYPE_ENGINE_TYPE_UNPATENTED,
-    FT_TRUETYPE_ENGINE_TYPE_PATENTED
-
-  } FT_TrueTypeEngineType;
-
-

    -
    -

    A list of values describing which kind of TrueType bytecode engine is implemented in a given FT_Library instance. It is used by the FT_Get_TrueType_Engine_Type function.

    -

    -
    values
    -

    - - - - - - - -
    FT_TRUETYPE_ENGINE_TYPE_NONE
    -

    The library doesn't implement any kind of bytecode interpreter.

    -
    FT_TRUETYPE_ENGINE_TYPE_UNPATENTED
    -

    The library implements a bytecode interpreter that doesn't support the patented operations of the TrueType virtual machine.

    -

    Its main use is to load certain Asian fonts which position and scale glyph components with bytecode instructions. It produces bad output for most other fonts.

    -
    FT_TRUETYPE_ENGINE_TYPE_PATENTED
    -

    The library implements a bytecode interpreter that covers the full instruction set of the TrueType virtual machine (this was governed by patents until May 2010, hence the name).

    -
    -
    -
    since
    -

    2.2

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Get_TrueType_Engine_Type

    -
    -Defined in FT_MODULE_H (freetype/ftmodapi.h). -

    -
    -
-  FT_EXPORT( FT_TrueTypeEngineType )
-  FT_Get_TrueType_Engine_Type( FT_Library  library );
-
-

    -
    -

    Return an FT_TrueTypeEngineType value to indicate which level of the TrueType virtual machine a given library instance supports.

    -

    -
    input
    -

    - - -
    library -

    A library instance.

    -
    -
    -
    return
    -

    A value indicating which level is supported.

    -
    -
    since
    -

    2.2

    -
    -
    -
    - - -
    [Index][TOC]
    - - - diff --git a/docs/reference/ft2-truetype_tables.html b/docs/reference/ft2-truetype_tables.html deleted file mode 100644 index a57ba4f..0000000 --- a/docs/reference/ft2-truetype_tables.html +++ /dev/null @@ -1,1223 +0,0 @@ - - - - -FreeType-2.4.9 API Reference - - - - - - -
    [Index][TOC]
    -

    FreeType-2.4.9 API Reference

    - -

    -TrueType Tables -

    -

    Synopsis

    - - - - - - - - - - - -
    TT_PLATFORM_XXXTT_Postscript
    TT_APPLE_ID_XXXTT_PCLT
    TT_MAC_ID_XXXTT_MaxProfile
    TT_ISO_ID_XXXFT_Sfnt_Tag
    TT_MS_ID_XXXFT_Get_Sfnt_Table
    TT_ADOBE_ID_XXXFT_Load_Sfnt_Table
    TT_HeaderFT_Sfnt_Table_Info
    TT_HoriHeaderFT_Get_CMap_Language_ID
    TT_VertHeaderFT_Get_CMap_Format
    TT_OS2FT_PARAM_TAG_UNPATENTED_HINTING


    - -
    -

    This section contains the definition of TrueType-specific tables as well as some routines used to access and process them.

    -

    -
    -

    TT_PLATFORM_XXX

    -
    -Defined in FT_TRUETYPE_IDS_H (freetype/ttnameid.h). -

    -
    -
-#define TT_PLATFORM_APPLE_UNICODE  0
-#define TT_PLATFORM_MACINTOSH      1
-#define TT_PLATFORM_ISO            2 /* deprecated */
-#define TT_PLATFORM_MICROSOFT      3
-#define TT_PLATFORM_CUSTOM         4
-#define TT_PLATFORM_ADOBE          7 /* artificial */
-
-

    -
    -

    A list of valid values for the ‘platform_id’ identifier code in FT_CharMapRec and FT_SfntName structures.

    -

    -
    values
    -

    - - - - - - - - -
    TT_PLATFORM_APPLE_UNICODE
    -

    Used by Apple to indicate a Unicode character map and/or name entry. See TT_APPLE_ID_XXX for corresponding ‘encoding_id’ values. Note that name entries in this format are coded as big-endian UCS-2 character codes only.

    -
    TT_PLATFORM_MACINTOSH -

    Used by Apple to indicate a MacOS-specific charmap and/or name entry. See TT_MAC_ID_XXX for corresponding ‘encoding_id’ values. Note that most TrueType fonts contain an Apple roman charmap to be usable on MacOS systems (even if they contain a Microsoft charmap as well).

    -
    TT_PLATFORM_ISO -

    This value was used to specify ISO/IEC 10646 charmaps. It is however now deprecated. See TT_ISO_ID_XXX for a list of corresponding ‘encoding_id’ values.

    -
    TT_PLATFORM_MICROSOFT -

    Used by Microsoft to indicate Windows-specific charmaps. See TT_MS_ID_XXX for a list of corresponding ‘encoding_id’ values. Note that most fonts contain a Unicode charmap using (TT_PLATFORM_MICROSOFT, TT_MS_ID_UNICODE_CS).

    -
    TT_PLATFORM_CUSTOM -

    Used to indicate application-specific charmaps.

    -
    TT_PLATFORM_ADOBE -

    This value isn't part of any font format specification, but is used by FreeType to report Adobe-specific charmaps in an FT_CharMapRec structure. See TT_ADOBE_ID_XXX.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    TT_APPLE_ID_XXX

    -
    -Defined in FT_TRUETYPE_IDS_H (freetype/ttnameid.h). -

    -
    -
-#define TT_APPLE_ID_DEFAULT           0 /* Unicode 1.0 */
-#define TT_APPLE_ID_UNICODE_1_1       1 /* specify Hangul at U+34xx */
-#define TT_APPLE_ID_ISO_10646         2 /* deprecated */
-#define TT_APPLE_ID_UNICODE_2_0       3 /* or later */
-#define TT_APPLE_ID_UNICODE_32        4 /* 2.0 or later, full repertoire */
-#define TT_APPLE_ID_VARIANT_SELECTOR  5 /* variation selector data */
-
-

    -
    -

    A list of valid values for the ‘encoding_id’ for TT_PLATFORM_APPLE_UNICODE charmaps and name entries.

    -

    -
    values
    -

    - - - - - - - - - - -
    TT_APPLE_ID_DEFAULT -

    Unicode version 1.0.

    -
    TT_APPLE_ID_UNICODE_1_1
    -

    Unicode 1.1; specifies Hangul characters starting at U+34xx.

    -
    TT_APPLE_ID_ISO_10646 -

    Deprecated (identical to preceding).

    -
    TT_APPLE_ID_UNICODE_2_0
    -

    Unicode 2.0 and beyond (UTF-16 BMP only).

    -
    TT_APPLE_ID_UNICODE_32 -

    Unicode 3.1 and beyond, using UTF-32.

    -
    TT_APPLE_ID_VARIANT_SELECTOR
    -

    From Adobe, not Apple. Not a normal cmap. Specifies variations on a real cmap.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    TT_MAC_ID_XXX

    -
    -Defined in FT_TRUETYPE_IDS_H (freetype/ttnameid.h). -

    -
    -
-#define TT_MAC_ID_ROMAN                 0
-#define TT_MAC_ID_JAPANESE              1
-#define TT_MAC_ID_TRADITIONAL_CHINESE   2
-#define TT_MAC_ID_KOREAN                3
-#define TT_MAC_ID_ARABIC                4
-#define TT_MAC_ID_HEBREW                5
-#define TT_MAC_ID_GREEK                 6
-#define TT_MAC_ID_RUSSIAN               7
-#define TT_MAC_ID_RSYMBOL               8
-#define TT_MAC_ID_DEVANAGARI            9
-#define TT_MAC_ID_GURMUKHI             10
-#define TT_MAC_ID_GUJARATI             11
-#define TT_MAC_ID_ORIYA                12
-#define TT_MAC_ID_BENGALI              13
-#define TT_MAC_ID_TAMIL                14
-#define TT_MAC_ID_TELUGU               15
-#define TT_MAC_ID_KANNADA              16
-#define TT_MAC_ID_MALAYALAM            17
-#define TT_MAC_ID_SINHALESE            18
-#define TT_MAC_ID_BURMESE              19
-#define TT_MAC_ID_KHMER                20
-#define TT_MAC_ID_THAI                 21
-#define TT_MAC_ID_LAOTIAN              22
-#define TT_MAC_ID_GEORGIAN             23
-#define TT_MAC_ID_ARMENIAN             24
-#define TT_MAC_ID_MALDIVIAN            25
-#define TT_MAC_ID_SIMPLIFIED_CHINESE   25
-#define TT_MAC_ID_TIBETAN              26
-#define TT_MAC_ID_MONGOLIAN            27
-#define TT_MAC_ID_GEEZ                 28
-#define TT_MAC_ID_SLAVIC               29
-#define TT_MAC_ID_VIETNAMESE           30
-#define TT_MAC_ID_SINDHI               31
-#define TT_MAC_ID_UNINTERP             32
-
-

    -
    -

    A list of valid values for the ‘encoding_id’ for TT_PLATFORM_MACINTOSH charmaps and name entries.

    -

    -
    values
    -

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    TT_MAC_ID_ROMAN -

    -
    TT_MAC_ID_JAPANESE -

    -
    TT_MAC_ID_TRADITIONAL_CHINESE
    -

    -
    TT_MAC_ID_KOREAN -

    -
    TT_MAC_ID_ARABIC -

    -
    TT_MAC_ID_HEBREW -

    -
    TT_MAC_ID_GREEK -

    -
    TT_MAC_ID_RUSSIAN -

    -
    TT_MAC_ID_RSYMBOL -

    -
    TT_MAC_ID_DEVANAGARI -

    -
    TT_MAC_ID_GURMUKHI -

    -
    TT_MAC_ID_GUJARATI -

    -
    TT_MAC_ID_ORIYA -

    -
    TT_MAC_ID_BENGALI -

    -
    TT_MAC_ID_TAMIL -

    -
    TT_MAC_ID_TELUGU -

    -
    TT_MAC_ID_KANNADA -

    -
    TT_MAC_ID_MALAYALAM -

    -
    TT_MAC_ID_SINHALESE -

    -
    TT_MAC_ID_BURMESE -

    -
    TT_MAC_ID_KHMER -

    -
    TT_MAC_ID_THAI -

    -
    TT_MAC_ID_LAOTIAN -

    -
    TT_MAC_ID_GEORGIAN -

    -
    TT_MAC_ID_ARMENIAN -

    -
    TT_MAC_ID_MALDIVIAN -

    -
    TT_MAC_ID_SIMPLIFIED_CHINESE
    -

    -
    TT_MAC_ID_TIBETAN -

    -
    TT_MAC_ID_MONGOLIAN -

    -
    TT_MAC_ID_GEEZ -

    -
    TT_MAC_ID_SLAVIC -

    -
    TT_MAC_ID_VIETNAMESE -

    -
    TT_MAC_ID_SINDHI -

    -
    TT_MAC_ID_UNINTERP -

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    TT_ISO_ID_XXX

    -
    -Defined in FT_TRUETYPE_IDS_H (freetype/ttnameid.h). -

    -
    -
-#define TT_ISO_ID_7BIT_ASCII  0
-#define TT_ISO_ID_10646       1
-#define TT_ISO_ID_8859_1      2
-
-

    -
    -

    A list of valid values for the ‘encoding_id’ for TT_PLATFORM_ISO charmaps and name entries.

    -

    Their use is now deprecated.

    -

    -
    values
    -

    - - - - -
    TT_ISO_ID_7BIT_ASCII -

    ASCII.

    -
    TT_ISO_ID_10646 -

    ISO/10646.

    -
    TT_ISO_ID_8859_1 -

    Also known as Latin-1.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    TT_MS_ID_XXX

    -
    -Defined in FT_TRUETYPE_IDS_H (freetype/ttnameid.h). -

    -
    -
-#define TT_MS_ID_SYMBOL_CS    0
-#define TT_MS_ID_UNICODE_CS   1
-#define TT_MS_ID_SJIS         2
-#define TT_MS_ID_GB2312       3
-#define TT_MS_ID_BIG_5        4
-#define TT_MS_ID_WANSUNG      5
-#define TT_MS_ID_JOHAB        6
-#define TT_MS_ID_UCS_4       10
-
-

    -
    -

    A list of valid values for the ‘encoding_id’ for TT_PLATFORM_MICROSOFT charmaps and name entries.

    -

    -
    values
    -

    - - - - - - - - - -
    TT_MS_ID_SYMBOL_CS -

    Corresponds to Microsoft symbol encoding. See FT_ENCODING_MS_SYMBOL.

    -
    TT_MS_ID_UNICODE_CS -

    Corresponds to a Microsoft WGL4 charmap, matching Unicode. See FT_ENCODING_UNICODE.

    -
    TT_MS_ID_SJIS -

    Corresponds to SJIS Japanese encoding. See FT_ENCODING_SJIS.

    -
    TT_MS_ID_GB2312 -

    Corresponds to Simplified Chinese as used in Mainland China. See FT_ENCODING_GB2312.

    -
    TT_MS_ID_BIG_5 -

    Corresponds to Traditional Chinese as used in Taiwan and Hong Kong. See FT_ENCODING_BIG5.

    -
    TT_MS_ID_WANSUNG -

    Corresponds to Korean Wansung encoding. See FT_ENCODING_WANSUNG.

    -
    TT_MS_ID_JOHAB -

    Corresponds to Johab encoding. See FT_ENCODING_JOHAB.

    -
    TT_MS_ID_UCS_4 -

    Corresponds to UCS-4 or UTF-32 charmaps. This has been added to the OpenType specification version 1.4 (mid-2001.)

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    TT_ADOBE_ID_XXX

    -
    -Defined in FT_TRUETYPE_IDS_H (freetype/ttnameid.h). -

    -
    -
-#define TT_ADOBE_ID_STANDARD  0
-#define TT_ADOBE_ID_EXPERT    1
-#define TT_ADOBE_ID_CUSTOM    2
-#define TT_ADOBE_ID_LATIN_1   3
-
-

    -
    -

    A list of valid values for the ‘encoding_id’ for TT_PLATFORM_ADOBE charmaps. This is a FreeType-specific extension!

    -

    -
    values
    -

    - - - - - -
    TT_ADOBE_ID_STANDARD -

    Adobe standard encoding.

    -
    TT_ADOBE_ID_EXPERT -

    Adobe expert encoding.

    -
    TT_ADOBE_ID_CUSTOM -

    Adobe custom encoding.

    -
    TT_ADOBE_ID_LATIN_1 -

    Adobe Latin 1 encoding.

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    TT_Header

    -
    -Defined in FT_TRUETYPE_TABLES_H (freetype/tttables.h). -

    -
    -
-  typedef struct  TT_Header_
-  {
-    FT_Fixed   Table_Version;
-    FT_Fixed   Font_Revision;
-
-    FT_Long    CheckSum_Adjust;
-    FT_Long    Magic_Number;
-
-    FT_UShort  Flags;
-    FT_UShort  Units_Per_EM;
-
-    FT_Long    Created [2];
-    FT_Long    Modified[2];
-
-    FT_Short   xMin;
-    FT_Short   yMin;
-    FT_Short   xMax;
-    FT_Short   yMax;
-
-    FT_UShort  Mac_Style;
-    FT_UShort  Lowest_Rec_PPEM;
-
-    FT_Short   Font_Direction;
-    FT_Short   Index_To_Loc_Format;
-    FT_Short   Glyph_Data_Format;
-
-  } TT_Header;
-
-

    -
    -

    A structure used to model a TrueType font header table. All fields follow the TrueType specification.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    TT_HoriHeader

    -
    -Defined in FT_TRUETYPE_TABLES_H (freetype/tttables.h). -

    -
    -
-  typedef struct  TT_HoriHeader_
-  {
-    FT_Fixed   Version;
-    FT_Short   Ascender;
-    FT_Short   Descender;
-    FT_Short   Line_Gap;
-
-    FT_UShort  advance_Width_Max;      /* advance width maximum */
-
-    FT_Short   min_Left_Side_Bearing;  /* minimum left-sb       */
-    FT_Short   min_Right_Side_Bearing; /* minimum right-sb      */
-    FT_Short   xMax_Extent;            /* xmax extents          */
-    FT_Short   caret_Slope_Rise;
-    FT_Short   caret_Slope_Run;
-    FT_Short   caret_Offset;
-
-    FT_Short   Reserved[4];
-
-    FT_Short   metric_Data_Format;
-    FT_UShort  number_Of_HMetrics;
-
-    /* The following fields are not defined by the TrueType specification */
-    /* but they are used to connect the metrics header to the relevant    */
-    /* `HMTX' table.                                                      */
-
-    void*      long_metrics;
-    void*      short_metrics;
-
-  } TT_HoriHeader;
-
-

    -
    -

    A structure used to model a TrueType horizontal header, the ‘hhea’ table, as well as the corresponding horizontal metrics table, i.e., the ‘hmtx’ table.

    -

    -
    fields
    -

    - - - - - - - - - - - - - - - - -
    Version -

    The table version.

    -
    Ascender -

    The font's ascender, i.e., the distance from the baseline to the top-most of all glyph points found in the font.

    -

    This value is invalid in many fonts, as it is usually set by the font designer, and often reflects only a portion of the glyphs found in the font (maybe ASCII).

    -

    You should use the ‘sTypoAscender’ field of the OS/2 table instead if you want the correct one.

    -
    Descender -

    The font's descender, i.e., the distance from the baseline to the bottom-most of all glyph points found in the font. It is negative.

    -

    This value is invalid in many fonts, as it is usually set by the font designer, and often reflects only a portion of the glyphs found in the font (maybe ASCII).

    -

    You should use the ‘sTypoDescender’ field of the OS/2 table instead if you want the correct one.

    -
    Line_Gap -

    The font's line gap, i.e., the distance to add to the ascender and descender to get the BTB, i.e., the baseline-to-baseline distance for the font.

    -
    advance_Width_Max -

    This field is the maximum of all advance widths found in the font. It can be used to compute the maximum width of an arbitrary string of text.

    -
    min_Left_Side_Bearing -

    The minimum left side bearing of all glyphs within the font.

    -
    min_Right_Side_Bearing -

    The minimum right side bearing of all glyphs within the font.

    -
    xMax_Extent -

    The maximum horizontal extent (i.e., the ‘width’ of a glyph's bounding box) for all glyphs in the font.

    -
    caret_Slope_Rise -

    The rise coefficient of the cursor's slope of the cursor (slope=rise/run).

    -
    caret_Slope_Run -

    The run coefficient of the cursor's slope.

    -
    Reserved -

    8 reserved bytes.

    -
    metric_Data_Format -

    Always 0.

    -
    number_Of_HMetrics -

    Number of HMetrics entries in the ‘hmtx’ table -- this value can be smaller than the total number of glyphs in the font.

    -
    long_metrics -

    A pointer into the ‘hmtx’ table.

    -
    short_metrics -

    A pointer into the ‘hmtx’ table.

    -
    -
    -
    note
    -

    IMPORTANT: The TT_HoriHeader and TT_VertHeader structures should be identical except for the names of their fields which are different.

    -

    This ensures that a single function in the ‘ttload’ module is able to read both the horizontal and vertical headers.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    TT_VertHeader

    -
    -Defined in FT_TRUETYPE_TABLES_H (freetype/tttables.h). -

    -
    -
-  typedef struct  TT_VertHeader_
-  {
-    FT_Fixed   Version;
-    FT_Short   Ascender;
-    FT_Short   Descender;
-    FT_Short   Line_Gap;
-
-    FT_UShort  advance_Height_Max;      /* advance height maximum */
-
-    FT_Short   min_Top_Side_Bearing;    /* minimum left-sb or top-sb       */
-    FT_Short   min_Bottom_Side_Bearing; /* minimum right-sb or bottom-sb   */
-    FT_Short   yMax_Extent;             /* xmax or ymax extents            */
-    FT_Short   caret_Slope_Rise;
-    FT_Short   caret_Slope_Run;
-    FT_Short   caret_Offset;
-
-    FT_Short   Reserved[4];
-
-    FT_Short   metric_Data_Format;
-    FT_UShort  number_Of_VMetrics;
-
-    /* The following fields are not defined by the TrueType specification */
-    /* but they're used to connect the metrics header to the relevant     */
-    /* `HMTX' or `VMTX' table.                                            */
-
-    void*      long_metrics;
-    void*      short_metrics;
-
-  } TT_VertHeader;
-
-

    -
    -

    A structure used to model a TrueType vertical header, the ‘vhea’ table, as well as the corresponding vertical metrics table, i.e., the ‘vmtx’ table.

    -

    -
    fields
    -

    - - - - - - - - - - - - - - - - - - -
    Version -

    The table version.

    -
    Ascender -

    The font's ascender, i.e., the distance from the baseline to the top-most of all glyph points found in the font.

    -

    This value is invalid in many fonts, as it is usually set by the font designer, and often reflects only a portion of the glyphs found in the font (maybe ASCII).

    -

    You should use the ‘sTypoAscender’ field of the OS/2 table instead if you want the correct one.

    -
    Descender -

    The font's descender, i.e., the distance from the baseline to the bottom-most of all glyph points found in the font. It is negative.

    -

    This value is invalid in many fonts, as it is usually set by the font designer, and often reflects only a portion of the glyphs found in the font (maybe ASCII).

    -

    You should use the ‘sTypoDescender’ field of the OS/2 table instead if you want the correct one.

    -
    Line_Gap -

    The font's line gap, i.e., the distance to add to the ascender and descender to get the BTB, i.e., the baseline-to-baseline distance for the font.

    -
    advance_Height_Max -

    This field is the maximum of all advance heights found in the font. It can be used to compute the maximum height of an arbitrary string of text.

    -
    min_Top_Side_Bearing -

    The minimum top side bearing of all glyphs within the font.

    -
    min_Bottom_Side_Bearing
    -

    The minimum bottom side bearing of all glyphs within the font.

    -
    yMax_Extent -

    The maximum vertical extent (i.e., the ‘height’ of a glyph's bounding box) for all glyphs in the font.

    -
    caret_Slope_Rise -

    The rise coefficient of the cursor's slope of the cursor (slope=rise/run).

    -
    caret_Slope_Run -

    The run coefficient of the cursor's slope.

    -
    caret_Offset -

    The cursor's offset for slanted fonts. This value is ‘reserved’ in vmtx version 1.0.

    -
    Reserved -

    8 reserved bytes.

    -
    metric_Data_Format -

    Always 0.

    -
    number_Of_HMetrics -

    Number of VMetrics entries in the ‘vmtx’ table -- this value can be smaller than the total number of glyphs in the font.

    -
    long_metrics -

    A pointer into the ‘vmtx’ table.

    -
    short_metrics -

    A pointer into the ‘vmtx’ table.

    -
    -
    -
    note
    -

    IMPORTANT: The TT_HoriHeader and TT_VertHeader structures should be identical except for the names of their fields which are different.

    -

    This ensures that a single function in the ‘ttload’ module is able to read both the horizontal and vertical headers.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    TT_OS2

    -
    -Defined in FT_TRUETYPE_TABLES_H (freetype/tttables.h). -

    -
    -
-  typedef struct  TT_OS2_
-  {
-    FT_UShort  version;                /* 0x0001 - more or 0xFFFF */
-    FT_Short   xAvgCharWidth;
-    FT_UShort  usWeightClass;
-    FT_UShort  usWidthClass;
-    FT_Short   fsType;
-    FT_Short   ySubscriptXSize;
-    FT_Short   ySubscriptYSize;
-    FT_Short   ySubscriptXOffset;
-    FT_Short   ySubscriptYOffset;
-    FT_Short   ySuperscriptXSize;
-    FT_Short   ySuperscriptYSize;
-    FT_Short   ySuperscriptXOffset;
-    FT_Short   ySuperscriptYOffset;
-    FT_Short   yStrikeoutSize;
-    FT_Short   yStrikeoutPosition;
-    FT_Short   sFamilyClass;
-
-    FT_Byte    panose[10];
-
-    FT_ULong   ulUnicodeRange1;        /* Bits 0-31   */
-    FT_ULong   ulUnicodeRange2;        /* Bits 32-63  */
-    FT_ULong   ulUnicodeRange3;        /* Bits 64-95  */
-    FT_ULong   ulUnicodeRange4;        /* Bits 96-127 */
-
-    FT_Char    achVendID[4];
-
-    FT_UShort  fsSelection;
-    FT_UShort  usFirstCharIndex;
-    FT_UShort  usLastCharIndex;
-    FT_Short   sTypoAscender;
-    FT_Short   sTypoDescender;
-    FT_Short   sTypoLineGap;
-    FT_UShort  usWinAscent;
-    FT_UShort  usWinDescent;
-
-    /* only version 1 tables: */
-
-    FT_ULong   ulCodePageRange1;       /* Bits 0-31   */
-    FT_ULong   ulCodePageRange2;       /* Bits 32-63  */
-
-    /* only version 2 tables: */
-
-    FT_Short   sxHeight;
-    FT_Short   sCapHeight;
-    FT_UShort  usDefaultChar;
-    FT_UShort  usBreakChar;
-    FT_UShort  usMaxContext;
-
-  } TT_OS2;
-
-

    -
    -

    A structure used to model a TrueType OS/2 table. This is the long table version. All fields comply to the TrueType specification.

    -

    Note that we now support old Mac fonts which do not include an OS/2 table. In this case, the ‘version’ field is always set to 0xFFFF.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    TT_Postscript

    -
    -Defined in FT_TRUETYPE_TABLES_H (freetype/tttables.h). -

    -
    -
-  typedef struct  TT_Postscript_
-  {
-    FT_Fixed  FormatType;
-    FT_Fixed  italicAngle;
-    FT_Short  underlinePosition;
-    FT_Short  underlineThickness;
-    FT_ULong  isFixedPitch;
-    FT_ULong  minMemType42;
-    FT_ULong  maxMemType42;
-    FT_ULong  minMemType1;
-    FT_ULong  maxMemType1;
-
-    /* Glyph names follow in the file, but we don't   */
-    /* load them by default.  See the ttpost.c file.  */
-
-  } TT_Postscript;
-
-

    -
    -

    A structure used to model a TrueType PostScript table. All fields comply to the TrueType specification. This structure does not reference the PostScript glyph names, which can be nevertheless accessed with the ‘ttpost’ module.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    TT_PCLT

    -
    -Defined in FT_TRUETYPE_TABLES_H (freetype/tttables.h). -

    -
    -
-  typedef struct  TT_PCLT_
-  {
-    FT_Fixed   Version;
-    FT_ULong   FontNumber;
-    FT_UShort  Pitch;
-    FT_UShort  xHeight;
-    FT_UShort  Style;
-    FT_UShort  TypeFamily;
-    FT_UShort  CapHeight;
-    FT_UShort  SymbolSet;
-    FT_Char    TypeFace[16];
-    FT_Char    CharacterComplement[8];
-    FT_Char    FileName[6];
-    FT_Char    StrokeWeight;
-    FT_Char    WidthType;
-    FT_Byte    SerifStyle;
-    FT_Byte    Reserved;
-
-  } TT_PCLT;
-
-

    -
    -

    A structure used to model a TrueType PCLT table. All fields comply to the TrueType specification.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    TT_MaxProfile

    -
    -Defined in FT_TRUETYPE_TABLES_H (freetype/tttables.h). -

    -
    -
-  typedef struct  TT_MaxProfile_
-  {
-    FT_Fixed   version;
-    FT_UShort  numGlyphs;
-    FT_UShort  maxPoints;
-    FT_UShort  maxContours;
-    FT_UShort  maxCompositePoints;
-    FT_UShort  maxCompositeContours;
-    FT_UShort  maxZones;
-    FT_UShort  maxTwilightPoints;
-    FT_UShort  maxStorage;
-    FT_UShort  maxFunctionDefs;
-    FT_UShort  maxInstructionDefs;
-    FT_UShort  maxStackElements;
-    FT_UShort  maxSizeOfInstructions;
-    FT_UShort  maxComponentElements;
-    FT_UShort  maxComponentDepth;
-
-  } TT_MaxProfile;
-
-

    -
    -

    The maximum profile is a table containing many max values which can be used to pre-allocate arrays. This ensures that no memory allocation occurs during a glyph load.

    -

    -
    fields
    -

    - - - - - - - - - - - - - - - - -
    version -

    The version number.

    -
    numGlyphs -

    The number of glyphs in this TrueType font.

    -
    maxPoints -

    The maximum number of points in a non-composite TrueType glyph. See also the structure element ‘maxCompositePoints’.

    -
    maxContours -

    The maximum number of contours in a non-composite TrueType glyph. See also the structure element ‘maxCompositeContours’.

    -
    maxCompositePoints -

    The maximum number of points in a composite TrueType glyph. See also the structure element ‘maxPoints’.

    -
    maxCompositeContours -

    The maximum number of contours in a composite TrueType glyph. See also the structure element ‘maxContours’.

    -
    maxZones -

    The maximum number of zones used for glyph hinting.

    -
    maxTwilightPoints -

    The maximum number of points in the twilight zone used for glyph hinting.

    -
    maxStorage -

    The maximum number of elements in the storage area used for glyph hinting.

    -
    maxFunctionDefs -

    The maximum number of function definitions in the TrueType bytecode for this font.

    -
    maxInstructionDefs -

    The maximum number of instruction definitions in the TrueType bytecode for this font.

    -
    maxStackElements -

    The maximum number of stack elements used during bytecode interpretation.

    -
    maxSizeOfInstructions -

    The maximum number of TrueType opcodes used for glyph hinting.

    -
    maxComponentElements -

    The maximum number of simple (i.e., non- composite) glyphs in a composite glyph.

    -
    maxComponentDepth -

    The maximum nesting depth of composite glyphs.

    -
    -
    -
    note
    -

    This structure is only used during font loading.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Sfnt_Tag

    -
    -Defined in FT_TRUETYPE_TABLES_H (freetype/tttables.h). -

    -
    -
-  typedef enum  FT_Sfnt_Tag_
-  {
-    ft_sfnt_head = 0,    /* TT_Header     */
-    ft_sfnt_maxp = 1,    /* TT_MaxProfile */
-    ft_sfnt_os2  = 2,    /* TT_OS2        */
-    ft_sfnt_hhea = 3,    /* TT_HoriHeader */
-    ft_sfnt_vhea = 4,    /* TT_VertHeader */
-    ft_sfnt_post = 5,    /* TT_Postscript */
-    ft_sfnt_pclt = 6,    /* TT_PCLT       */
-
-    sfnt_max   /* internal end mark */
-
-  } FT_Sfnt_Tag;
-
-

    -
    -

    An enumeration used to specify the index of an SFNT table. Used in the FT_Get_Sfnt_Table API function.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Get_Sfnt_Table

    -
    -Defined in FT_TRUETYPE_TABLES_H (freetype/tttables.h). -

    -
    -
-  FT_EXPORT( void* )
-  FT_Get_Sfnt_Table( FT_Face      face,
-                     FT_Sfnt_Tag  tag );
-
-

    -
    -

    Return a pointer to a given SFNT table within a face.

    -

    -
    input
    -

    - - - -
    face -

    A handle to the source.

    -
    tag -

    The index of the SFNT table.

    -
    -
    -
    return
    -

    A type-less pointer to the table. This will be 0 in case of error, or if the corresponding table was not found OR loaded from the file.

    -

    Use a typecast according to ‘tag’ to access the structure elements.

    -
    -
    note
    -

    The table is owned by the face object and disappears with it.

    -

    This function is only useful to access SFNT tables that are loaded by the sfnt, truetype, and opentype drivers. See FT_Sfnt_Tag for a list.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Load_Sfnt_Table

    -
    -Defined in FT_TRUETYPE_TABLES_H (freetype/tttables.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Load_Sfnt_Table( FT_Face    face,
-                      FT_ULong   tag,
-                      FT_Long    offset,
-                      FT_Byte*   buffer,
-                      FT_ULong*  length );
-
-

    -
    -

    Load any font table into client memory.

    -

    -
    input
    -

    - - - - -
    face -

    A handle to the source face.

    -
    tag -

    The four-byte tag of the table to load. Use the value 0 if you want to access the whole font file. Otherwise, you can use one of the definitions found in the FT_TRUETYPE_TAGS_H file, or forge a new one with FT_MAKE_TAG.

    -
    offset -

    The starting offset in the table (or file if tag == 0).

    -
    -
    -
    output
    -

    - - -
    buffer -

    The target buffer address. The client must ensure that the memory array is big enough to hold the data.

    -
    -
    -
    inout
    -

    - - -
    length -

    If the ‘length’ parameter is NULL, then try to load the whole table. Return an error code if it fails.

    -

    Else, if ‘*length’ is 0, exit immediately while returning the table's (or file) full size in it.

    -

    Else the number of bytes to read from the table or file, from the starting offset.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    If you need to determine the table's length you should first call this function with ‘*length’ set to 0, as in the following example:

    -
    -  FT_ULong  length = 0;
-
-
-  error = FT_Load_Sfnt_Table( face, tag, 0, NULL, &length );
-  if ( error ) { ... table does not exist ... }
-
-  buffer = malloc( length );
-  if ( buffer == NULL ) { ... not enough memory ... }
-
-  error = FT_Load_Sfnt_Table( face, tag, 0, buffer, &length );
-  if ( error ) { ... could not load table ... }
-
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Sfnt_Table_Info

    -
    -Defined in FT_TRUETYPE_TABLES_H (freetype/tttables.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Sfnt_Table_Info( FT_Face    face,
-                      FT_UInt    table_index,
-                      FT_ULong  *tag,
-                      FT_ULong  *length );
-
-

    -
    -

    Return information on an SFNT table.

    -

    -
    input
    -

    - - - -
    face -

    A handle to the source face.

    -
    table_index -

    The index of an SFNT table. The function returns FT_Err_Table_Missing for an invalid value.

    -
    -
    -
    inout
    -

    - - -
    tag -

    The name tag of the SFNT table. If the value is NULL, ‘table_index’ is ignored, and ‘length’ returns the number of SFNT tables in the font.

    -
    -
    -
    output
    -

    - - -
    length -

    The length of the SFNT table (or the number of SFNT tables, depending on ‘tag’).

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    SFNT tables with length zero are treated as missing.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Get_CMap_Language_ID

    -
    -Defined in FT_TRUETYPE_TABLES_H (freetype/tttables.h). -

    -
    -
-  FT_EXPORT( FT_ULong )
-  FT_Get_CMap_Language_ID( FT_CharMap  charmap );
-
-

    -
    -

    Return TrueType/sfnt specific cmap language ID. Definitions of language ID values are in ‘freetype/ttnameid.h’.

    -

    -
    input
    -

    - - -
    charmap -

    The target charmap.

    -
    -
    -
    return
    -

    The language ID of ‘charmap’. If ‘charmap’ doesn't belong to a TrueType/sfnt face, just return 0 as the default value.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Get_CMap_Format

    -
    -Defined in FT_TRUETYPE_TABLES_H (freetype/tttables.h). -

    -
    -
-  FT_EXPORT( FT_Long )
-  FT_Get_CMap_Format( FT_CharMap  charmap );
-
-

    -
    -

    Return TrueType/sfnt specific cmap format.

    -

    -
    input
    -

    - - -
    charmap -

    The target charmap.

    -
    -
    -
    return
    -

    The format of ‘charmap’. If ‘charmap’ doesn't belong to a TrueType/sfnt face, return -1.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_PARAM_TAG_UNPATENTED_HINTING

    -
    -Defined in FT_UNPATENTED_HINTING_H (freetype/ttunpat.h). -

    -
    -
-#define FT_PARAM_TAG_UNPATENTED_HINTING  FT_MAKE_TAG( 'u', 'n', 'p', 'a' )
-
-

    -
    -

    A constant used as the tag of an FT_Parameter structure to indicate that unpatented methods only should be used by the TrueType bytecode interpreter for a typeface opened by FT_Open_Face.

    -

    -
    -
    - - -
    [Index][TOC]
    - - - diff --git a/docs/reference/ft2-type1_tables.html b/docs/reference/ft2-type1_tables.html deleted file mode 100644 index a7d1197..0000000 --- a/docs/reference/ft2-type1_tables.html +++ /dev/null @@ -1,689 +0,0 @@ - - - - -FreeType-2.4.9 API Reference - - - - - - -
    [Index][TOC]
    -

    FreeType-2.4.9 API Reference

    - -

    -Type 1 Tables -

    -

    Synopsis

    - - - - - - - -
    PS_FontInfoRecT1_Blend_FlagsFT_Has_PS_Glyph_Names
    PS_FontInfoCID_FaceDictRecFT_Get_PS_Font_Info
    T1_FontInfoCID_FaceDictFT_Get_PS_Font_Private
    PS_PrivateRecCID_FaceInfoRecT1_EncodingType
    PS_PrivateCID_FaceInfoPS_Dict_Keys
    T1_PrivateCID_InfoFT_Get_PS_Font_Value


    - -
    -

    This section contains the definition of Type 1-specific tables, including structures related to other PostScript font formats.

    -

    -
    -

    PS_FontInfoRec

    -
    -Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h). -

    -
    -
-  typedef struct  PS_FontInfoRec_
-  {
-    FT_String*  version;
-    FT_String*  notice;
-    FT_String*  full_name;
-    FT_String*  family_name;
-    FT_String*  weight;
-    FT_Long     italic_angle;
-    FT_Bool     is_fixed_pitch;
-    FT_Short    underline_position;
-    FT_UShort   underline_thickness;
-
-  } PS_FontInfoRec;
-
-

    -
    -

    A structure used to model a Type 1 or Type 2 FontInfo dictionary. Note that for Multiple Master fonts, each instance has its own FontInfo dictionary.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    PS_FontInfo

    -
    -Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h). -

    -
    -
-  typedef struct PS_FontInfoRec_*  PS_FontInfo;
-
-

    -
    -

    A handle to a PS_FontInfoRec structure.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    T1_FontInfo

    -
    -Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h). -

    -
    -
-  typedef PS_FontInfoRec  T1_FontInfo;
-
-

    -
    -

    This type is equivalent to PS_FontInfoRec. It is deprecated but kept to maintain source compatibility between various versions of FreeType.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    PS_PrivateRec

    -
    -Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h). -

    -
    -
-  typedef struct  PS_PrivateRec_
-  {
-    FT_Int     unique_id;
-    FT_Int     lenIV;
-
-    FT_Byte    num_blue_values;
-    FT_Byte    num_other_blues;
-    FT_Byte    num_family_blues;
-    FT_Byte    num_family_other_blues;
-
-    FT_Short   blue_values[14];
-    FT_Short   other_blues[10];
-
-    FT_Short   family_blues      [14];
-    FT_Short   family_other_blues[10];
-
-    FT_Fixed   blue_scale;
-    FT_Int     blue_shift;
-    FT_Int     blue_fuzz;
-
-    FT_UShort  standard_width[1];
-    FT_UShort  standard_height[1];
-
-    FT_Byte    num_snap_widths;
-    FT_Byte    num_snap_heights;
-    FT_Bool    force_bold;
-    FT_Bool    round_stem_up;
-
-    FT_Short   snap_widths [13];  /* including std width  */
-    FT_Short   snap_heights[13];  /* including std height */
-
-    FT_Fixed   expansion_factor;
-
-    FT_Long    language_group;
-    FT_Long    password;
-
-    FT_Short   min_feature[2];
-
-  } PS_PrivateRec;
-
-

    -
    -

    A structure used to model a Type 1 or Type 2 private dictionary. Note that for Multiple Master fonts, each instance has its own Private dictionary.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    PS_Private

    -
    -Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h). -

    -
    -
-  typedef struct PS_PrivateRec_*  PS_Private;
-
-

    -
    -

    A handle to a PS_PrivateRec structure.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    T1_Private

    -
    -Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h). -

    -
    -
-  typedef PS_PrivateRec  T1_Private;
-
-

    -
    -

    This type is equivalent to PS_PrivateRec. It is deprecated but kept to maintain source compatibility between various versions of FreeType.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    T1_Blend_Flags

    -
    -Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h). -

    -
    -
-  typedef enum  T1_Blend_Flags_
-  {
-    /*# required fields in a FontInfo blend dictionary */
-    T1_BLEND_UNDERLINE_POSITION = 0,
-    T1_BLEND_UNDERLINE_THICKNESS,
-    T1_BLEND_ITALIC_ANGLE,
-
-    /*# required fields in a Private blend dictionary */
-    T1_BLEND_BLUE_VALUES,
-    T1_BLEND_OTHER_BLUES,
-    T1_BLEND_STANDARD_WIDTH,
-    T1_BLEND_STANDARD_HEIGHT,
-    T1_BLEND_STEM_SNAP_WIDTHS,
-    T1_BLEND_STEM_SNAP_HEIGHTS,
-    T1_BLEND_BLUE_SCALE,
-    T1_BLEND_BLUE_SHIFT,
-    T1_BLEND_FAMILY_BLUES,
-    T1_BLEND_FAMILY_OTHER_BLUES,
-    T1_BLEND_FORCE_BOLD,
-
-    /*# never remove */
-    T1_BLEND_MAX
-
-  } T1_Blend_Flags;
-
-

    -
    -

    A set of flags used to indicate which fields are present in a given blend dictionary (font info or private). Used to support Multiple Masters fonts.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    CID_FaceDictRec

    -
    -Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h). -

    -
    -
-  typedef struct  CID_FaceDictRec_
-  {
-    PS_PrivateRec  private_dict;
-
-    FT_UInt        len_buildchar;
-    FT_Fixed       forcebold_threshold;
-    FT_Pos         stroke_width;
-    FT_Fixed       expansion_factor;
-
-    FT_Byte        paint_type;
-    FT_Byte        font_type;
-    FT_Matrix      font_matrix;
-    FT_Vector      font_offset;
-
-    FT_UInt        num_subrs;
-    FT_ULong       subrmap_offset;
-    FT_Int         sd_bytes;
-
-  } CID_FaceDictRec;
-
-

    -
    -

    A structure used to represent data in a CID top-level dictionary.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    CID_FaceDict

    -
    -Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h). -

    -
    -
-  typedef struct CID_FaceDictRec_*  CID_FaceDict;
-
-

    -
    -

    A handle to a CID_FaceDictRec structure.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    CID_FaceInfoRec

    -
    -Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h). -

    -
    -
-  typedef struct  CID_FaceInfoRec_
-  {
-    FT_String*      cid_font_name;
-    FT_Fixed        cid_version;
-    FT_Int          cid_font_type;
-
-    FT_String*      registry;
-    FT_String*      ordering;
-    FT_Int          supplement;
-
-    PS_FontInfoRec  font_info;
-    FT_BBox         font_bbox;
-    FT_ULong        uid_base;
-
-    FT_Int          num_xuid;
-    FT_ULong        xuid[16];
-
-    FT_ULong        cidmap_offset;
-    FT_Int          fd_bytes;
-    FT_Int          gd_bytes;
-    FT_ULong        cid_count;
-
-    FT_Int          num_dicts;
-    CID_FaceDict    font_dicts;
-
-    FT_ULong        data_offset;
-
-  } CID_FaceInfoRec;
-
-

    -
    -

    A structure used to represent CID Face information.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    CID_FaceInfo

    -
    -Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h). -

    -
    -
-  typedef struct CID_FaceInfoRec_*  CID_FaceInfo;
-
-

    -
    -

    A handle to a CID_FaceInfoRec structure.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    CID_Info

    -
    -Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h). -

    -
    -
-  typedef CID_FaceInfoRec  CID_Info;
-
-

    -
    -

    This type is equivalent to CID_FaceInfoRec. It is deprecated but kept to maintain source compatibility between various versions of FreeType.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Has_PS_Glyph_Names

    -
    -Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h). -

    -
    -
-  FT_EXPORT( FT_Int )
-  FT_Has_PS_Glyph_Names( FT_Face  face );
-
-

    -
    -

    Return true if a given face provides reliable PostScript glyph names. This is similar to using the FT_HAS_GLYPH_NAMES macro, except that certain fonts (mostly TrueType) contain incorrect glyph name tables.

    -

    When this function returns true, the caller is sure that the glyph names returned by FT_Get_Glyph_Name are reliable.

    -

    -
    input
    -

    - - -
    face -

    face handle

    -
    -
    -
    return
    -

    Boolean. True if glyph names are reliable.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Get_PS_Font_Info

    -
    -Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Get_PS_Font_Info( FT_Face      face,
-                       PS_FontInfo  afont_info );
-
-

    -
    -

    Retrieve the PS_FontInfoRec structure corresponding to a given PostScript font.

    -

    -
    input
    -

    - - -
    face -

    PostScript face handle.

    -
    -
    -
    output
    -

    - - -
    afont_info -

    Output font info structure pointer.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    The string pointers within the font info structure are owned by the face and don't need to be freed by the caller.

    -

    If the font's format is not PostScript-based, this function will return the ‘FT_Err_Invalid_Argument’ error code.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Get_PS_Font_Private

    -
    -Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Get_PS_Font_Private( FT_Face     face,
-                          PS_Private  afont_private );
-
-

    -
    -

    Retrieve the PS_PrivateRec structure corresponding to a given PostScript font.

    -

    -
    input
    -

    - - -
    face -

    PostScript face handle.

    -
    -
    -
    output
    -

    - - -
    afont_private -

    Output private dictionary structure pointer.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    The string pointers within the PS_PrivateRec structure are owned by the face and don't need to be freed by the caller.

    -

    If the font's format is not PostScript-based, this function returns the ‘FT_Err_Invalid_Argument’ error code.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    T1_EncodingType

    -
    -Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h). -

    -
    -
-  typedef enum  T1_EncodingType_
-  {
-    T1_ENCODING_TYPE_NONE = 0,
-    T1_ENCODING_TYPE_ARRAY,
-    T1_ENCODING_TYPE_STANDARD,
-    T1_ENCODING_TYPE_ISOLATIN1,
-    T1_ENCODING_TYPE_EXPERT
-
-  } T1_EncodingType;
-
-

    -
    -

    An enumeration describing the ‘Encoding’ entry in a Type 1 dictionary.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    PS_Dict_Keys

    -
    -Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h). -

    -
    -
-  typedef enum  PS_Dict_Keys_
-  {
-    /* conventionally in the font dictionary */
-    PS_DICT_FONT_TYPE,              /* FT_Byte         */
-    PS_DICT_FONT_MATRIX,            /* FT_Fixed        */
-    PS_DICT_FONT_BBOX,              /* FT_Fixed        */
-    PS_DICT_PAINT_TYPE,             /* FT_Byte         */
-    PS_DICT_FONT_NAME,              /* FT_String*      */
-    PS_DICT_UNIQUE_ID,              /* FT_Int          */
-    PS_DICT_NUM_CHAR_STRINGS,       /* FT_Int          */
-    PS_DICT_CHAR_STRING_KEY,        /* FT_String*      */
-    PS_DICT_CHAR_STRING,            /* FT_String*      */
-    PS_DICT_ENCODING_TYPE,          /* T1_EncodingType */
-    PS_DICT_ENCODING_ENTRY,         /* FT_String*      */
-
-    /* conventionally in the font Private dictionary */
-    PS_DICT_NUM_SUBRS,              /* FT_Int     */
-    PS_DICT_SUBR,                   /* FT_String* */
-    PS_DICT_STD_HW,                 /* FT_UShort  */
-    PS_DICT_STD_VW,                 /* FT_UShort  */
-    PS_DICT_NUM_BLUE_VALUES,        /* FT_Byte    */
-    PS_DICT_BLUE_VALUE,             /* FT_Short   */
-    PS_DICT_BLUE_FUZZ,              /* FT_Int     */
-    PS_DICT_NUM_OTHER_BLUES,        /* FT_Byte    */
-    PS_DICT_OTHER_BLUE,             /* FT_Short   */
-    PS_DICT_NUM_FAMILY_BLUES,       /* FT_Byte    */
-    PS_DICT_FAMILY_BLUE,            /* FT_Short   */
-    PS_DICT_NUM_FAMILY_OTHER_BLUES, /* FT_Byte    */
-    PS_DICT_FAMILY_OTHER_BLUE,      /* FT_Short   */
-    PS_DICT_BLUE_SCALE,             /* FT_Fixed   */
-    PS_DICT_BLUE_SHIFT,             /* FT_Int     */
-    PS_DICT_NUM_STEM_SNAP_H,        /* FT_Byte    */
-    PS_DICT_STEM_SNAP_H,            /* FT_Short   */
-    PS_DICT_NUM_STEM_SNAP_V,        /* FT_Byte    */
-    PS_DICT_STEM_SNAP_V,            /* FT_Short   */
-    PS_DICT_FORCE_BOLD,             /* FT_Bool    */
-    PS_DICT_RND_STEM_UP,            /* FT_Bool    */
-    PS_DICT_MIN_FEATURE,            /* FT_Short   */
-    PS_DICT_LEN_IV,                 /* FT_Int     */
-    PS_DICT_PASSWORD,               /* FT_Long    */
-    PS_DICT_LANGUAGE_GROUP,         /* FT_Long    */
-
-    /* conventionally in the font FontInfo dictionary */
-    PS_DICT_VERSION,                /* FT_String* */
-    PS_DICT_NOTICE,                 /* FT_String* */
-    PS_DICT_FULL_NAME,              /* FT_String* */
-    PS_DICT_FAMILY_NAME,            /* FT_String* */
-    PS_DICT_WEIGHT,                 /* FT_String* */
-    PS_DICT_IS_FIXED_PITCH,         /* FT_Bool    */
-    PS_DICT_UNDERLINE_POSITION,     /* FT_Short   */
-    PS_DICT_UNDERLINE_THICKNESS,    /* FT_UShort  */
-    PS_DICT_FS_TYPE,                /* FT_UShort  */
-    PS_DICT_ITALIC_ANGLE,           /* FT_Long    */
-
-    PS_DICT_MAX = PS_DICT_ITALIC_ANGLE
-
-  } PS_Dict_Keys;
-
-

    -
    -

    An enumeration used in calls to FT_Get_PS_Font_Value to identify the Type 1 dictionary entry to retrieve.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Get_PS_Font_Value

    -
    -Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h). -

    -
    -
-  FT_EXPORT( FT_Long )
-  FT_Get_PS_Font_Value( FT_Face       face,
-                        PS_Dict_Keys  key,
-                        FT_UInt       idx,
-                        void         *value,
-                        FT_Long       value_len );
-
-

    -
    -

    Retrieve the value for the supplied key from a PostScript font.

    -

    -
    input
    -

    - - - - - - -
    face -

    PostScript face handle.

    -
    key -

    An enumeration value representing the dictionary key to retrieve.

    -
    idx -

    For array values, this specifies the index to be returned.

    -
    value -

    A pointer to memory into which to write the value.

    -
    valen_len -

    The size, in bytes, of the memory supplied for the value.

    -
    -
    -
    output
    -

    - - -
    value -

    The value matching the above key, if it exists.

    -
    -
    -
    return
    -

    The amount of memory (in bytes) required to hold the requested value (if it exists, -1 otherwise).

    -
    -
    note
    -

    The values returned are not pointers into the internal structures of the face, but are ‘fresh’ copies, so that the memory containing them belongs to the calling application. This also enforces the ‘read-only’ nature of these values, i.e., this function cannot be used to manipulate the face.

    -

    ‘value’ is a void pointer because the values returned can be of various types.

    -

    If either ‘value’ is NULL or ‘value_len’ is too small, just the required memory size for the requested entry is returned.

    -

    The ‘idx’ parameter is used, not only to retrieve elements of, for example, the FontMatrix or FontBBox, but also to retrieve name keys from the CharStrings dictionary, and the charstrings themselves. It is ignored for atomic values.

    -

    PS_DICT_BLUE_SCALE returns a value that is scaled up by 1000. To get the value as in the font stream, you need to divide by 65536000.0 (to remove the FT_Fixed scale, and the x1000 scale).

    -

    IMPORTANT: Only key/value pairs read by the FreeType interpreter can be retrieved. So, for example, PostScript procedures such as NP, ND, and RD are not available. Arbitrary keys are, obviously, not be available either.

    -

    If the font's format is not PostScript-based, this function returns the ‘FT_Err_Invalid_Argument’ error code.

    -
    -
    -
    - - -
    [Index][TOC]
    - - - diff --git a/docs/reference/ft2-user_allocation.html b/docs/reference/ft2-user_allocation.html deleted file mode 100644 index 3868a39..0000000 --- a/docs/reference/ft2-user_allocation.html +++ /dev/null @@ -1,47 +0,0 @@ - - - - -FreeType-2.4.9 API Reference - - - - - - -
    [Index][TOC]
    -

    FreeType-2.4.9 API Reference

    - -

    -User allocation -

    -
    -

    FreeType assumes that structures allocated by the user and passed as arguments are zeroed out except for the actual data. In other words, it is recommended to use ‘calloc’ (or variants of it) instead of ‘malloc’ for allocation.

    -

    - - diff --git a/docs/reference/ft2-version.html b/docs/reference/ft2-version.html deleted file mode 100644 index 9136441..0000000 --- a/docs/reference/ft2-version.html +++ /dev/null @@ -1,219 +0,0 @@ - - - - -FreeType-2.4.9 API Reference - - - - - - -
    [Index][TOC]
    -

    FreeType-2.4.9 API Reference

    - -

    -FreeType Version -

    -

    Synopsis

    - - - -
    FREETYPE_XXXFT_Face_CheckTrueTypePatents
    FT_Library_VersionFT_Face_SetUnpatentedHinting


    - -
    -

    Note that those functions and macros are of limited use because even a new release of FreeType with only documentation changes increases the version number.

    -

    -
    -

    FREETYPE_XXX

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-#define FREETYPE_MAJOR  2
-#define FREETYPE_MINOR  4
-#define FREETYPE_PATCH  9
-
-

    -
    -

    These three macros identify the FreeType source code version. Use FT_Library_Version to access them at runtime.

    -

    -
    values
    -

    - - - - -
    FREETYPE_MAJOR -

    The major version number.

    -
    FREETYPE_MINOR -

    The minor version number.

    -
    FREETYPE_PATCH -

    The patch level.

    -
    -
    -
    note
    -

    The version number of FreeType if built as a dynamic link library with the ‘libtool’ package is not controlled by these three macros.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Library_Version

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  FT_EXPORT( void )
-  FT_Library_Version( FT_Library   library,
-                      FT_Int      *amajor,
-                      FT_Int      *aminor,
-                      FT_Int      *apatch );
-
-

    -
    -

    Return the version of the FreeType library being used. This is useful when dynamically linking to the library, since one cannot use the macros FREETYPE_MAJOR, FREETYPE_MINOR, and FREETYPE_PATCH.

    -

    -
    input
    -

    - - -
    library -

    A source library handle.

    -
    -
    -
    output
    -

    - - - - -
    amajor -

    The major version number.

    -
    aminor -

    The minor version number.

    -
    apatch -

    The patch version number.

    -
    -
    -
    note
    -

    The reason why this function takes a ‘library’ argument is because certain programs implement library initialization in a custom way that doesn't use FT_Init_FreeType.

    -

    In such cases, the library version might not be available before the library object has been created.

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Face_CheckTrueTypePatents

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  FT_EXPORT( FT_Bool )
-  FT_Face_CheckTrueTypePatents( FT_Face  face );
-
-

    -
    -

    Parse all bytecode instructions of a TrueType font file to check whether any of the patented opcodes are used. This is only useful if you want to be able to use the unpatented hinter with fonts that do not use these opcodes.

    -

    Note that this function parses all glyph instructions in the font file, which may be slow.

    -

    -
    input
    -

    - - -
    face -

    A face handle.

    -
    -
    -
    return
    -

    1 if this is a TrueType font that uses one of the patented opcodes, 0 otherwise.

    -
    -
    note
    -

    Since May 2010, TrueType hinting is no longer patented.

    -
    -
    since
    -

    2.3.5

    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Face_SetUnpatentedHinting

    -
    -Defined in FT_FREETYPE_H (freetype/freetype.h). -

    -
    -
-  FT_EXPORT( FT_Bool )
-  FT_Face_SetUnpatentedHinting( FT_Face  face,
-                                FT_Bool  value );
-
-

    -
    -

    Enable or disable the unpatented hinter for a given face. Only enable it if you have determined that the face doesn't use any patented opcodes (see FT_Face_CheckTrueTypePatents).

    -

    -
    input
    -

    - - - -
    face -

    A face handle.

    -
    value -

    New boolean setting.

    -
    -
    -
    return
    -

    The old setting value. This will always be false if this is not an SFNT font, or if the unpatented hinter is not compiled in this instance of the library.

    -
    -
    note
    -

    Since May 2010, TrueType hinting is no longer patented.

    -
    -
    since
    -

    2.3.5

    -
    -
    -
    - - -
    [Index][TOC]
    - - - diff --git a/docs/reference/ft2-winfnt_fonts.html b/docs/reference/ft2-winfnt_fonts.html deleted file mode 100644 index 3c72039..0000000 --- a/docs/reference/ft2-winfnt_fonts.html +++ /dev/null @@ -1,278 +0,0 @@ - - - - -FreeType-2.4.9 API Reference - - - - - - -
    [Index][TOC]
    -

    FreeType-2.4.9 API Reference

    - -

    -Window FNT Files -

    -

    Synopsis

    - - - -
    FT_WinFNT_ID_XXXFT_WinFNT_Header
    FT_WinFNT_HeaderRecFT_Get_WinFNT_Header


    - -
    -

    This section contains the declaration of Windows FNT specific functions.

    -

    -
    -

    FT_WinFNT_ID_XXX

    -
    -Defined in FT_WINFONTS_H (freetype/ftwinfnt.h). -

    -
    -
-#define FT_WinFNT_ID_CP1252    0
-#define FT_WinFNT_ID_DEFAULT   1
-#define FT_WinFNT_ID_SYMBOL    2
-#define FT_WinFNT_ID_MAC      77
-#define FT_WinFNT_ID_CP932   128
-#define FT_WinFNT_ID_CP949   129
-#define FT_WinFNT_ID_CP1361  130
-#define FT_WinFNT_ID_CP936   134
-#define FT_WinFNT_ID_CP950   136
-#define FT_WinFNT_ID_CP1253  161
-#define FT_WinFNT_ID_CP1254  162
-#define FT_WinFNT_ID_CP1258  163
-#define FT_WinFNT_ID_CP1255  177
-#define FT_WinFNT_ID_CP1256  178
-#define FT_WinFNT_ID_CP1257  186
-#define FT_WinFNT_ID_CP1251  204
-#define FT_WinFNT_ID_CP874   222
-#define FT_WinFNT_ID_CP1250  238
-#define FT_WinFNT_ID_OEM     255
-
-

    -
    -

    A list of valid values for the ‘charset’ byte in FT_WinFNT_HeaderRec. Exact mapping tables for the various cpXXXX encodings (except for cp1361) can be found at ftp://ftp.unicode.org in the MAPPINGS/VENDORS/MICSFT/WINDOWS subdirectory. cp1361 is roughly a superset of MAPPINGS/OBSOLETE/EASTASIA/KSC/JOHAB.TXT.

    -

    -
    values
    -

    - - - - - - - - - - - - - - - - - - - - -
    FT_WinFNT_ID_DEFAULT -

    This is used for font enumeration and font creation as a ‘don't care’ value. Valid font files don't contain this value. When querying for information about the character set of the font that is currently selected into a specified device context, this return value (of the related Windows API) simply denotes failure.

    -
    FT_WinFNT_ID_SYMBOL -

    There is no known mapping table available.

    -
    FT_WinFNT_ID_MAC -

    Mac Roman encoding.

    -
    FT_WinFNT_ID_OEM -

    From Michael Pöttgen <michael@poettgen.de>:

    -

    The ‘Windows Font Mapping’ article says that FT_WinFNT_ID_OEM is used for the charset of vector fonts, like ‘modern.fon’, ‘roman.fon’, and ‘script.fon’ on Windows.

    -

    The ‘CreateFont’ documentation says: The FT_WinFNT_ID_OEM value specifies a character set that is operating-system dependent.

    -

    The ‘IFIMETRICS’ documentation from the ‘Windows Driver Development Kit’ says: This font supports an OEM-specific character set. The OEM character set is system dependent.

    -

    In general OEM, as opposed to ANSI (i.e., cp1252), denotes the second default codepage that most international versions of Windows have. It is one of the OEM codepages from

    -

    http://www.microsoft.com/globaldev/reference/cphome.mspx,

    -

    and is used for the ‘DOS boxes’, to support legacy applications. A German Windows version for example usually uses ANSI codepage 1252 and OEM codepage 850.

    -
    FT_WinFNT_ID_CP874 -

    A superset of Thai TIS 620 and ISO 8859-11.

    -
    FT_WinFNT_ID_CP932 -

    A superset of Japanese Shift-JIS (with minor deviations).

    -
    FT_WinFNT_ID_CP936 -

    A superset of simplified Chinese GB 2312-1980 (with different ordering and minor deviations).

    -
    FT_WinFNT_ID_CP949 -

    A superset of Korean Hangul KS C 5601-1987 (with different ordering and minor deviations).

    -
    FT_WinFNT_ID_CP950 -

    A superset of traditional Chinese Big 5 ETen (with different ordering and minor deviations).

    -
    FT_WinFNT_ID_CP1250 -

    A superset of East European ISO 8859-2 (with slightly different ordering).

    -
    FT_WinFNT_ID_CP1251 -

    A superset of Russian ISO 8859-5 (with different ordering).

    -
    FT_WinFNT_ID_CP1252 -

    ANSI encoding. A superset of ISO 8859-1.

    -
    FT_WinFNT_ID_CP1253 -

    A superset of Greek ISO 8859-7 (with minor modifications).

    -
    FT_WinFNT_ID_CP1254 -

    A superset of Turkish ISO 8859-9.

    -
    FT_WinFNT_ID_CP1255 -

    A superset of Hebrew ISO 8859-8 (with some modifications).

    -
    FT_WinFNT_ID_CP1256 -

    A superset of Arabic ISO 8859-6 (with different ordering).

    -
    FT_WinFNT_ID_CP1257 -

    A superset of Baltic ISO 8859-13 (with some deviations).

    -
    FT_WinFNT_ID_CP1258 -

    For Vietnamese. This encoding doesn't cover all necessary characters.

    -
    FT_WinFNT_ID_CP1361 -

    Korean (Johab).

    -
    -
    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_WinFNT_HeaderRec

    -
    -Defined in FT_WINFONTS_H (freetype/ftwinfnt.h). -

    -
    -
-  typedef struct  FT_WinFNT_HeaderRec_
-  {
-    FT_UShort  version;
-    FT_ULong   file_size;
-    FT_Byte    copyright[60];
-    FT_UShort  file_type;
-    FT_UShort  nominal_point_size;
-    FT_UShort  vertical_resolution;
-    FT_UShort  horizontal_resolution;
-    FT_UShort  ascent;
-    FT_UShort  internal_leading;
-    FT_UShort  external_leading;
-    FT_Byte    italic;
-    FT_Byte    underline;
-    FT_Byte    strike_out;
-    FT_UShort  weight;
-    FT_Byte    charset;
-    FT_UShort  pixel_width;
-    FT_UShort  pixel_height;
-    FT_Byte    pitch_and_family;
-    FT_UShort  avg_width;
-    FT_UShort  max_width;
-    FT_Byte    first_char;
-    FT_Byte    last_char;
-    FT_Byte    default_char;
-    FT_Byte    break_char;
-    FT_UShort  bytes_per_row;
-    FT_ULong   device_offset;
-    FT_ULong   face_name_offset;
-    FT_ULong   bits_pointer;
-    FT_ULong   bits_offset;
-    FT_Byte    reserved;
-    FT_ULong   flags;
-    FT_UShort  A_space;
-    FT_UShort  B_space;
-    FT_UShort  C_space;
-    FT_UShort  color_table_offset;
-    FT_ULong   reserved1[4];
-
-  } FT_WinFNT_HeaderRec;
-
-

    -
    -

    Windows FNT Header info.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_WinFNT_Header

    -
    -Defined in FT_WINFONTS_H (freetype/ftwinfnt.h). -

    -
    -
-  typedef struct FT_WinFNT_HeaderRec_*  FT_WinFNT_Header;
-
-

    -
    -

    A handle to an FT_WinFNT_HeaderRec structure.

    -

    -
    -
    - - -
    [Index][TOC]
    - -
    -

    FT_Get_WinFNT_Header

    -
    -Defined in FT_WINFONTS_H (freetype/ftwinfnt.h). -

    -
    -
-  FT_EXPORT( FT_Error )
-  FT_Get_WinFNT_Header( FT_Face               face,
-                        FT_WinFNT_HeaderRec  *aheader );
-
-

    -
    -

    Retrieve a Windows FNT font info header.

    -

    -
    input
    -

    - - -
    face -

    A handle to the input face.

    -
    -
    -
    output
    -

    - - -
    aheader -

    The WinFNT header.

    -
    -
    -
    return
    -

    FreeType error code. 0 means success.

    -
    -
    note
    -

    This function only works with Windows FNT faces, returning an error otherwise.

    -
    -
    -
    - - -
    [Index][TOC]
    - - - diff --git a/docs/release b/docs/release index 28a8235..98f16cd 100644 --- a/docs/release +++ b/docs/release @@ -1,7 +1,7 @@ How to prepare a new release ---------------------------- -. include/freetype/freetype.h: Update FREETYPE_MAJOR, FREETYPE_MINOR, +. include/freetype.h: Update FREETYPE_MAJOR, FREETYPE_MINOR, and FREETYPE_PATCH. . Update version numbers in all files where necessary (for example, do @@ -41,7 +41,8 @@ How to prepare a new release . Run src/tools/chktrcmp.py and check that there are no undefined trace_XXXX macros. -. Tag the git repositories (freetype2, freetype2-demos) with +. After pushing the new release, tag the git repositories (freetype2, + freetype2-demos) with git tag VER- -m "" -u @@ -49,16 +50,21 @@ How to prepare a new release git push --tags - TODO: Tag the home page CVS on savannah.nongnu.org. +. Check with + + git clean -ndx + + that the git directory is really clean (and remove extraneous files + if necessary). . Say `make dist' in both the freetype2 and freetype2-demos modules to generate the .tar.gz, .tar.bz2, and .zip files. . Create the doc bundles (freetype-doc-.tar.gz, freetype-doc-.tar.bz2, ftdoc.zip). This is - everything below + everything in - freetype.freedesktop.org:/srv/freetype.freedesktop.org/www/freetype2/docs/ + /freetype2/docs except the `reference' subdirectory. Do *not* use option `-l' from zip! @@ -70,7 +76,7 @@ How to prepare a new release #!/bin/sh - VERSION=2.4.8 + VERSION=2.5.1 SAVANNAH_USER=wl SOURCEFORGE_USER=wlemb @@ -154,7 +160,7 @@ How to prepare a new release #!/bin/sh - VERSION=2.4.8 + VERSION=2.5.1 SOURCEFORGE_USER=wlemb ##################################################################### @@ -164,39 +170,26 @@ How to prepare a new release # EOF -. On SourceForge, tag the just uploaded `ftXXXX.zip' and +. On SourceForge, tag the just uploaded `ftXXX.zip' and `freetype-XXX.tar.bz2' files as the default files to download for `Windows' and `Others', respectively. . Copy the reference files (generated by `make dist') to - freetype.freedesktop.org:/srv/freetype.freedesktop.org/www/freetype2/docs/reference - - and - - shell.sf.net:/home/groups/f/fr/freetype/htdocs/freetype2/docs/reference - - TODO: Create FreeType home page CVS on savannah.nongnu.org and - update it accordingly. - - Write script to automatically do this. - - Mirror FreeType's savannah home page everywhere. - -. Update - - freetype.freedesktop.org:/srv/freetype.freedesktop.org/www/index2.html + /freetype2/docs/reference - and copy it to +. Update the `freetype-web' repository. `git push' then automatically + triggers an update of the public web pages within ten minutes, due + to a cron script (on wl@freedesktop.org) that rsyncs with - shell.sf.net:/home/groups/f/fr/freetype/htdocs/index2.html + freedesktop.org://srv/freetype.freedesktop.org/www . Announce new release on freetype-announce@nongnu.org and to relevant newsgroups. ---------------------------------------------------------------------- -Copyright 2003, 2005-2007, 2009, 2011 by +Copyright 2003, 2005-2007, 2009, 2011-2014 by David Turner, Robert Wilhelm, and Werner Lemberg. This file is part of the FreeType project, and may only be used, diff --git a/ft2demos/ftbench b/ft2demos/ftbench deleted file mode 100755 index a53d00237217971f3a9d60c7566ab73b0a0f193f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 46956 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 HNV0`52l^1` diff --git a/ft2demos/ftdiff b/ft2demos/ftdiff deleted file mode 100755 index e25e76a7f8850c9da77863c0db936ede37083203..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 277845 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 diff --git a/ft2demos/ftgamma b/ft2demos/ftgamma deleted file mode 100755 index 46015e8e0ab243b66973f185e8e85694f031d75d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 252489 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

    d!DQRzBU$U&*KY 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

    ?3 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 cLa;PjJ??pDcv1KuV-!~g&Q diff --git a/ft2demos/ftgrid b/ft2demos/ftgrid deleted file mode 100755 index a11e7735345228df8be697de42aaa5c2d68c83bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 283609 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 z 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 diff --git a/ft2demos/ftlint b/ft2demos/ftlint deleted file mode 100755 index d6482b2d4183e61fe3ffaa54e0ed8143a951540c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 29199 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 diff --git a/ft2demos/ftmulti b/ft2demos/ftmulti deleted file mode 100755 index 3e484749d7662d121545c30a52668f6a164c5eb7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 229917 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 z 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 KM%t+?`o93EPgNHH diff --git a/ft2demos/ftview b/ft2demos/ftview deleted file mode 100755 index 91e725dfde36ae791fef5b99a510c1d57a68d3eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 279965 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

    U{*urZ&c)h;09`PjNGosDZxicj&;dt!6!+c zp@Sy{r{tgmS2^M%}`Gm?E3aG~Pp5Nwf!6M_C)WvNLW>O>?e1R;Iqd6UY{GsArX}rii0`qVg)MsR+rTmGS!jII-UM6p z*;hbqNp>T$@Y~xUTCzO|mJ+ak2W1ECM`3`r-50}+V_%1Aw6i-RW~v=Qsxt$Z}BFg~&55?JZ!|NjnKqu9o(6 zNOg_0r$P}+rCoyL%cOlP!mhC(*?cp%CJEgr0Qr{)*n~-(Aw4Z|1>!tlox)AqEdmyy5LE0mr zmj-F~gtniQwuz^lr=)!?!k(7)xrn(%+5=GfGmsjRJ&Qb1!gDwk3XSnR#6<(VAZ_Sh zyeMrS3VKNjZ##&VH2iuo{?L5XDXAd?`tf91!utnEm2~kR5oj7MxH_sQGIBdwbGzptgz!FuIwzHzNMss( z7)X`OK*wOA!uwSeF>dazV)VpS=QFM?7V}Y=wbSuWrx}q> zw+c-Qc7QgM&XL86j0CTTl9R?sR@IZ45iB18@;tZPXz(*wO49i*nI+oq;*^v09!omu zmH`Oc!D^kffYCnC_1cI|kn|BN;Vr-=>F{7&O(P#yM@h^&wbOc`N)*Y8A<|@A(^sL> zCRy?dm23g7sq&gc65+io9fQT0EH&jzRNL=Ammmdf+wq^rSWs4Eq41xt{f6*55Y1n3 z6M|B{$Hn&7c%h!qN65fG-%Sy!L>EXKn=?QYMOZtP$b3vZzs?`eaW`TKf1!VGM+QE-7 zzWL9R1&VAJw9(7`LtHX7I0vQrhq}{6nn-`0S{Non5F+p~qNe$mNI!%LPC}RR*SWch z;1MeBYM1l`kCI%fVsdsrpK4m>POJXlWTw4VhL8_BN$_Wux!e`sMnh5Ora^(zUqL_i z-yrKz{>dGY%}KSu?4Js3%nUuQ|)E0BBgJ45I#Lix!%yVAP`qhIn~s9Sgs zBe&#lo}>31bf)AVX;$e6(YVPOlI-+2tUWnfRU~~PN=ojh6d8C5m9UeqlAWN2wAxyc zyhJ{u>JDn*G0I3=h_JXD=1*IQumoj^bZ!DnzFK~Ql& z{DHX`82!m_%6VV~zd;90-tM-j2(F`yZ_CpWgqDH)tag)1o&H=jSd*(C|eLMM7Pn}9Cf~&iL?BtS$E+^{Q4n=q}{UY!ui0Du5=lO|A*J1!j9?+Jw z5Nb{ym`EzpPr(3`oU2Mn$wSm=;NUfoGekQN{4LRs7Loc+Q$}b#EHm&!q8~j@>X4?a z&|Wla;P0BUL%vf%{ivz5P%5dPG!+SLK?MUpYbrx{e}(1_{KJQ`10TX`2fE4qAcCss zY+0>aP4&M(50~_)@iTC`8b@gDH?Z`cF6j@x$0B;UB-*hQqg)^+Z$iH5B{0Rn1+o=> z(=efh4x6AhnLdO<&XMWhm|7Xcrzje zZuQ>hiWx04h^qvl`Co?U0getkq zB_qL~P+H&~@AaynjNo-JxWK*MJ}PoF_&FxMK)oB972Hj7y_Yv%p3Lmv{1G5GcxjxT z%$(pZ7);<{FUL(!X8+*mD9A^>i&f4egR5BXCa+ff*}*|1H@oB*-7Jr}D8{Q^_5)95S@731 zvDe({*PuQiU-xc@SMGa2K z1ZSR!TMZ-^TDS8}ty?3QMTIOdcPY(VI`dldEZqY3v`i7-zJ0SqnyA@H~m_v6<+LX zRr%kI*8CXrRbY?&7V0&PAK3Z-2+Ohp&7Ps?*;>VWc;kq=iQq66zt@wb+RF&m)2{Y; zbl30)C$Mo_Trwa|-iB00;AR!wE`+4QK7tf`K5e-x$>l9m1`0MxHa)V)C3g2&+(zgw1w<;gk6`wq?Y_HF*L)Ump`T8T?H=l05(I?Ue zvV&|^3P~RacA(YM2~y$V5Z4aB#ndZJV-7TJ8XTKVgT|UZn4{TA=2#W;0>*rpBW9oy z#byKwR3FeI^LSHhQ0S3)f=haWtJ(J^nc6Ci;8MzQkxTmZNHoRNQ-!5RqKjS9)+5nW zmrM&@N<+HDB_ksJ5q7Ri%}J0e{VyD(SDN1`NjZFXXvRgR*Wgw#u+9uZ3e#|K?XVXd z>HQo=8XVPy46cnz?|#%bIJuvScLuI0+hId#!Lr5hhuCR@wPEMGb<-p9}%txfMh#p&0ID$;@a1K4A*}4A5nOJ`%7F0 z*na?LpzT3sgY0BnbM0nu&am%56P#{8gQn_fv*KsjTfjNZ-il6|WgkZ8&a=0`D2CYE zFn0{KAA;rQ*mtAhd)Ze)o-^%rsOez491`}nrz2HoyA$q&y4rt+>15jjP?u~w1Zf+E z&BL>>g76nOuM7JJI9rAN4>)h&v}P3bTVZ#CTDJ+iJDfL#-5btZxMzm5UD!k6ye;g} zaDFH3kC32A*rlM}5%v{uelP5WaQ=YI;JhpBY>0`aid#TosbU=*ELE(BgQbc`;9#lZ zNjO-lI3F>wRPib(ELFS-=M!Q70nVqw_M!T_g#8L^_%mTIM-zQ6>}R2kFN8e}_qKn; z?H20VEbKi`XW~#Nu=~ zUkSS(9DGLWOgLW)o73B0ggpb)H^TlEoNuvu0tf3QSHk(Lu&;*mH(|%o(BGl9puR_K z;rxKw!a0Q6!udOD3kT4M7vTIT?APG@B`Ey$6gI3 zFZI|jqD7Z^?4F2nt;g<&w!Y3|m%v<>d+ZRRT#qm)|vl*cn<8jJn9pcC1al((s*{;Yu<#B4V(RM__B}9p%kBut zQ-qfVg!+Guvb^0;NGNwAt|==~=iKnzzmRiBe=H+bY(zGwLWuVf;mY$BWrW(D3F?ZA z6_pYCE947TY3h{FsMA2zj7OjJWJW{JqR{ZXYfzdeGb=P#2GGYe3u_C=812+h3?#i}KiP{ng# zpOk@NK2&)byuy1U+9Fgn3o+6^f|^4Y%X{JP&=<{uiT76cy-y+++nJ2mDfgmnriF*r zQu`eE!^5;ZBE)B=@Ni8Tq2FNu3y;(kR>{yC!=p51g|34Qghy-24o!zP!eca*78(V~ z!sloT&-i(u#_2j{gyKU%ou{d2sKEqvfsUCK`VB-67icOwv2EKJ}wbKXGRi<*=bE<3JBk$5In@}4?2ZYl8qkBT$jK?oH_cw z$sf7~VQbE>GzFV|14iPMJ;B_o(eootMLBan3HSKU6{Aou%FL%)r;0Ua z?h7&HI^2$-WbR9 z{(nby&i%Y~rdDH7P#X#qWrg^p?rh|W6_(~gA5a?)GDAFahu$UikgiK4v<9L%4{ItT zl*3%y(Ks3^fvGuSSJ@U%>0CyJGEpPvX-$m@ zZDt8uG&L@?0$tpBMpFeLKD0W|YHDK0pRKo7kYg zVVF0wxiZuTQ;+kiCihi__X3P=7CBzB0I11!OolcbtRgGHABkiA`{Px(~XR_IM=o z*na`XwilxVJ1{1h*UD%|A(OB_MS5vJDH$yn(Y*GJC>&2m=uM_Q4(8$$o$f=83Z*>z zH1w;`5oYWTfL)07>$v^T=eI|G8?sXLSn zQRMlWiiVb;E#w87$__ag5afkAT`cqpDkR5is(+}EvP{raZfKDSYNDp{BInPWE94|i z<%f>IpyWlrLpgZI8Tx?}{A5-K&+VZ>OsA$bZ{}MbWi?XGYu?NzPv{XCrc_gzH}hRj zXjK&Cv~pzR&HTUM^c<7yqkj^h@&M2fo zcs{9gDOp|bm2KhaQiXTv1l4;-N$H0a-e(bqC)PFlDjnIvM8de;2lcj&fEzpKT!T|Um_p*k@kOc zoc~p3r}=6nIYT>Wo~!W~DlMsIO=6>!~V#ilRRxtrVc?KY{M0 zl%Q!jp*Pf^{aqv;o1h9!4FuJ5CKZ0F%88GOJy)S)y7UUtN=cnORMI}uT;7sVwf6EO z=w5$hOLp;4O7AU=SM`P>Gd+I>)e+q_23f>55IvP5FY$2d0xF!@rv^LrROq%_IzrnK)hsr_z1sS9bC z)EP#)GZAd6X6e#}nqTkQ*jvm_+1Ps3w%W$-*A}AGyixm=ie0}_ulCc%Tptwc`cSV2 zbSkC32bGPv*7TeTz>D$iQHasg6=Mz5s>SH3!nGK^bS6rSnD#3%T)z@S`zeO&gBY$4 zV)W6elo)-L7=0h2P2VnEaYpC}s#!-$E~$0zHjxS%FS%yfjSD4mg5;dt?KBDhM72cU zt&x1~hkpBAPBYr6yKVn0ECeW(?xgbjt6uvFy#rKDb}6r_i1w;_DDOa2LwisQ?Lj3z zQwdZZKBpmeAE3V4XNrP9(@2Bi_2Zjm`D-oY{x%_h z&1|%gi&TzE$i>R5gw$Ror1DZo?SYWm10k2F1WL#_g&c4ki}7#tS6sT$8WSmkcLVZL&K zF$yWVaotMRDt|7g3=V1!DUU&s1%ct`y9q4Uv{TSzOD2m zn-G7P7)&et0CH!uXFX?L*d4k20A3X7`m6#ok1D?$R9*@^uhDZdJlxw5^Lt=gNRf9M zIFrE1>krQ(^yI^{ogUufa2tT=6GQC0sUSOn%qxLsDfy_%FzC79QD6iRL*8XJA z7O?0!37#w{H!lj$OZ1!u&v^8Yy#DZ93(xR;c$ywVW<-zWjRkcII#}K$c+P~U&lIv} zfT|?B9G<)Axe}fo^jr&1Cc5cR-WKI;#?w50@)9}ZcF@%b7_tJM&G3v!gpRBSXXK-} z=)b{((X!2t0c__*(nrlXJ&@`m@D4Khx$vBVsjScQ2+b=3bvCHHGI*-!Spd(i^jr;3 z6FoP=(;I_K-faw`=N@>r(ep4oJ#g<@Ni);ZvZ?2 z+|lF>h37VU#=^sGb$OHE8H)#{yy@`lfM>|J$n~$}B!QEP1=3!*vo{sD=JY0zCa~SNiJA(4wvT;dXH+WKbAEW+8_ePtv ze}J3(q#WH5RcimBOMHMCxBWvdF=QB?d`?mKw{o-(rgc&W^hKt52RC^qb^M(o#zaBL z>3ldcz3=`_iZMs-XyiN z)(p$pXcRwp)|$4Q%1kna|4%5|Y%kX-((rRIg6le~VU#fD)__?#z9O`acD)4h>tvN>Cq0&zAb7!qN z)+ML;xwF+*xa$>yoql90JU7>P7-@{r%ioYo71QT;}J_TC>32(OW4zxm|Go zpIrqpl6iw*Bw?8!1It73>(cQQ5ajk-b4#+?ervu+U0K|IYrdq_CM<5hHDA`7aSe;x zZ_P$+27ci)RwIGWco3CIq3y8FA=)gtEKPBbB)HwdG@};F4N26G4`?b$vXvFUykm{smEd2@&Iq5$``PzFD znm>|=mVQw2C!ySd;HQUF3Kn!VNJQL-yf)*f^HOV!Ixpp2&%6>*bY4}=izcS?s$yO# z9heui$*Cl~PI)h(cM!ZM%N!Q^oazWv&>Q%9u2Rsj4!P(B@;TP73-UIxRuQJ%ukPb9NDjNi@R5@eQ9G8fAHgsD8YRGxBb5%l**zEAPo zGOJTNxNjkH1QF%lXm606vsBm^Hs?*u@@v(c%#x$uo5*%4Vs|(|O@2-9ey}nCx)Aa& zEJa?(2K%0RF)==*adF{?sSxoJP+c;aWoH>hR*`I6m}eRw8$upsoCgqxnqx+p^@y8% zGTBmQaz07!;1Zlqk~>nf2;uDHe}H`e1ZOAzgD%0@$^VchvPQGyY-V738!(+@Jw-+j zmSlRLC*ucJ=`D>ZGR|+6IsWMG(9_E^^ltM;bPA)kVMRr!AnBJW8JmTM!N4(z~ zZ6F?i0^Nxw+)Yn3R0+YAe?;d$9_``%|AO}TchMb2?lsVmLU$M|AA!lWjl` zO|}6&G}#99&}19XLz8VlkAsl^IH1QNMgE&WkGoX`e+lR@PldJtJyd_pYy)~&>~z@M z#OVk?kH=NyHlW7~ifjXVXtE9Hp~*I&hbI3`pa%y4PiCd?aym-NUW@u#YC7_Zr{GWF zbfh!HbQIEP5X(h_P*-72N4}S|+C*5RLA2J4@IRwLUO)oVpuMQ|Th>`Ehmp(D6t_!) z+g*4$2bl%5spEhlo@2le58pQeGm&=xBj`qs0){y6z$&GqfFX_ohByis;wWHofgVl~83zz|0PL!7Hnfj*7~hB&pT>1%j#hUdKZgrk8Wjs}J} z8W`eeV2GoEA&v%yI2st@Xkdt=fgz3thBz7+;`|J?9u$rShBz7+;%H!qGaXW0BOMJ4 zaY~@dWzx~W5Jv+;91RR{W=9ANaWpW*(ZCQ#14A4Q3~@9t#5o;f>CMv7zz|0RLmUkZ zaWpW*(ZCSrD9T$S9Ssa|G%&=`zz|0RLmUkZaWpW*(ZCSrDM-CuIvN<_Xkdt=fgz3t zhBz7+;%H!qqk$og28K8q7~*JPh@*ia&LwDo7o-FI0~q2Q4-82jz6Elc#*4UG3K){S zsTKY(fg#C{xqT!|U`X=g48TwqCNL!ViLNk6y!ZCb1$56w@wVh-p zjGRhqPUYaMfg#D|RH|tV#5E01R*4vlFBC8&`R4H|#uQw2J`37nF&~v#s*X=!Nb(z3 ztN7f5qk$pG!(wrI zE~$Yb$z$bI6{>+D$>&I}!gB{Gfg#D`B&(VLh9sZomaBmw$>+OdmN-cPLz3TPN$CWJ zB=2|#BBc`;lKg?L7l9$kAF&b&7?OOL5ERq69M^VAV%8~D>4nuvRV00gG#S?jfg#D3 zyjvx^AJ;Vbcp`}gh6K)h2oWs>3<;e31p-g56@l{@3(7iqA-1$?zY7cr6uf{SO94Xy zHN7yOhd)9Ff%$HVFo7Wn$_Nt}5?G+a{9yt^5|j%J2`u~*^6L=BdW8|#JRkWvzs^F2 z&JP$UrPBd^k5iNh4LEsS5y!bY8?|%(0FKXj4RMknA)Xi_fr0V}QY%zR;6zkO;6zkO z;6zkO;7qqoG^!+!Cl{go1ga!(BB~^CBB~@XR9QIQY>Nm{C4pg*RnVxCz!F)B$5w?Z z3Dmi{YE((!YM0cglE6|GleZE?l?0YaJ%?*lN#I&JANeFuC4u8nC2TO$puiELN&+`1 zcuL2P7#fX0!21T$ISN(cw4q9zHdKkzhAMH6p-Lh|l>}0~%aPQ(3+fNv$a&s-CG;M= zomQo=Cc$G^li=$tUtvvx$FL?r^*TXeO@ha;Cc$qWV%&2u!UTV$rACM~31&#LBgC2n zHP$3Dk*e#b)T^;3!K>swP)>VbO@d2gKX_rF?SVCEqm1^zngru+n7=)+CT)}@BE*^m zua=XMGBOIIMDStx4E(0?60T|TOI!ROb(6)E zO%I$aG->;uG_SUp`*V@<4HE{S#|*2IcQ9ta#E*2KC%UIo8t zT!U+d!kR>gHL>Q%HHv>1`9ESFlo4W0tefRyijQwzx>yrym3MUrViId&-ReEXZ6WT; zu~xgJ#+q1bTvB6AtlM2uV@<5JE~&95)}7u*VBQI=iFKDtYOINMk2gsbq_HN}z1}BO zWQ{ek>fKO{HL=!vpHZP2YhrEi(l`@X6YF6whvEd*1RI2pC{1guiM7eA6|b=-)@GN~ zSQG0pm(*Aj>j{_CSQD$kB{kN>ddej=*2H?+B{kN>ddB-L)R@4USkEf0Ca@;fbKWAT zKY=x|Uh;A;rYBQlO{|x_dg9br6YCW(=d}dZ#Cp}sevrVLSg*O&*H{zlb+7I=8f#*` z;k^aAQdpA+u_o4I@;*4G@c^zGYhqQK6jh-Uta;{oC5gtGSo2M-Ta7ib7MK@fjgZ4H zfh<<7`I2r35h2#ZdR_jk@|G|~jWw}G`B+hfHL*tfu5k0_n?P%fPZy=JCe~P=R+z?` zSm*fKsaDlk6YE@`7DQuBtn+;A)CsJKb-u5kimb6F)&(x9u_ji5k8^{^#hO^-eVhyU zJjOku)&Yhs;bzNuoq!FPZb(#VqNT#8f#)rbxDmiu`Y2*9P>`BiFK*D19C3r86cH!*6O{CZPy}G%47NMqy zZ0Uxa?hC9zf{uG}3uIWk1K%-q9lEe^?p3LO#uZ!3iDXF`b(F>Baf(q$mXyh1+(lux zE3TG8vZRzvg+I&<8Y$)Oh!7@{C8dG^FwZb|1f*2zZt4$rf^aEU=swJys)dN?uor4XDwq`?ME1W4z8rMBUa!mD95p-tzaXPE}O zU4-D8kSW73LewAEjN`yHp)K+nuoSo^^sFj?k7T?}2|XwE*r&lYq32yvgKI)BNG+@e z*MwelLp8W2^pZ>BHk{y^&?}P58xewQLT7sJQnIY4EDBr`NhAML&(n(k0{IGD6WNNo zhGu(zr}*#T8c2dZ?a)f^Jd8V9%$vQt)L^LZX+o=9QUujJ(z*lNA&`bf*%DJG)GS0!0W6 z3O(w*4uYD-N?bD(FsMT&>S}~feiApojsgZb3K-<9MT5p1F1Gh^9>le;^BAuE90d$= z6fns712_X61q^Z&Fvw{J=L|;ygB%46a=1zCEJp!@oUI-3YTr@7AV&d%90d$=6fnq9 zz#vBfgB%46auhJgQNSRllZllAM*)Kz1q^aDFv!usAV&j(91RR|G%(1i!^rhp;b>rx z(;c;bQ#cwJCnIT{$`Xkd_|fkBQ2200oSCnIT{$`Xkd_|fkBQ2200oS} zQLgnk8W`kgV34DML5>CnIT{$`Xkd_|fkBQ2200oSXNgDE#=#h}J;?gX}JZ-a2=JAsht^auhJgQNSQa0fU^^V8N!N zfI*G|2046@<#(<`s$}Or=r!OdV34DLLC$f&AiKXG`72VQQAU`+Am@suipmK8mGV_->Xa~nK~Bw88B7-q6By*odmK+(*o7Y^ zFvwYOR8iSs0)w2|j}(;?er*J(h2vDZSeU>d=gQuS>Mtw>46-M&{4jw*b^;iro=|PI zgPKzyfk8HR!%@58_MJgZr4ljDg$WF@FVSIkn7|-=nqJd$fkF0VthfRO*)t1}$4Lqp zWY2vHY_-H@S3CrEI)OoUDI-i^kTWt-4+4XnQJS*C1O_>yHD!kh406V3DlJT4kmK%x z$I^TrsByZE8DRp0obxml4HFpTB!EF-0)w0cFepr5kTYI4c21bUAZLQ6TwsthshJfc zFvz+11;}F>ui}~}-^DdmU8pm#SyKfJa;EK8@%F2DhZ#>@Mp28VQA0~4Fvyvnj7B$& zFs^Bm2B71yhN&lBG%(019;_1Ns|2(kl|Tc7oY|9A;H9{>Q`-<0BqHd{NTM`$T0H-Q z@O=ouPq9<;w}S{17?e7kf+jja>Iep?+pQ?VMzWr?H3EZDM`?<4D)ps+L8+scBY~xW zL8&wO>LI)lx=$_EcPoI@p;M%m80t352y?G|>KuKO>kktclv?WE#DxhAO8u3lTwqXY z8DSLOB+T%sWh0QeX^>$lq)=+bqb%+u+*qVuK}E9?T$4yuukKk1B85`9=TudK+jvtG zNTD#1LaFm!P+@kMNTJjdkwU4p&!`f|;%XbISAGN6QAi<2A%&dxaYO5I6jI1hNFiq{ zs%|z&t#Il@O#B6k<`^?h!Bo}nYu2!DY4 z$kaRZGlM_;BdN7I%nA>}-B;>5W`X6{@TomO-N`#KuD6;7R|CCgF|)fV#;HqlQ}5k{ zMNoB=3flH}RWJ7Q~ zn1=~mN_|S_GBQlyQtH#18WSdPDK!CH3KO`LngA|^30z7|0GGl9E~O@bOX1~|<$0aU zv@n57sjuu-btnuIxRm-Eh7q_FCU7aW4Y(BM!*c3td{!oKNzE9kuk)F}1un5hNwojJ zA-hf(?%IG$sc&3`T1E*t@c?kr57qLX0XaGsktW%BhVY!Nd|hgUXN>FXoA8RvQna+Z z5&NeXBV86-8Wfv4i!+y8VX)VB!G`CX)Q0CSziRVgW5&%Yrs#STj7PpH3FGI6gX|Xp z%7#oALP6aK=a+BtiN=qdx|fyC5b`aWNH>t(2y2kr`4lsi;}K>unZmW89Pv3w z(bGW3wD3DkZSmQi175b;;-kF(U>x`LaS<|9FO?0^3qXHl(^Il;v+z3wLfwJz-fBxs zPs)QWF|j_}5)bC-TP=)chBq$JFppgmjz}6>;k*6 zq-9BxaY582sGx}CBqD+m6a@hl6%`Z}BS{ez6%`f50E&W&iWy%MuQ{W>1{Bo$Jg2Is zXZ-rRpBw+UpZm_|v$OToIaPJesi&)}db+FA(VsPPpOVI{fU9{0+{kNzyYPydnxf>2 z+RDK#m(fN!9?n%fAZA0SCFdg5Ke3^kRa^YKgB9_7qi&H+Ir+E|K5{PvCrS0kBd^ma24}KO*_psyTO~Pz_~V$^e_(Smz&)3>gCB~6O^L<917b3N`PL5pJJrFDQXTv_)xl2^4)OvU z?hi&a79T39=4!>@jlf6ABTpwfYoEoLY)=Tgm*A+WmL53Tp@Tm{$*S!5oOY?YfgDu! zQ<#Tj!{sg#ufw)X7FKRs$WW{zCB`_yABJJ=9y9}8ZX>TlF~;Gcb~^Gp$?!kc;jn%I zu{)Od$|{TPznHh}EU?F=26{yd()f#?CSN;`9bICBy5v@;9E znbpKHqA!x_9wruNE)?TG1lG1y9D65sxSw)RcqEQC_~rg3v% z?VH94-!A@}Zt-#;05OMc@?b|x>Z9ej}Z|lXk<;3FK2B~fh zvG{hI`0@a-_U(4xH?%gNJ$bKgjV&F*-?PxXCDGcw(%KKKO=xkSw8r~GI?3aATjVFk zN@8j4eyP0|ux{-EzqKx6+*UEpUO5Wq<)7L3E=RG^EiYKsXcXd`2eg~Jq~Xh0F{jPy zS*Je&vB{Y5Hgz=sHTHHtcIOuT3(TC4dsqY;c*|(4M=V1w7-#(=UkkoTo zCq5xpLA|3I$Z)UK@nkF?e;wOM!N`oZemvJoJpVwRrq?=`qfTQ~Bk^4?@$E*4=SDZk zVq+u`9~TyM1yBtv-zexApq?{%ulF6|yt8u4!Y19~I-MtNY{fm)ThD4<=7|;eeU6C`O28oeO^h4r2ChCybghb0j z=!*fT0zD2?xeE2M&H>YqW3`b;Sx5hY+34A?V8tIsYkS>yq1it_jyXOQ`ez`~1&NmB zkk*y})mGxm(#1BTST7cP$<3xVi(TdyyNktmw_b9wmNSu|xpzRgcMw|Dykw&OEvL?- z5u`5fq5<`h%Uc+nm1`HaUX4OysVFDrKU|)e=RgrtO;#u4eMtz6weCf(9uqZwpVj4% zbsF0%`*r!4EXUKq=)-uX1H%2;%Tn53J<$+<+}7WkQdxhm7)H_fQLcQ|7awp zB2no}2b_kS^N}-PDiSv{F&l~PNXRFRM+@In;;)vwt6UPaZ%Ebp_e&=C1xaj2|={TZv&mIS9>DU~<*lF1{2J zSFU=ya@E_FtKP0$^>*c|w<}k@UAgM*%2jVyu6nz2)!SVY#|Y@kRc}|Wdb|3ncZdzx z9T7q+ELW866MjZIjaQWIlQ_G_1+p~Gb?gxuxoKPy+Hy?`SNYPogtbqmfw-ca#w*J9 zDOxi#jaQWIQLK=cmm=l=f!4wCUbG06uw3xRi9rDDv-Bagm_iKp49?*Azo{CvZxo9Yt3%YF6aUA z$?aW)YzAq-8zlR(>V2WhuVsDR-|!~?hezapB3UJ zRPG6LAPn(Zvpe#5I1_PCz;^>IE-)_3*BB@uo1RA8S@_O89XVM$F#<%?A8G?~vIipU z>MvEKLy-ME0*v=dPKO9r^>CdI2avLDzQ`u)3#4P}B>O9tdywTu+J3nM=yEKCG<0<} zr0g<7{liQHJIYBv6-Eyr;kYR@e8;+rTJ>Y$OEwg#<*I#LZhMT4D?3SG!Ls(T?B z)em7t^<$TLC17>Op`qUQpbyhFBNm~)OtM<3sNWMnxI@QF>juqGEn9I*7OhrkRm1}| zUJ86W+a1Jq-I8U%3u)tV^vo?;4m^uk`ra*B0sISs8>%BS+>%wm^XbJ#qggO_xs8^4owPBbH;=E!hNoJ?$Bx^)~}As0JRT^|t`?(qL%J%j9m! zR^Xm2KlTHSafeWBK3t*qa*X|D#TZDcH)OB;m0`uWTLJZb1s-e%6AF$MI*lQkb~V&O z)vSG52>g$@%xL6>V>LV)I>Jpn;D~SKE{4gry90r7+^+a`-32t#3O$L6!g=Y?N4b1n z-f=rXV!3@0ROOC`uIhwBbt%U0+Q#4KFg7y6-{OqO1ZWW-&L@9+v#P!n#+ z*B{8J5ayLf>3EI`;R=o1G@hu!l?$Q9anGhDZL}p=e(yNa{X-m83NURuIz$@_X3xUjQzkjtQUgsAmw^XKvN13Qmx80VaqiO3}i`FQc2VX$Bi={CZOQWW?R%7Zyx_1!w4H zC%^(f2@7-*g)Q%S#7bQbx7uMcq}{qa$*tw$R+BTvqVX$qU2yR#-LiPFBFTf5$sXL0 zUzWjlNJwj+Vo9#F+uvKkJgvI(P{dC$sFlcO$izhyanPCL`cAoEGpE!nl1Ed4=4lt zHH6mzmhQnBrXE0%jP>i8{|(i|_zi@A0b0!`yrHcvdWC(om6l|8z|T_0<9w%KkxW!Y z(j1bqFHp0t^%?dMbqvDSiZNV`zwM9?YT(E5>*P3o!#KXn77?cJ*uZxL2$O*Pj%ZvW zEKrTmF*`^*`$48-_C4WJz_JL=yV|qgn8)2Nv}eB)egvqEK1_3d2IPuK_7Ex0Ch78( zqQMj1LbIK)YR|y(UOGQtmIkV>Rqr^|3KY#g4jQdtcA=u(V~Jq5Mhk%|)^Zfk_%7f| zaYSQvN`>@(6ZJF7K1prq{-%Qe1a3Y4OhmVtVjpzCgtM#)zEubpDn;o8WL5|n+6caY zcnzCuD+X-_ZY^C@rReUb!1z7#r%Gs?pcH*Pguf=3qWuScwh}*25I=h$PkVZzcv=Tc zPe(|_k~trl+U~0buLst4Un6$!2Zr5m@<4nD%!19`_hZJ`)w0HC z`F1~)V)w&hcXMda?rmas4H4|tXgrX%TVtO|kBSLbLaOb4Oz_LVWjhjfKO>nACXd?g zU4koswcXE(-Q$2^_sNX+Nsgk;^WMR8#>nRT0W?!ia(Em+jy%nj5zZJe^%YhHTThm; z{97VUa!(Ohiukskjj7Bifqenn%pQj`zd&3N);%y<&Iscm)t;Otcs+3CaisScyp0?G zPARi69o0v~>7w!>i^vf%UGR^<9N*87`kQZsA2skpyLy&$7*2+JU=$Jh$*aK$F9+4Kx#z0-iYrDj&0^+i@$keggA+ahuz)E8rK%aN$ z>mXJlaeG1BC@aV0v^CBsFH5bbvQ3!;YJ3f_{*=$>vGTd27@*qsEbA_a;(30MK9?Z9 zjl5R9<52uUYX1tDLHSB5kMsf}=e`!$Qy}{28-b$%g>&BuOmOZyasGTrbpQ_vegaqr z@Oz(gi{Odo++k7qokfImM+DdJt>gEH)Zct5{D{C09YZA-@QR?)e1#F{IEG!}+$LXJ zVwd3-S-7MEZQ)#|z+nR6PnN)I1cGzf0$&G|Pk9Ls-gd5H5Z`+r=iWZJTHMeNWILA! z?_lKVK(=?uw$p$$+d4>Xyd=)Rb`rD#NVBclHsq=}re21=xcL0lHE=d8fl+?PEZ3^2oehgTD%5Pzi&T$n36#3AyUWI66BR@#zNRa+So(|F+sl7=*9h7-e zc@=6Bu6Z}Pz`2dxKS{Dm` z7MN#+OQgbgfST8QfP0Yer-OF61noNt#`pq`R;#rI{TUTlcZ0xo0>PXc1@;5vr<^}S zsjYaKG2*f40Oo%X9P9Zp*(xzvhddpVha@I10&C(tES2#dG!kc-6c+mrvET^tn?=(cc*U@QV+h;nUOIPI6^L)wS#$hgP-J ziW{8TsZTh2jN6JAxmhayF&?r&o!>HA|Hc=DMV4i)M_%jM+-|JIrtBl&iuXWp++{>u zH4r3Sh6;}0uQh&Gs*z%okX<3y(YwgP?qXoBDtNiQow}HZ>q6Z)8?O4qvTlRMoB}j1 z7u6R^E&GtyO0KFe68s%&-QNm@7u(d04f2gyBDg1T**?TfH+_RNeHk)a<2TeBrHV~J zG=$gh+p9q|q$o|%fPVNx?CwOpEoB?{qBN$%b=SBiQM#n`B-#u(OR zx}D8oxZ~*zY7RvmJGMeHm&q2{EYVPs`&%ZG9fDl1bs|^prO~=_8;wpr$S#&7g1492 zDSF@hyGGL@$>{RQ$`$$5nENvBRDE%HmuPa30d8t-) zPvf=P3yuZm#ah)PjaO^$Bo+scN@Fx$Cl)U?ZhIUWEoAwgX^r6kf30m?$R6sI#*4L; zJJ?|FwAPS?oL#>wtMWbuypQx#$Qki7EU(^zKHCD5;`JfADs3l>>ijnH=A!n_dy%-7 ziJeG1h(y^YsMUM~q>e}85E7k`=;EMfYZ~Bd4zu%-c(e|QQY6kAg2cB_T!{o4~TSP_f z;_xA}x!c1}Of*6wIt=nHlotaP0@buZqAL?!kr+Ywe#pBV4OC`jAT=DRn$h^01EKy@ zN1|B2e2ET&g8D73uqg~}gS;!C(zziLceA2-kk)hsdIhMa9}+(>QHMnP;gGMT{8XSR zKs8g5xR!}?khqKT{giW-^#rq*Bk?X1tC9GPaw`+&-40Y%&eQ`))jW=`Mkgc;<<<8U zU!esks87pNqs`B+6DmT5~JVOrV-gNL{POjb`@uNGxFD2og6^?q$KeXauQVO!0|{nmE3;L8w2aiy-)>8R#s7 z*E*s1D-c)6;I&?GgOh;eBHM;Ej=Ft-t9e;*%lD`Y6{xLglTk-!?(}mZgq_bvVigi) z`yj2k7U(XZnl(tg$;91AghoLA1?Ag-S^?GULZSx~`;e$Z0-v(XY_u*{+8&YCCnCQq zuK{-a2AUA6U1^)G5_cj|RtJ@u29Q4mRO2D>6%(aM6pVy?3gzv9 zdIHt-Kw>Bp1Cf}BgnX)bX?y8+=u@`$P1>z-wD2F~oePc5?;^1QiLx!M>Mx+(tRad+ z;Y%j+kZ5%>5=BUiL85FQ725!HZYUhHT#3Z*NR;hk(VKv}jY8rMB&IO&AQI;zQFe&(CxKQl`voNK zW#TO)_EPTU0(}hh6|=uXqTo~{enX-s67uPKZ5Y>Ae#FQGWpyB}^9JCdke1c4^md>r zEc7fA=QFVniL065mc4f{@fi}2Gw~x5^+u!UOcwnMs25O8I*ySum}rE=V#?Q2UJP_C zv)dr?AQOD)_^Xt254oD7fetczC=$(1L*i5a&BCd_0Ja!qH;b1R6rULVaRNk*_ zaJTstIAb^EsYIz*KO9mcd|}M0d;>!DrJ9B;+?zgHS($toAjZp@3w^aTtMXH-h3%E1 zHsUm>o$0G>^wpYKm9O(eQ_tQeYGbH&9o0CU;XTe`5o%k(+Oq8@M6K6PI73ZhPQFY% zLe3)Q^k{{gLYX{;oTbPSn{rA_Ev{90HX9pfH%AuAurUY8%8jgQlHFahm-*Rp-^UQY zbf#5#2}@72$BWtus`W-P#tF|nUoFF`{G%n*X4+FkZ5a)_nFZ$=Q)_WDt!&a7Ip@jL zD&!1CPK@{dJn7ehD8J8Ij)eC~Ev0OXkMYNNFTf;g))Hv}

    hQuX=u_Zxy5BQL6V*7k4z(AUqSdJk@MGe}hLx*c&>K)*poT|0Exay|Loft<{@ zaFSQcFGX{ivS_%X2+1sYbJ6v9sPZ;+n5u`X)Vklcq3VHC|SdjQ>7$Jb;sW=knnN)oQG)1R3@K5 zmab?jE7}K`kBUxbMXC;FJOibI!$6JISk|~iv8G!5AqL+;m?xDjxeTRIppoLeed<=>&!bvO)iB+w5s&<(}{O0c&U0rn@9S@lDN;|XO_{V?HefQ9lP(<2Nu!zIr# zJxbv_5H^v%`g{l4Yr0Zt^Y-V$j>ntb12}XX2I%!j%tRu72!f(*Kog*jPqDh5CLd8W zl?UY=(0T#p=1P-C*yL_x;dda6UH(vAN}yy#i=PS)4TjQSjO@0x7gJYrq_050SfOT+^&ic%_5srE?XWnYZ=YW#hQKKmHDS#ppz zQcQ=&W9@?FqbL0Ih_HOj7gPsnz8_Tf|+L^;LQ=P?To8w0mv=jLi zZ?u3eZ*S9WHJ7$-W$kFIh1B*q5!xyf^eIr5+(Tck#=tITg5OrlL|eIP3O(wE8bOJz`%xRAX}dL=q(1c1V+hos8OpF zOV#R?Oa1B~Da| z+S~Bg9nFtM5gmgQB?eQF*Kj(7oAKAEcN`^7mSEudOnkgqaF=EG;}4O@RM*n@GnHZn z53$>z$5%M$O3#!^cOfsIB@aO92>$TuGJR5c44MTzsr;2@HSUk9obYaBDJ3tZE6if$ z^%Y0qkTV8n^};61=_vk%oCt3FEo{l0P9`VDoQs)Lt*Pc5!Jtssi8-B(j!T{6m{VhN zEaWs{>ne>~kYgyh4f78%!Rm@RgKdq@OpGTlL645^_#FdOV+c!Noona!gx!wpT;s^j zHO^}2RXJ<$-OkyF@Al3;`0n7y&NYtgT;sfgoN7mQu5o1N8s`9Vx;XqPzqKPf*Eq6s zjUzkPII?q%BRkhPvU80iJJ&d}bB!ZA*Er|Go^H+!mqXtJJ&cpfnKm2y>pH8 z79zFRa`etMj^4S((L2{T7eaHN<>;Mj9KCamqj#=x);Mj9KCamqj#=xo`P(@ z<>;MjoL7MU1)^Zq_O9jd{P~{cEW-rpH85eod#EvVn+o2{LiTnrE)*}%pitx_9K=VHoR2Ak1HtxAk3&LHh^0LIboP=Hmv=NhZW$&g+~J z8o6Q4+?L?7I&W*goJU}vBNZCO!upX4jWWafkqV7+!}^g5jl3{#ad8Lh z9xe>?2PyYhjpAYbNQKrc4eLiLG%644M=CVcE5e-Lxx+N-XSw>3irI8bKT8Z>2db^{}7Cl~(%~6+APrevt=tW62Zr|gc#=XL$?t0N9{k0x# z%T4{V+qUMvYXKZ}EAZV=%DO|C-L{8h_r-T3Ppx)r8S3Bwn4c_6xT zkdgK}4}++yEeg#>fa>W7EO20ShvD_~3cH?u+@hXdVS7)ZeJqv9KTcG(;P34TIJi(C zp9hAj$8i3Ntb(Z%FkOtX{=A7;U3Q0RE&d8G0%uhguR0bU#zC%=SmLQgtb34RouA-u zEJ}?{)H{gvUWlyxGB$GzFIKK1E z6~%j~xJoO&Ma97mSJrXRWxt1B6`F1ULTEw0AjMaVvetx9~mNUQg2)fcHc z1S>YEZNc9zWM7<69ilrQd8J=cai|#aD~pz^2N=7VN*ZQSPQU9-#m^Us;xnaqE98|v zP35yhw+HdQTHslVhjAUS)soi@oTdz&gqQri664qMhZ%#-{TL|>Tm z-xb7vR}j{JR}g=xzpo&grNWy2(7nPo#OCiSv`xp-eHzUSbt0l)sfY~W1WUpA~l+Fv#} z2)J1`_%7;Y!yxGif7y^L@%5Jttp)kZhNA@e%LZMGzigN$vS8Vefm##G1~%a@8+3Dt zWrOBHV%czt7{g^l9a7m0Ow{G}R#BG@m}LV4;4d56qASg^!S_oq8#MBl4I25&295k> zgGTCc(^Io-I79Sii{4V|$rnQlz53vnSvFiNdN+w4Ij{9-TW;!?zifC;3hb2v zJY=MRzijwegnTnlo?>waeV$Y!A)3DqlBk;jkUf^3>19JR;HcXi-wma#SvFKlc6WRy zmJI_X>v(+YRwf{&TVV>7Fnm#$N1s_X@G$t_Un%ItgkCVXA7Sklskt7NxqK0B4Qv-s-UXn}!V7GHfEZERp+7GHfEEi^EmRl(>s zHLx`6wtT>529{^F#at^IH?Sg$ufB~ItC#Q(&-iBXVW4QKdR<`0tffr>TNsaOvcAKm zhG;7TyJzv$x6ulpc_Uww<0 zdCiovQ?hcgTEpAB^uabgi?6G9Dfe(OYTd!5wOV{Q1_tTSeAE#I4tf$K9-N_Ru-J7SQ+Qg zA0wNqh(c}|D2L%REGVV+DXh+_&yjK^G~(FdvjaxT^Qf*=k)GVM2mm)8sdqbF2jFHU z^)?!?0_~+Y<)Eun@n(Wz));c;;U|gz+cjGI*mu^bTpV-iBV1%u@8IItCOB4yA3m;! zAvX7Gu$yDeVwrbd+uXLnmS^hSm|b-iBq46wV4H{Ftq`|uuseVaJQ_pXZNctHHE!Dw zb`b>2=C%!X^-)Z&u4eKIB*QK1ZHOB4_A@2TQ*A<8yyFY}u`-44H z%dz`Ih`T@7!!*Y34&Yk|4@gMFfwWA}&9W5g$EjNKnX-2K5Gq4lx*Lx{US z*rT)@yFY}u`-45EOxnlp4>Lmla`uusC$xT%4!pZ9CRR?nKlerVfSq)JNiva>SoZwxR=>x{)QZnQ1@ z=FG(W+i7*^sPMy%$3{tKl6?_ortl zdJ&7>iHEguQq@K8WYI?A|6MH5P~6{4k~S3Y?_n~J&fiO>N-OtCE8@%+NlFwRU|1WH zBvs_W@# zeWhq7$C;&n;9?TS%qKCz-wUaINc2u!oJ_)>N8MaV09 z80iyHL-9@|iuU5`9H64Nkhm6!lCO~n&D?skT2u0iPOesKiWE9;ThI643 z#xs;F{=~++kp6;mgbwFI3Fq6$)8Sks;rf|a!g-ZP|?4T_zx4GB9T1^g^PTI}a7*;A=Ecd?ss)1D#DJ zPSKVzQH{j?NbpmxP9YP9oVMp)F5ofmdwHm&{1}b!Z*k$LoQSF#_nWDv<2s{O|bZ9Q4$-fbbU6-?1qnU^l zz4`>|wVXs;)$9>Kbwb%@{ObvEvvo*>M_l8MyvB{sgi0xYH~GtH>siXe?I+eYxLWiY z@=k?z)oN&LV$Q#jvl2O0d=EqW4d91_R{Q|*A>bw$Ns4SJcjJ)4&)cmLXX^=ck(txf ztI=*u@1v~I#Sn5%6Zs!=nuwXxM1na@BxOz$Ntx3`{%KAVkvUE3?8Hn)BE9ccW-=1# z%cMUUiS*kJl$eY}{x%tj{B1H4`P*b9a@<}N4<;j#<2CjtBayn-Mea{VB15&@pNvF? zY3xr%BEz-5KN*RfsOA1-Byy6*{$wOFLhJjJk;o`5_a`HfF$bi5e=-so`@P2gWQ5-P z^9oKzSp0uXM&3cDKN(pJCD!2=qD+B^x{#TSM5e`%6?RuZIp#)VJ%Q@Wo>cW^PpbN| zCslpfld8V#NmXC(No8|Ss%Ty|^ieLKH(b^40K!=HWlyU5vL{u2*^{ci>`7IB01AXG z`;S&AS3C&%Hut28mR^A*=A-y-AbV0pTTZ~(5aKU2(bn{m4B+*VXoW_Yc~t>batOg> zImA7wqHVM+7UG^%(Y6|8hPWqHv`VAg5ci~twqr+NPpT02q>8rJvcgb71yBc#;-NTE zM~zBDe9$S{iLt?+R3Sd*6s@Mm*pn*6F)CWaz+$}`;+|B|E_8r9|l3*X_X_7X02h7VK{bkddH!)mW5B@ zp`07;inb;zmiQv1tntYF5wip-W>03Z6@D>$3X5^>lSixVX|#GLV8dCKeL9`}h+wj1 zPZ!T;VbsF=7S0f`vbGT)*R{`Fj5_cLcHW&Z*Rd&!Losg@ddRUE+tGw$y74&BNAo%6XqmpzMSwYoCmb>J%A0TU=mFuc2Y)SI3dRPBSJF6 z2~&!gerpplc;hUV1g=(2z;unCGe^8B*6cY zEAK;?#FfT#0Ryg#Aq=>(m@weVYlHz;)I7j|DJ47g&= z2Mo9p2lV!PC?0TSH1d+Tavh=1mAk1Q$^U1rd<)?}aV7m+aHV^ivdSYVTx7;xiE z!hjpM5(eDZK^Sl&d_G_>j+6r?xY3=mfE(u!2HbdvFyO|UfZi6wFo_#E7XSw1$T5UI zHzosk2cZ8?3^|rCV8|_m0Yml@1`PR*FknbW zoaK@jaw1@YA=4-e7;-sbz>pUS1BQGJ=q*ANlNi!+31GmGv4lQD<^XtnuKAxBvJJw2 zV#r&_FDP%ItbO=PI@7pIVM}nPX+#(>q!nQD=&>KIwn85!v7-l6EWF4S`;Ac$uwyy} z9-oO%V#ji3@{_xyGuSawkr{h(l(hzeOB(p>7|BV=USw%@oLqzwUjb@%jN+u^4?wcx zRGz?^UIYMkj3zh=fWyaW1lS>7pJ>J+%85ydE0dB@P!y`TGAX%{kW|sq=Lty_4ZkKN zRkU)|#ek%WmYzmPs%Us2A*rI3cN20j(b6vgK^0dfC4W#xs<<*KX?h7Dsp86{WHceE z;>x7t0zhvBLMl{oWm57u@`Ng`OiF$toQv16();K#=r4mlDd8q2C9X_Lj)9OAaubsh zS0*J>kzcSPOIZuD4OLv3lw6N|p^7WBkcS9K6%F?Q3RN^L+=5n5K!*xdT$z--3l*zy zKLj%H)!nnJHA6hO8v2ECWoU z%1wX?syt5MQ{_DZpDMot{4cqZe;KOeu%dhPB*K6zHxmY2d6F>TN`uP*1FrNS47hR{ zVZfE!2?MU|2260}UCIKk93c$2(tSB#z?D&eUKL`R#FZP7m&BFV2z{=6PW>^^|0k}r zyyBm^ay0S_3iEI^ykQDg&Ov?>SFRxpxUvy2nJawjAsx2?u?n|9a3ci)SH7UY zI{-lvS0Y!EDEQ<)qlXppWJiIr8bk1Ub_!Q&k(I=iNq|XQnGcxY%0>WAN@Q5Uf+l%X zkyDO7o}XhC0XOol0t~p(k1*iIB*K6jcM}HO_!nWojU$8sH~Opq47f1?Fu{#^lm*eaiFkr|`!hj)H111=S46E$j?-3{qsq@*-uu z3qf8ZpB;lZDT%E1*>Ow}O0)pf>^PQ_k}iN`hg?Y=Bi3xIck z`j~BmvY2%q<+wZ&$|kx&&@3w?Gn7XJjkQ8DOL-HhU{o_)-HscMgo=w0dFN)>#EEOD zgjEy~k|P>+1Qd>FSQu%BTMQaPg&YZ$v&7L*!LkN|BNT813CU%^ITUzfAP|m(YN&l3 zGx^Ewj7Go_^22MctUDp-nxDdvw~&?7I}SDB$WMSt97($cuKOG*Bk(zLG=a~Ni2!;w z@((0g3SkmSo+b=PQvX)KfFx}R1Cp#G3`nw%Fd)f~gaJv8S_2r6WDH<}Bxh3=kmOpz zfF!R2ddr$YpQjj2lB~6W0Z9fD`XreO;BBLRf+TlSo*>Edf_##EF32ZIXdOthw-`Tv z;6Y9qNHj@0AU}yDLkI(sOaM$K$pN&^t1?L>nF|#xisK*{1p!GmQsC7 z!(D_VBuHJkvfhDUSmP9ugx9B#q!ciTB%J{hBpDCDX^0FYW*Xv;BXW|_NAMC>5sVzK z5eB4C8vp}Rln@4_m_Znj;ugYy6i*Qbq)5LFFd#)GV1g9ADGNw3jxZp_T0n119Qpw% zK49^H6b)|&^hwbkz*|B61S!s@JVA=91^J}dBFHDj%RmLSEtGWxe@Ub`g8U>>WNZWs zNKs74`G+1kIsq1Lg9SzCz9eGQBHt=J06|v@0%FXiz~iO+Bw}38On!3rX=0ERD_Se- zE(oSINg>AD$VwVLeg;e;M(!PO-yc1C5%|OyL*S1d7XTzt;}*hz8s88G)abkkFrdar z!hjkt5(d=xoiLzA;hlg1HKq^-)VK^VL5*7}3#joFVL**P0KF=NEr}Z4?g9*`F`Lk* z#x(%m80sge@h0U7YWzo#PmQd*Df6k(7N}rZOJ!BHN}ut!;7W`}`nr3!#Wt?J zZT4x=9hF#p0W~d-;>6=bK+>Wo&sB2>K#N{-;sW5rqc=g~YDnM3sKft>CM;J&wz5WY zBrI1$ek3GEw6y3RKypOGzJ%n6R=$#u9MRGz2+0u*KO`hav~ufv0m%_9Jr)og3Cq=x zv6PV`VYwQzn2;O^hdHa*0q8}Fq0iwX9OJ~}PZlRf!u6?AeIMXlE8KwYo(SO8P#>2+ z!ZOuZO*uFcmZ`?Wg2q{4nQFWtXsi{M3nD)P73{B2)~-s!k#I>7q88r*n>g_Zm$Hqc z2+0u*hX4vkG%Os0)<>Zyg(KmXEHMEpSh_%P4h7^$xE%%8P~dS>Dd9-C3o{>NCO^3! zYmSf~tJ*8;IS3vsO5wNEnc$)dPS5Nd^-JBzclBAj!9c0ZB3*1Pn-W3SmH!^8phiSxH$yk_QL_l6(*7 z9bl&iBx$o1Fd)e!LZ2iT19+Jw$Vrf759JAxd?v^ziTe;`K1qs!3Tmrxg}Yq}N$QZF zM3NbV0ZA?dOeRSUTE7ronM9IRP_YWfKyV`k0ZE>rz*_-95=lO0CO^4ffS4FaNRYjq zl=TY)d!d^&kd!=}LXzHqNhBE#m>|g_08Tt)ATbjUe;kpsi#~$avWj5jI7k?fqUj@m z0V#SB2Bf&0Fd)TagaIkuBMeAUz6~%S#UQ{0DMnKkkYXWWK#C^-y=@3Y5-AR|ctDB{ zj{^FnI3B?Jg8B(ktfV|aiu(llqq{x2^HU%R`1z|vno`jru z=#gV6U}0t{`k!6RWs4p?CL-S|tbyP`3IbxRqQIL1K@u^xGLxU&t7?Q8Bt@)?vUWr8 zaq|>n{DiEW-f^hO=#jl0H3g$bJHP}nP9^Y(aXx`RdfdcPyzrr^@fcx1jp*Zm0X2pb z2Gp2C7*OL2!hjl$o&XG}(Sjm)Qrd}_22`?3aei|>HkHIVKsjR0VSk*EmfCrJ46u|n=p(YuWgngBO zi2$BV;0JI%fgixtEEVwW5yBv3*}DOQkW~RDLe`(MAY_vWgOJ?;=xu5N{UBtYvUm`( zLxg_Fa`!-=uZ>THteiP~aePw9PGBAn!laN*L7ooTQq4Jr>*ij{x)6fLTBU^SUSuVO z>}|lLkXg^8dH;YdBJe|Y8i60OTL6+m_9kHvvVs=?gOJq#CPH=$WkJYJCk#UND4h9jS!CTb$a54B0Is4`5vV|6lw zG7nOlIIdknNGjnG0l?b{d5536i-Wk>UAyW%4H&4U!<5yRMIG|MZ>)kEgL*-0X_>t<+L#c17zUGJj8lJVE}R2HZji_eq;w(Pjwx@16#@ z9zBE4t8zby$N-?3yCpLIo(3NX^7l0OLC`<%Y0xCXT0A`M8%2GY!Da;iunhsX2mAl_ zHU!P!f!T)O5R%xK3*T8P0|CmGFS8ASY=owFFN;GKbz9&&OLeB6d@=aQPTGc`R`iY& zJM5)GvPm{*%8U&Q$D(tMo4M9nS%EJGusdhLS_GR8-fwY zZD_V3Xyk80(5D_IgsIyQcxD>{{aC*1nQaI(jCf`n0u5uH*@i&FOwVjXpkc0Owjt2a z^UO8`8WwtH8v+gEp4o;#!&1*|L!cpECWYA$wjt24!ZX_tEQ0+Qt~|31!NmeQda2tG zc&XbEcxD@d@d$`r(#!jVy;`N(2<+#XZ3wu3gk3Vg+nEn(d$n9@KH4+e5Zo-V)-&4> z%n;=|&ul|5U*HJOY(t>oD9>y|py3$LY(t>o1kY?kfQQS`?i4S#2<;}eA@IyL1nZ^U z|FI1L!(g@{&=IlBHUv5#|8pCHfhZ7lFGO3i;Q-x9Y(qd!NbUoEZkfhU`?#6LulYE~ zDi|@apH;64?A;y^wti4}YFAxoc$ltrT$B zK9@z-Y!nm;e+CoM*Y^?>LnOG{nm#6}k%SCUZoN63T|9UApN6Mg0Sm8BR+=x#43OkDqioFWjsz(9aqb z!idc<#r+hWmHtaQnuT|V_s|mY?ugd2!r!yTKQwZ~KM?&%HSU5CbuUB8eVGRRbuE%j z>e8bsqXEVgai^X#{&+_UppvfgAc8|)2D&{xrv4QFBHj~NXr1<5eeTXr<0 z4U9C`Tfo+Q=y~Pr9_*(gonGj*B+OKerJ=a@1ml=xq@~`!*j3p|+h6Xz+Yc~D{ft21 zNipvRP&7SPwGvq6&0y5?ln!)9Z#z4vp@B8t12m(Nskytil@0l@mp2AvPWOzopSOw~ zk#AtF*MaR8DDDwsmkhQFKLb|S-v&lwZxF;WqaoXFtlnWvGt=X0b|R)liI_@16`M+3 zPiR8!uXz+4@Gb_RMLUs9Xi-jpr$YS^V642*kkFqR#Sa;e9? z2h%&5@RWO<*-*8C72Zp~H%^=CUsAl3(jg|2|3wKouCA3BOZuAgx zy!1ut69#~9O-#Q~wa;QtSl(kabGfP&=z4qDsaL2e0wdnf?9?mO6#`@448p6_BLXwM z;bhMW^_sw3tI-E2JR*IjI+%%egyClyqb<#FAG+RP9)z=uG~#u~71s3G2FASaXw=!} z%$MmkU?-hpq`6*0#%_**p7$ZcG1tICZ!7(qXJFhD%FH*g)XQg8=Nee98FZe36`qVU z3rr_fc{0$PZ(v7HMw$x@tnuz(s1_(ASnFH<^Yh*!!Mf~ zEG5m+4Y@V=mm@~7lO#8&6mo8Vu1m4k{wB}np$(-O zqQn~6mw#6hd-w&-YebV{4ZB%u@+gMr31nn^$S7Pb)M^q-U$1Jj(f54+ary=mDXS@8 zu9AM6nQpjVpLUS?FzoT=DhU|z4(9;guDDFFOX@Y9ITmF%8klZnEa?yN9qJRd{RIb= zgEIOy*^>UVisYef8HRsP3>h|$yThshL>PvfPC{)*On*nb<9O)&VPMRgLSp@CV5T>f zMgKA|*SnOSTDG2!dEQAZt8AW}vCE#9PG#G`xR*=l7+C5xA#`m$WS4uJ$-&rp~*79{F&%cPl$F%P5cVj-vb7wmvtE@(!@790SLASFx>OSM)y!EUq z&%i0(4U{%CaJsjFu#tf?y)S69XOnPt$=OXOjKhh;t`-mGdG}Daz#c4cfph?^O_OnJW($L%>dpq!HB%3IHorAW+nN>(WE5msMp@G9k9 zL`s#I@~f3Mp5s)h!8a>!C-s}#^wTL>tGpM9TNr$s^4=saGy0p9H;*G`xv_UMes%Z( zVZ@1#RLxN&4@n?{1dga&q@ym+e1$I~`p~NqJ@SST@b$VQow1o!x3Nb{nK3x*aFXj} zAJY)W05{4{uNEsf##fWqolRf4-iz$I8Y7M9iAonKh}o5A$?3z^6O~LoZ|P=WuJ;E? z(cM7LD`9wg*#FT7LDP9w`cbCdc+>d-DD~>I-+CHZxwn?A^@?iT^^h4@;Fnkxa`#IU7l^~6_W@_7c<45($+a>r z;YfC~{W{w#PrudvFwx$c)b`e|z4fW>ZSdRUh;^G$&E<&Y15eLiZ#S|+J%9CK z+#A>uc5O7$QY#}wyYI03!n`I`>37<Olmr*j^a(Akon~l_T%RLD@i#fdAYe!{P zpGiCKGpb^z4~(5#jLg{SLu2RtMq26(=Hc{!f#u%swE95cJ-wWOR<3>4GH~)lzAlFj*{G`pj$(nfSJM2}7=69wx z|8#2e&!jfLE7821%bxW+TOUi$`ORAyuajK6Z9cPzPJ7-yxry)Y3#skBnA+an)b?IV zv^Rm_eL2ydH2;c$x$MJzrld!%`Jhm9?NuX-Yp(gQ)H{Jw-q(z@T(1USHxQkc%SPX@ z*U}3w{Vn^2gcolcCDUp9Q@wb{NKL2xE8zt6~ZSUjM_C85%?^C}$uOr?2%#;O5hOyH=w|R{g&3|d{Ni_deYV%*G zHvdg(^WUa6|6OYH2NTW9+WY&U`6g`s2m1uHifI4Gu4(3b|5Ix7Kc_bTOKS7KCYl${ z97=8eH@|r+qh(jL_q+WD+bd5$V)L01J>dS4+TNe3?fsS7p5<_2$oZZ0u5$eOop97P zFxL}n90NU4)^*HL}P5cKX3QoERd`Lvi2Es8KR3tmo(@gqeq? z8>wMoEY;5XsdhH-?WAEDrlcH8J}}2prjeOr$%p1x$}-Y&?_$oVvQ4e#LQ9U3R#_Q2 zoO$Lte6@CyczQ#pCr;!#_>GK`amq_|D&I(rQw6C`HBNP^FxjalrldIKgF-9gCmsb& zot=m(SRZ$uOjuHsYDsabB_*krlqM{Zes7+zM6TAfFv_^%$m@|l#6efWK$JOrysSx0 zdP`@0u^)(5sm-@eZN4J4`N~A|!m~Ds=Ea(}$$_XcB_$9(FumK($V~70(DZJ5BQ?F- z!PHuz=Q16Qw94DfzVBr0?Pz7J5xS8*R%ei&ii^|rx%XH z9KCS#^qG0MsS0#|m2^MB*-UE+(@%2lNmw%?)tZs1)|{Mb%_*tYj7nJ3l6`$@sx_m1 zYjCu26@Qx36|G{>9qWv2?gwLBYV+e$o1c){{KQ1_KUk=6Qlj}S494U{Ux+nRj5VIe z7w@D`HL%bd!B|W)Fs>tay0H}l@2p-BPj?=rt)=NRoL>^Qo|$Uv%v4*?O0{)X!d5YE zcEVOM?(9UU#JF=3wu*6c61K|qfVsxFxRueJ6UuqcMA!sYo$D-Z;Ro`(RO1$;8h3uG zaTg?v6ILxu7$=v)7diU(i`=F&CeF3emzuJMRTmowRvpVD{u0NA5zTVbS328}h~sM0 z)ee8>i_f;wuhDtat@KsS9!RluU<9wNL`r@uj9T@1?UQ#@3U)bfywo|l%=hZDRIe^i z^=f&lS68HZb!Eb#TqgxbTQ$g)zR)p;3tOYUhiDH8-SM zb7QJCH>Fy0bE-ABB&?AueYYCrT<>3;kgQEuBMYH*2Ev*MZC~$9f)Pz}({FPom;14~ z-6&c5iql5Z9)5FRkvklHB{ib2R&6r2#=Op0`la9L@MRTtNv5}lht6FFX6Yrw-3De` z84t3q&CXA{`Fou`iRSN1G%uIKwxkB*ej_!5_yeiIc+d}qm66AJ&Q@nO>c#x;ai<0g zK|LjSGPQxHQXANj+Q8041E=7?O@G=*GriZy(Ps?A0{8}A8r$W(!S>?m&pFQ}+S{Gl z-k#Lh1B+5Ol@zk-=0@V_g-@JwOCL85c9I5f3QdIE@AXvar(iCqQCDjyv!ajIgLSG!MMS8z81e4F=XPAD+;f1>5n*K=t%i$HQ;?X?wz3cGO zPVt!}^Lq}jY7{qM{`(G>{KdBoK>7oR%j)7WJac~NaB*5Zm-QTQxKb?cK;!=Ha1~d4 z2S>$^9Il0mx3iv)9j;S~ALm5o6Nih2;@243PaV$Si^sD5&m7LKi_bqA>Ca^bTfBlg zU&zF-cr)AjQl?(TZ_$^pWFAz!f;N9G^M&H4SkE_d@-9A!>2KvsT0DStekbR#;_a;G zpqx~S%XuRDUIy*ram@cg#>nEn%>PkFmg2$8|BoEk#XacDPjXZh|Hbsr4lltJpTn5^ zB5W+KU?2V}Oo_|SCx@hu^w_luy(ME;BP*kjT>H&=4ZYbo606$@5#FO38=@!t7T%*8 z8>-W;)wnh`aAO62E9dVsu|fKWTv0#9s8HRcBXSQ{Y_OKZ!kkX}C^P&UMv&OCT9zAr z8eaIw3x5WaV#jG&VR$+`_fb527%_<*uVtm-#qiQc<>BQlH*76Dz|Y#@uh7dr>KOhE zeHa_A%XJS|uug+|h4~w9>;x^tt7JB@i4z%!#+k93ex$!EJ0a_4{gN6h+&dlU7Cnn` z!yK7ox9ZZ7uuY5B=+#Zka(jc0v9T@Mcv{ae@I zTJ9-?AN_$cP0C}9)T=1qeaL$7+LM@+@OYm@EMJ)$CA=72EigY)MdatsSYrcY9&e+F zH8U_%e&380ncwAd<@e24v4Niaz8Nbqu+SR-ipTt))8pQ;G_AR*3iFOD=xqzt4ko(O zVUw!mpb=Vy79(m%RvWm=gI^8nWL&)&eyHJn9l8Nmsi;o;g2i6~1=L*LXA;Un@5I$5 zYgwH4^s7t#$jc4ymzhX~d4s=Nu4R$1+{Au`mc>9}b(KzMf|F{6PUi|I)k=*#;iS4+ zqe9DV26xn|GPLXVp=IwqjAYb(9N$@L55BYcg&dj|Is-f@R3G$c3o|RJen3}bg-@iH z|JKM2x29(wX-Y)G&ETB+*bpQfBKkz5%y2KF&+bO$c;QvJGkR5hu90WCcd&^sUxu*J zmq>bQyt4&O%ZXI^vrIgT2dmU1N8btHdKZD)YO;a)H+D5e3i3Jt@0L(g6XyZ4Oign% z%lOXThtWVL9n6R_G}E10q#G5W)LPZZ4dXXl`E5w$%PorhnTdD2r~+4CXsBsAcPieP z(Ad=%8oCRORiUdJ=p{EXs3xwSx%F#0c|5i_clB*4wZdZ6%+*mG?3Lo+R&i<5E~)dL z!Fa2RrF4HK?GR^0*SLe8j2a>uDIeIt$IWCX0 zvePX!&!woG6Eihm+AeQRyUuf|UH%@Xx@v)>Q6-PlmK*8DFN%+1#QG}h;7gV@6gQ-_ zl5L)UA@4I@#+LYpY1$zkbH#+`u~&X090^!4#Ztes!&U%P&cytyHQy1e{-VNel;iT~^D6tGB+TslqVZ~vj4YJx!wp5y+%exk*;NtJ@jBE_#;+sLKZ$%?HKw2O3}8ee#+X8{H+~)`v!=8 z?;=mzS1XNuM=bUY6x{q(ZQmdX*C?RM0}1<%7nN&}sqL#1`<`bJ*f&Iqe9j_=OoUGq z`+lbaB7Bmdg4ci$;Sqwm0@3y`c`;Wh+Px2dCnJAmN8k3jV*9zs)3(nSL#`ke+s_re z3z)IhH`yEps?02hio|x2sI-6GxBWt~eF`vbUo5s?3{+W;B4o!UV&4r^fbGi!JxT=I zFBS9-5N*GbyjZOi?H`i`8O#{u{pSH;N$@#A5qRg2w{W_M63!)j*ZC z3ES6+$}21)%w8|Hf5alNeS;LS-b9fpv>m+IB=+SXi}qc`V}7?%wCyMSwLt#fgnhfk zz5&S7v3*_|8%Zqoy&!l6FztI$8ruz2xhP@ZK2iCTMZ~^W#lDVjY5QK2B13^HSJOVk z_HD6mA{7wZ{emtcLTuj=bUP4jf0>+)*ot<~9H6Xckw2~4vf9fr7qNNFsXA?WJ)1|| zr_j)rrwh(}8}-6+ed9_Gpvo-?%dn2UL0jm5yVO=j#>4QvdU2nnj zSOnJfks|AWU`aimPR84cRxCYQSq~w5OJ|>hQIDzJllRB6RtO?fIdE3&`(6@<8uV% z{)?ttRZV)q_6u!AyN}?nBl7ENeA_P++lM1h+rC5^o<%ISFBNaoz!*4;1oN?=;2e-7OaRJkQ#-6Nv%3X6z!+XRQ+)7I(VJKF$N9x#!8QmpGk z1w{5KLF0%J*&Tuw1JUwOcUZpHRBMTWD zVXy&19AbzQur!*BF2*D#ShB3kXmqh8V?k&KU1mmO>&DE;mIy{fHkYK7n3S}1Lu@A@ zE!*<7ZtG3F;3lL?TQ;Q)-DMM!(1vYjOTW@BB_yF6y7~V9=bZDtXJi>nN@(}@8D5?H zInQ~{b34yD@4Uq9a{}Lk$Rd2dB6__nMA+`Z^V`TD{eZ>nKbK(k$I|uJQA0!bx};x6 znwZrmR2%;iLv8h;D^nB**C10vrzBlKn$YP3rU%(%n$Uq}mn+ijF;)O(&z98FOaZei zB=s^b!i>xJ*OOv#9!B0(7^h2&$dgQA zux?3xovD5JlAEOd3aQONTd$<>UHPj8{yy0(mEG6-0j>gvdKQ=o?JWP`1kyi1qYn-v zQvE*>xgL=eBYYF$V~A|oj!1d&8SluJ41#l?vVFSDEs6!c5*Mt1&_DfUA-rZ#4#s@ESwt!ezwwiti!) z=!g9DMx?#1n=y%xpyt(0>rv9Yj8|vzqc>MS4l(N|w>Hfd!J^xi(HWucJ2u}mTL7k8 zmeCob?tA36t8c@yg|;u_?RItFtG7iG9H(^|mwXGy`M{NN3b;=G(5x=*n1pPAlIwf4z!z9IG$(pMkB976Y( z)3c=Rd+D|&`MTJrWIuxGXr%tKAoV3wkF+$Q`UBG4MK2&Net}<=O-nV>SMT16@=ur3 zS%T)+&ahLf!{D0Qnk3#yFENm2del(xDx-4qBXaRI`|-Dk zHOhQ1L)vTmy%w}As1RF)cZ9qoazAuk8!|ttgie{c z0q?+%qu?2kSnZRTP((IxpAW@Mp&W3OG{}5F_v=!(SdGI5#YA^g-bSDVbA-G=}KgSf*afBIo<$o{Y&^Glrb+wjt+>CMU+6&yW`W z#^fZK^FK%o?=RE+j4|hrIP*S}bC5YPj`bOn^DJ`;kW---P0mr~{4JN~LZ$n8l{pQ} zX)!q`k#i0m8wo%llRDeG`e{rjG@w3!tYt#iS3lp1oGJB~%xX*R-lVzEM9Sr?r&Mg>djc(m9~4V zsb6sgD^{6`7=#tiEe}a2QilDcs#0 zGCx0meI#`4NZ4!ZZp%uxM!r0D%2tIu`2NWV)5aRi+bA-R2b`&hF|`BnQBL;N7A4 z>OKrTxZ-+Q*bgrA;%Km?0RaKLh80-fR`?Jru;f~|1bQ|YqGR``iONCWFazIdaHP3Tb z^Ze2p!3wQLEt0w+x;4Q1TVE0Y!v^ni>jl89 zbAZ8o-^~TS)PV?j?{StD1h`()6Brs)gW}6Afs-WgRX!_J^-`0Sjg)2O_XWvoSDtq5 z-#H;&N)+d~L{SwG#kr+KvC5U$=UIt;eju^2!X(=@R$^a(_Kw89uvB7S6!eaDbtU%2 zrX47S#CS=mWDW$i(EB7s6}OUkPDZ)m80PxmjqL52|uzlK}VgDP@P{D z^x|eZfdSPgzXQB=X?8Uq9ne2QwLkeIy6Z5A}zY&r+lSnF!15n%ej zDUF1QA-w&rQEQ7^%Rnymt}(M_=cxA~mnW}v21eP|VBmFN=O(8mz-kUkMZiP2yIO&Q zWxLfETEL@Gn4HlSOzT|I^B#?X+XR!HrPtZzuYq3GRvssxr$Pb zJ}clYa!{q!70UySa&{>AOT_GXG>fW z4f*aTv9^~5Yecf8WN_p;<-McJHdv;8pXE|(tO+_{tkEQTQ*#X{!>OzJT|kAv2A7X%jWg%^0-_JGwGf!XSEyx>|^*(xevm3(Pcl}WzK zE||r&D2aFbi(SGa+>}^(0Fro*Tg$cK);smcdZlvX@>010(>9>i0Bpy=CD`wC=nP3~ z+8WBZ0s~qqL@AV8(4`C5#sDxa%pG%gF_SwEtN%X}mG-k;Z21QSHV0YM;D@KBH zw8gtEp~3!HO8&klSQ_kaFM|eitRB5si|n2y6tRVpT;Vz_Tyt+(DZ4LnUHE2Tr8PU3 zTeI_QE2mZjB4K4<$mo69Ifl4FnD8-&;d^NN;oezjWC($UiEQ=1XIo0Yq;N23@V?BvRY*jnpptBl(!nTnpr*MEf zstasexp!J((+UGslPAl4@8Q1-0&_PZ=U8=C<*N?SI_KIA5iC5?-FaGfz^>Dz<66yD zts6u_t(Vjhl|eGIavo$t%g*6ss&<;$Wts_bj*kszNQ{HZNlIVA_`^k}Mkd$&}z*bvCG@|}BB2AI=p%W6#lz9|BmwcOt3igr0Uph(_srFCo2zqZ-gdt1bip*_688G>c=j$mE1s&?E= z9M(FSfL~)~eG}6t^S)e$zo8%FG!A!np#*WE*9%3*rY6$S(e%`w-MPul@jbbTXkmOh zRhXK|kEBy0Q={oa(E6ahJ>46`Esd#c zerS5k^D@P~x%9pWF4cQpp*RYJM8>du$RC-S%;d62DJdCEXAm#PT?wGFfG7wVwR2Op zeqpXqOiv(%_0JS@6GPdwP1q(ZF>|&>+3~sQF`F0}8W}Top5$n(vo;!2AFf=l z!V7n>RCO${Je^VRibOlZYVShrQMEjxK3`EesD5jHLH#!`f-s`4N|cwW=l4a>H~>fIEKQnOZDTG8Fghu-59A>S0>b8q%#_h zsrM%UbvPCS3}tunPc8pM`KP1n4nP@?)<&c1rH^FPuaqa$-+d&4Fv9Sm?15w~oQ$e_ z%Maxp2>dE~J>O@%rVPq^Ei>r4nOaPA)Ct^RiI~i{5!tC}X)XIn|M({U#@~)2p zz^<`6{Or)T)vKY1y63it`e7&$jx~0Ub#|&R>`$oApu6wwkJu3NjUt`_(jw}Wvmz!; zAOtp&4RzI(8|o*x(7Pi&pFaYSE8kZG5=g3Vot06a+80rO56tT@fiR;R)m8scT^Lc* z8MTVbq*}^0gz8)Cc9$zP&Do#-O0F%pNu5jLsaCf{8u29Koz)E+d+RoKRmY;y*2e1U zO_*$qMGfH?NGw+Qb9(4w^9l7VXyD=b$aqcsE|S^Tko={}1@-NjNR9fBXGcmR>enPg zCe+DvG!Q9vo@^G$66$^UCH(s z28n{M`_ybAs(u4=e{63={UNAQhY5r}!Wz`O5^8rQiymttW2%i%-f=JtLhn=;U@{wH zwGHHlaBr;gaxTEjp+`@Q-2vo=YvUlq-@h%PzVE%F?x{Geo}R5NT9p5%`HcD@pj`-& zIR5^&j7lCxx1Xz3=Y2!Hgg2W0a^K<4wyBkgBOTG|#%}^G4^(8-$7TS))MX1f)fMUetXlEt0TB0NWW(>CmHDFjkF$p>uSp)Y!`@YyDI0(yqhKua z{sr3XRMkc?dgglT6h&pU3RTxnqm(?)$Sy0$tw@7((~=uf+zLy~!b)z)bJQ5h8#%v) z8nRfMo5bBBDUohaX|ZH{@jpQ_HiRw#L2Oc+B9IUvl>jGZK&!o^S9Nwm%2+-di8dY_ zo$OT07u1Txfm)G(9g{t5Rl&Ap3l-`-a6)Fcbo2;T`GQB)#!P1ixJR;P6L;mv=lO`b zqVmusF?Dl7ogbM{Ai*lK5TwX|y^UhJ(9a!-6{Z(RAPE52(j(tK3q* zv3_G6)Y{m`SJ!raU#(7zce00@GIv%tHnu`2cP3-twi?JyXh@2%Vg%LId68%rilVg* zk!ZAmeA!oB$I*`BPZdsA58$yP$54sQ=fC?C$IugTRkh-he(Cu}>q! zb{%CW6pAQaBUQoU(P%6l?d(!FWYl??;o)KR{>m*fU>CS38BQj%S#`?-te&p=jXj+J z2+;$b$!KlkIPp{0g|2sJF$t)RI;f|FYN~vaOkW?V+@~(e#KXy6wQ@myavnw#6mi`c zERx1Ol-$6=SWR4A9Eqw-M7=wrE~#3~PN7PM`I(1P(f%IwG~3H1?-^UQDN*;i>iRAUMzQu9W6-Y~KNbV1 z2h{Qmbs$EIVbR_N({B0Uc(ghmj@QJZH8Eg@w&if5GoGw_j7C*EY_w=J{#n%?X^Y3y ziVUZ&3JYE8Y46d*?&{sqP2pHA*Ars3Vq8K9v;XETR9=CR8XLQ$td#|w>eKTXsAC|2 zIQk3NT>sB}dRB!biA{c&@@5{!=!46VGztlt%XgSPh@+#YNC4%c4t8^3AKVH zz%U}1TYWpWGLY#jA{CETd^?v_>mq72qShrg?nnZ`n0GwdrFtW(;ZahG;5{DQ7~KR2 zS~H+>j2Z*QgvV4oqB^;RuZ5E}o#}WDT%hdvx`o`g+UnKccrZtHsJVnZ(Sse?F?BDj z&sT5DfKKBeY5u1ky)6P0qu!*j`uh?OjYaEDex|Gbz*raz*AZ8r4=vPHcUL!lAM_n> z!$56aBXKCPkIqrM{iFi>3Q1*<`si7e>yh}$EQ{_u>l>K3@EaB%sum_5mzHqGsngB{ zV#wY2?WSuZsx7hmBtW_-l1;`(;%x^Gg3(wNtUA_l0Cu+e{Cwswb|0wijH}g;j)BrT zI@Lr5ZR)e=soW(_gYUcV8GFDkXLoGSH?mNcv0j%{{{f?Dh`F#0N+A0E#Y^*-3{HnEM&=B?2r z3A6QNe0V%PIhxMv-6m4fT(+K+{4f4@Nd8ZRLYrXDVz!XVu?C{IhkwM<5F;qeq^JN$ zCdiU=qpCikb|o5XszuO-;~?HB`sh(xGwKh$$PrlMu#@UHM#rn8@oGr<#6=siieSoE zZAV?rrdazP8o9HPWVF5}-mN=@{7GDbtx`l?9-)B5P6u@^j)0SDs-ty%v6|Z0o+x<0 zP-?@5ODaDT#qV$r(JFh`--W5?rw8Zs6k%rsD4HTV}Y zWDmvpOaxk~t_EA0V1$IaG@`N*b&34Ne8wW!`vTTztU9_$TB4t+NU||nUmb0%iPwee zYT{MVZuM$eq8l7VNU&XjR+@`6bm9+30xXaSun|`tR$~dZZXwzoYp?5SsM}aqQ&(4u zTARQV*w4hHfJUVjR81zC)V~db5JqRT9shUNM1k|D$|lr%u^CT-c57;*yC-3_)O?%@bSP5Gj+RF{ptb9hYBHhT zw*bh+s5u$_LCu{ilj+8$`&?2}48{%VcsaZy+}I(yArf>8thUA5)TNkSf}LZkLh%@a zZNN@ui1#lVA}vE;!#<56KyPV1gp7gs`WGY57)%$F9``NZ%V#QPr(HV zs4UD08{4y?p=v0E%i{b~n;VgkJYS|hoRDBcq$>&)7gHmVR>(>0>@#)k;e_~MbiXha z;1CjRhAkEDO0^%c2raZ+P;&aYIn2x&p~cS)qhx?SqK-v1W_hmF91Q}-e7B@ag7xo|=JXZQ%7y}9xc$_XqE z{^lN~B+P-xArBwr0!~8wWYjNJJ=y@CZWw#^+l{bq&M#{S#jD8}urhnNO>K?UEEftai5c=<)OfZmUNB%%Hs-m_yLS={?CDB%Cr z1-y$DQU44W-dgY9Rtw4cZ(|vkM|OY+pwZ>8);H>7dr1SaaAQn;r!t{_cV9#mzM(Em zP@F?H~SgCTfzS2 zlp>Se>Z-~^>g5@*twzmfftr_ynnwfFd0~lERw@v^+zCwFM=Gt z26FiF{)7hW+(aG7x{gM2yr!Y10hGQeTqi06Gy$ZAU78qKfc5;RDw73yd<29BX9-+i zAcRLi2+x2J9=SEKNq2lsB3>Pbf@aSR*!A2J*|f2trle=cSVL{Jx<-hAzb=>Q-h`z* zKT)<4o{Y6HW6Hcw{u`TJVp56M$}ziWLV2&kgsKW%1i5%&Wf8lP9gvUFJ1Z}XKNd#{ z(hhs4lex~Ex*&tt(Hv}{)yeZzT}15)sf`H)z;kT^ZcOO+XtYkP09l_M!8QfB=~cfu z4;l8yUZ#tyd2=K?uC9Q&(b-v6W{#}Nyu<&-xXDaSE@hHRwr^_o{t$TjbXjP1Z2~(U z(qt06kHyB8{m$E=R;uea?oekhtj^Z0MphJm^@FPQ2cqGJj_zK~y+RWDd5-*!)(Jtv z{X!skzkdmL=R0JV%fZ{3Iz(ZukEZwLM$*=d_m7Zhu$v1ghpSKtX5oaysZwWW_Azx?B3F}(ekR(P{U-QSm;b(6lR%|Q z6H!f^aXKHpFa2M$E=!!AmUt)M8Cr_Y#_@u8HlLde_IYm~f!J*#-0Y>kb?ZUT<}p5Y zi*RX@m>&P%Ag0H?P>hm3BD5s_K<$M-M|-^s5%`Ouu!iE?K3tsW{7(IsY1h%#)PLlt zuANCS_^KJJ=N~aSp&FpKJ8{(@6#6ehG{1tuPd&SMXBNQOG;4WZvV|s69{w?q@`*B> zj=^-JgFi~|{=P&bbZ6|2I?gUcSH`K|`gsH>rmlbZzfzhG_LJCB5V8L@j{y1GNHT@HvctDXFIr|2<5HHCF*#razCe=Ma7gA$GU0t0uU|UV+_i zbnGZMUe9l9Qu!{cLa$(UO*GBrLGGpl2}q`S|!xJNvTthgL_!378(3*rx;~kY?}G1H$3cT72oZq)N`i1_ z|FhuxC1&sNeL1WIP7-zkCi#%i!*?VOIswXl#(WPm1;cj#4ETPDX;&64-*eXFdw14< zA)p{%X8pGFy}QiyXDsD#BzA^;f69EnR>JqoXdPn4e~wu$Q@{Nt@r2ZI2%ZkXCG`DK zWGfh!66_IuPqn2LJogh?!HeeC`o0dER+0GE5{?i5w0b@Y7rLwF=V3(Fz$LL8Q(R7V zUxvX$w33nWCnfCuMzd$_KL@+Bjx+nR%Uw19ub=c!$>wiy(hip|Q@ zQ;CBrfT=g;^0z)=7~iGKeAmXVGqh*4UKg!ivc`vdWR2l$I_(-;?&fSs>+Wp7F0)0x z%ytRxe(RGwm6YGAHa~TikvE>@7FU&5sBN6(S242+^%a@%>Ej8h}Ikq!q}sMNUjjMREG?`i58{0NXP0tIEvB1CG3D+8-j)O zyO^GXpQRG^fZWx=rl_)5epVyyBgDFS6kg!K=b&CA9W&=d8gUC`gx9x3omO65eimD* zPIez&Nc3*3-@XW5mT1VefRU}@TY;Pq7|3lbjrR)>znJjjtac49ipRp0d!0!fvXg*U zECHt)J$PuLXM)q=`cDT&!6~zl4Ioi;mg-}xScK6XI*M4Y!%G#<68*s%h|@xR7_tz7 zBSY*Q-mJ8fkcH4YT(c0kGZEIBFjIk*c*V{^?z{Q$(>aJE04_&{%P|_O(TeXMOBN&3 z2}t`1b2vgg2}RYCw)!>rTn<%HdASdND`P@0JmXgaKYhUpP-h&d9o%y=0{osxtQ)sx zaLpeLLby}__!j_w&zC?f8od7=fEQB7Lz&2PxPespNKG`hsc|C?;C=&pyl>%z7JtwhJeU(!|G)#M0ro^p zqUJuJ@CNM#vt6Cc;9LeStd49T>PSyIRW8EMDT7- zC?3Xbwz_KGR>WcUiUjDfjBi2dmybxEaQxy=BmaPmocN=ps?~{Tvd4A;*K|hZMR4g? z2lO#X4;%dhYs0;s#N`=V|CB+=PP&a8qo_GCt<2cGuPfudQ4f?LW&d_yQ?ixeo;3qH zSrHeo&j*@tZ`@8ix+#uBNhx0?ft)D`o&*K*htr))$dLqY(wrA^P`9zu=|BdPdq(m{ zmP_EMW^-O3!s%#LNpqeufAUy;FOAiKmS#WnItIWX&`ZMc}E4x8gi)OQ*lQ%+H-@%={ zFW`NvzlJ!+{V1GWeG<9P;j%wuJ}-D>qqyN0+l}gS#jBcE9ia>kpw=t1k#Ivb-blce zcN_}ceO4q{`Df}EagPTFVd!sPB!X)Rk!rkd7OuvvXkKOERV_3MJl6BMjwEZ{Qu#tB%>O+&B}&j1qq{lK=R2EnblE znyXed--}Ow98?F&ZQ1Rg#qS0CWp|d{p$?Wa&3})eYzwqebJd3Cs&I4Fvt`Z8dRN>V z`h~KOtB;l6z3i@vJI}hK^5Ak?|HaRH-s|W2^_Q&MTy-L}7|wMV>tQ^6*Xv?d8o?Yg($-C+?;0TVv|I zhI*WTYgJ{-9ifA`lU0f*_ID-5(f zdfZ8$M4C9Va6W6=H&<0^P!E>*Yp~|O;G<%Ip}A^3CU*)tJUgG2e~2IOFVpj>x@n0i zVZ8NtIG^YL*y3ePbJd`OKBvynC-I2|q?nH1XP=$j08psjLE6Y@aK?b7pMRKKB<`9|PxNAd^*F zeK;$>t7V$N*}gQ5kXJaT+n@KmgZ`W#vK9+^)FVBxZuwu~XJ`>8uQI(7={3@J6&eOI zg=Oo%2fo++ww~H4M6J_r>;)~iEle#)pTwso1pWugmS}$}jS|M!KLC~2SaigKInT;5^5Lr^5V zNZKxaXnnN7t~M68SAvxhG;m~V+pv>kUL;fl!e=!XZzWbL$&!FBxsaHC_ zEpNdMy_@{<0GEsVBkjC^{&=JBIpMLTWa(zX3+o-kk1DK0z4ofLiH|!r7V*gPL;pw1 z^_C^|f55A(d;BMwPPUk~&meuP)kg!(%Whb)Z19|A*PXj;;JjshtC#g&a4PfnRt;)8 zb?J$7Jb|A);w7wd#0eYI14!Th2DZtVQ}@MXA@AWctb1rVzQlyOt+aE;PA?+~!}CDi zfa&+m>NY^=ohiIeu0C^kr!P8lcptyy%;8;gX~>&>1DxID;P;-(@F}`8th@GoA#bzA z?`do>yT-jRR<>IFzDeCfHD?ZQW%SJ9y}$0v;eD#{%;8;mH9mr8`QtS9n#IHV4~D$8 zwr=|y)8yuBLf#9)`=H-9>37|=A@6om_f&Rlt!l>_ug61Le{d^4GAngYwec3qA+{OE zXNTx)Jc@Yp61Ey;8|(1Hz;{cXwXo*`1A4tF=ZAS8l=7wRJ@&y5;2u3q9Xk#`H2X&5 z@I$Ys8;7!;3xiC+Ex$_?@2b zTdM8`&Dy&BjNS3m(pn2V0b2I6Uw-_JI@IEa-*mgt;K%wbSkAiqYTFhm)Aj&$AoKar zHnS%@#dzY*)y|QhLc2-Ym)a@m*`=JL169RH_U2oKxEaV6yqn^jr)l1PJ0fsMA6H65aL>GT&;taseO|ko^;-mUyw`5Pr`YbT)t3DTT;9n%31Y`<={xoxrOeq_1hUOqNn!s5PsRf z7VexJ&*7K-MpHe*yVD~@Z*pdWRF*CXruXG@#dK9j@!Y6}u6<~7bUf`%;^!tOi}>M5%~Y0Gx_i2}v)7&dV^jH}H(nS{ zji$$oL(F4WUAaObH5I{42I0D?1B4wsVW(viri4=ZdFojU5Hf2^g9CCSwvo?$LdF7d7k&~mKj)2% z<)#Pwb(H8~BI z#9+<2;>6IjH<~VtN>d^i>oYu)$pBCsC$m#;26`|% znI2s~0-69oEmM1YSt%LTWQ385aZSm{B_)u|Kx1du%O9U=Ac?)H;ur`D z^XQ$TV9tAUqQdlI_CmVtoL;;#hFXl~$WQH~7=Y2U{pJ~P=?IY{N^EgEEqOY`YRN*0 z;kR!KV?bR|s4kl)L8K?Q^LK6~hu9P0VPvMeX8q$}7Xtx+*P_yZ0VyHy0CKK5u4zyd zqpR^LNT?FBPI<+ltki(ZK-JJd%J_m59lDe26^oF@kXOu8SB!%jL>Zw=$af9)HsA>Gx>gOYY99kyr`k zsCHRe)86Pvf2?d?X!R7K1j1b`*sY82VP>4>Ys52sGU4a`yyzTvXXnI`9tj994mOlI`p~>obm;R#lF$?7KdhJSBafsV|H~= zjkb0SVo#KsnS{vDZ2UPUa@2$J3OG+-awWiZgjl;M7YOqY-i7Gg3Qr8VOR<7R3wn6cLJ8f4Vr3D~_kF&BOg@$zF9=6V|4cg9N&h zDpRjMtwb5DXOGSS(^A#Q{Pa|zQ(9o)qoT~9C0BrMm_u!sKd?t`Y-}{0iY#|mQCn(# z+O!7j{Sz?5w8B0OEnU~t*U{7rBUXdC!yBENf#qwVZOTKY3WAbkB2#OZEp}`nv$yl+ z=$W7{)~pLz@9o_yTayxO4QwAA(7m-x>0NPF`(cPCOCgrJ0;8-r2Hu^d9jf6KK<$>- zO5auzJwfCe8F8@~hnpJh9Q@Vi$_6sjr5uerHgFW5Y<8hVu&E->S{hR_0{a0bsN>*VV`Cn5*}qhB?GHF-=yO z#*DC$XAKHaE5=e@FSUqt2NYS^R{}yRH9a&Mha5vdafYB?2Ms#VYh|Hn5=Yy%o&5tn zU0$jH#90e|*AUcn1|$y_ghUiwU`M7l#cf)sNG^EN__4Tb#%M9tyOkoT?bhzWjNAp$ z+c{+J>=36xHqT9r-gxV2+5P3vOmT|-3y3Ja;4nE-(|H&hrZv{YrAz3(y>;I39I(h= zNPtr;*z#G#iGj!VW*G$6dTmopCN!JP)HaiDu{f~)7inZ2Fc1@|R#UUhgzYBmFk!-k zo$RTET(To1!5T4x4bqgdzyEKT7wNF$Gx@j+roL!rdk`ayliJC+Wn;9_$I2?AV&QD70#R z$~31jP1N3O!aOD<8&{oe^}>uP-fO~rCbW2>{AV|}aK=U-8j(i%F04lnQecdhsCBIn z;3&us1*S+-(Hql#yv#o1b@3fDdbn%(QIN=6k@!Rse`d#8yS`ti87Go$I%)mru^HFVTnD$thSH zli1LK|KQxG)ei?DwjoANiN_hz1*V5sPGXzu$+zR%H0-E^&PCeGQee|Rl6DAcr|f3T zz{X?Jvb~jry@zff#_p#xXUI5e?8a*p z-nWwOwY*L?4ZuknX9>s{who-?Qw42KiT=Y9%}i?*C}?OyC3+ZA1<-eqQr_U$@}X9= zV&-z^2XhMcKG>{lXx4+VLIEIKNz@a331Jw7YR|Yo4ej3405YhAgp!ND`Ku ztiCskvDeZyM_DAE`giPX>f3G?H90jR!nI(#($KcTl-XO9Ew9<%7)!yp5MUtsPEL(u zg0xMH)(%nGB?727*)xC*hThc)>RbzTJ3Tus+l|)UF1rYA%X`)?U zt@wxAHNDUGt{Ji*f0IBVA4bhFWvXO2t9FtjqY#|*+<5dT`-dz};(9}X z8V;>$$W$O&{1T$*CM_x~YW&@T&Zb=twWn#E4GS~FS-p`F&!#TmVOBb@<#_zXewuS4 zhaHO@dZTG)azL+DlG_~kIHyx{p4g9hIusz;;9bWl?p}>(ZF0&1r8(#=U=8F;VW>yl zq*a~fjuK}s*a$v7Ydk}&z(-fG+QnrJc+K)f${E8O1!@SrDL+N~7~v9_99&GRX+WbX ztq8yz{vMGITcJ+)=k;-%)>_iHbxb&_CN-w%krOT8tf)}rD&~u+Srg9L)oPz80@aI; zayT_hisF&AdVoieB7f|`IgAKnHsGsw#X<^pRBC&d_30O>`0zUtL>@he!{UgP^o84Zn+j z_)gZr7@8tRsDBLuikIE69eta(fam21$w)`-9vvDT1?jy**+Wis{7|Ai!dFq5U|M7*qMos_RT-EQ}Q|}zXBEYzmqc!6SRQdQmH~5 zrwXG(dl{{h4RQikGFRk9<5?VfD%Y%ikZ!+N$NUdF_Wd!&}D!J=MSmO1WG1G1p@diQAm{b z!r_u7217_i-Sr^RFMV1uIbIvz7m%=v@T8xAgz%RROwoOh{hW{V=* z7K+GI0cVx~27VHXmvvyKct`{$8NDAHs6q;%eAQv|$n*!l*o~*IqqNhER8!Rnxenx)GI^gP#dn zK*mamVQ#FNf;W^MpA(b1gp}km!K`EYI1}K~Ht0EOwPseC$nEuy%VahLl}-j9bUEN3 zpvser3YJJ&9`q()QfYbi6wbHTA`X%tn`a5vgMK*({EamO&?%&pw zgxCBnaQCZCDe(ZG{?R*zA!%BgsccPeFz9&E%(jP z7PwXPk)0c-;bGS%LYZ+fiLvwWL zii_dn(mAC*g{`SQC?n9;@s;b;=Hp9<10Q5rA0@3{#%r_$zGik(0t7BHmlUM5NF3T_G5 z`}zVX2sged@U5Bw8~m>K+P>|H6x!qB9jCo_r7)JmiPjvrocNLX1xWHnF@#iHZn@7;SI-oh!wzc(DDB3>CC<`zTjFQo{yLozgIK+NlihBT3B8 zPM>;lL>YQu%BT|a`D;xq(gHMM39zIGAxKRf+khRJ>8$*nD?u`qzeT#s)j1$se2DPT z6Gn`)x6V)u5GlJqpH67mYxCB21$QlbM$Lela0_%AmINJtvV4tp9piOiI9|>Lig0oS zbIT;?$z*L|7=j^GU(#txFOnsDS(oV?_HUR~DP!Yco=a*W6n4}Dxnpv~#Vsk2K!$a0 zTR6CVN5`Vs@bpQt;#avdM5cJK92T|go)XFAci%4`IX47cI@>rqhr!YB--pJq{>)N(i_gPEC|o)a11KzFp}%S-;OU*GhG>(HH_T$r7GZNxeouz1`G&893K`@dK z5MV%of!fZ905%Z8si`3EQUR`Fk_!08EStW4X=GS7&+E+E?jIhX;qf0YdS~;{T#3gVmt@8`jFosyg1+R3+h zcC%AJ=Z{E)E~$t(=Rd6XH&P%bh+mrGP4$#tE;t$|S|w(#;Tiz-)kc$N?t)GX752P? z$n!r1V{gNBzyW5Ct@QO6ZgNZpZu#@WF~qAFWzNN7;w4?wEogF5FPgiYc79X=u*}R` zAglngw}rSRIBL2_fxUzibON1K#90^QU6HqQaL=4u9$c+}f-dO0=BVuA*e6O26j09l zj|755UBLO6%tf~TriT=Hg4q=Mdg_uWfnwZ2OE^+m~O13_B@i;DQc48Au-s|7`}GN-8mm6gic z3QLZ|Z)~LSn9d9t2nbSS#-SS5=Zi4ubVsG|3gJ*48bAGFfY8tBhH;A6fgQ%8PhjD9 zLCm{i5F4psPP_zGQ_g9yLRS9f-${ZYoS>IfHY<9cQ!(#ioCa1|oV-+CR70Gb`U1l# zGqsplYQX{|E$YxV!jN3a)2xx9E81}|T2gROXAN;mI!mM*aG_`+4;GE0X?AI1^66P- zt$V>j2{@-gQvlAQaV%l#u3R$kM_B?p!Zto|nkxq74zajO^<|KEO29xJz*^BiGikJg z-j5ea<+LsVX>9Z6&7@=8vbJWaeytO-MBMOn+F4Jp=qgybhJQ?_R+;7Xs}#^ggYmf0 zVmLh?8N#cIeD4Jpm-prhcsT>dvf>@E-SWWIgNK#JET&HqI(DEuRe_Un28SJ32vY{K zz(#{}5a98m#wZ%jVqNy;igVtexhbxZJvA)uX}Ip;F(c@hXu-=*;k^yGz2GUPM+ozW zh9M3NNM34C-eU!k;^@vui@{!8GGI3{9RYd~T1gtjs|AfDNJlB|+v0AiH#>qx#q>Uy z9(YG!knaWc=BIG>2dH=HOo$zO9;ksDl*>Dbb={Bg#9BgO2=Lkem z6HH9WwM0YtW@f+?j1k-qo=eHAyuKG-7CSZAwoM~PuM~W_GG*=KFU7whbCUNoCaKZg zk14{aXQs};1r{9a%^GBzbKn$zy;ReQ-dt%5aB$}&mO!@~)t*3HaFh=Bjq!z6jS{@D zgQ!`HLFhTZ(LjD^5--N^J;vEons4yvL0a|JbWj{8y8l7@q7f)ed;lQI!RvB`+;9%0 zH>WGj;@xW9gSMo^kuj-3DtIts(i1eiK<>KS8*G|1O(nNkQ!y4^FU~0l6awa2f-GT% z;~dn?aWq}zi;|1zD_~o4t(LI3BQPS6gRwd$GgI>BlXo*DmN$^YrJ}*sDZKqkGb@|c zvzmglz#Ht7lYz;i&PxsEC))8UaP!Q_p0vETB5v8mJcl*M$T6HJ3|lJh71^ONd>u_N z_?`xJr_-~V#6Z$?(g=5sPNn#Y;WX%e2)97edg6n!NA=ec>%iHx@cc`Y-eB`gu{fpQ z%F_I|kDEbnXc)5*z8)%QZ@D&uPZe|mcLwf1+}azb>e0j`R-* ztT520-zQAtq#k#e;2Y%Ig;>e{^f-1UxTsVj3OFn_3B&Z4@&$W1Z|Jbb>kANa-mKwv zvs^HTakmmT*IqjF)tA+KIY>nA5m~sGO2_x*>tE{YB&57}I*WCJZEl z-Ba!YP!{Osr!X45Xw+nw45ZNv<&02`?Wjd`L4ZHYc~-Y^yC54u4`cMtO?b0FJ3A@x z?KmT(ux^u?To&)6XehvA)R-l!C8S`ebMYWXfdX4N_OZGHFRsf0-msC^SWr15F@neF zS=-gAbkCWmM0MF0KQzaBpl2NK&Y88rB9=K?C%N?hdH0gy07IL4x)L zB*#UNk|i^+Yp$m~$RVxn#Z}kTprslJ5Np#5t%%-%xdMr=XX9!-{OAWHJ}d!UBvzDR zwOMVJc$}r>16p3RA@E}wv;cMQb;%o+re#O;JKuz zO+LfB8T>2+C#{8q$8%Z{kXpLQD$Y_fibV*Zd3FyQhN!pt6C4ZiGcYBWu)N`!!knjV zE=?WwYOa1elQ!`*-fSwAN@rT)vm?9&OS{tI05U?4ta%9ghEd$c8tf7)Qs)h}X)Uf( zmcJ~c@eYSri`X9P$R-=X7DMM;?aMW-egp0>t`FCX1rmd5FbY7Fj#U644U5DHO)M4| zUOx~Z;`M&a2Q2PGhLamx?Jal0g*cPhPGugu?f1^o>68 z+Cv*-o8gm9(4klYmc;etfKqPcpl~%%5d`FneG17zPa1~SY_Wy+;upyvM}84*YvZQ0 z;~jTu(mWiTg%Jaz$}3<8W#nLhSW6af&@+HrR2qmb4qK%CNoc3?SvbON3|lnck})VW z=X>BEt@U*_6_1r}vl*JP*zy>PcJ+P}_dEeXoNVmTyKTe-OCL zYdGTOjU&IzYd`W5!g7>{ynY7bc$9bFBl{WQ4>wA}He{m*ky+;5*W%_qE1li9mA^L0 zU!6l|3{2Inwkly^7wGf&enyJuE98Bc0mnkrR^_xo5=-BlE<(Z6yg?<8IVIKOl?yPV7G- zF{GUJYd~_dWc4!mphWv@^Q8gqw?nxA65tI2^nMAi)bR}rV>*ss=*N$mUO;&FpCDlJ zj}05}fDjnmUe4%s3?9-^2CwTV1AN#I9qbJqVPp^wYQK))b^IzWqT~3{_E|iLzJTC0 z9d!r$pbWNy!QImBP6m3gT?}5uqr83PN7(Hn((TR@2snb|2V?BA9rvQQmH0i{kat5b zeok}@526PVJffp_<3|XO<3aA4bMTvVco02?;3*w_7{B`VG#=yz{ofGG;RZX@O&Dri z=FrPvGoUT^rl0VRj3agr9$=D?gPu&m2E?}dsUl*te(D~?4*97E5#x+ahd|!6Ah6dC z&c+AulzIDXmbV4z&P90yV8x=m2EeurkK2~;{tBM6yjibq!;E*i?e!)uDIU@o5l@^j z&b1{{80X@Wo?JS77;TQ>0V~_C)?!_b>$Ty!?7>s!?Uj%V1ccvXIz_a2KF9(Oq9^d# z@E7nPYP;HsZn(Z+vPb40f{c6yk0h={7lcs~1d@G9;shduSQ14@V9f&P!1nqON}s|* z5sTnyiS{x0CLW4bLUp@9)yv?3MEeNflLBBbgFlgI-_r=5)42@3t8?vGCoqFml_U<8 zyb%J*f@;%ly{A!kIeuDLt^Iz;yZi`~m1w#gYh|+7`gS}{Ehag4rj z6;kPCpsA+M;__is`b|8B>KN@^LAn}TTmxd2rBq=6{Py{2bjE2*;x)j^Rg{EndD2uT z724X2+sZC=K8Lz5;8EVqYmYFZq3E@Jz2s-@V2Od^eiw@S=WWM;;(i|$&N?ijmS@nX z>FC7#!GLCr%+ zw%9Bq>|&!;QgasrHiWEU(1ND|HrevWFFC?E+0YR~Z+Cyh8T-VL&w3T_U1R$PY6+t! zqxTZ9^*U-N#)kLf0q&lV$U{g#tuoN4In-lOQ|2A&vAAK}_OS&kb1fbttr&ekFBa+I zWf{<4ELJ90({exwSrSp2b)Xr0?RCHw)5tG0^zmW#{gYr~}p_`N5SjGhZYn9IzHi3DUm-E6|5_2)Y5R zxx#qZ48XX>EaSF&sSmQ&`;PlsZ0F3k3rDh3GS3}j2*xGqE3UOjUa7NKQYbBT;M(fI zwUt!OiDR6t4qRIuxVFv)aBU@A#5d~`9wLBo3*$-j^%XpZaTwhoJ5HYoUPo3rvV^c1 zIaepv_%`}Vlj-cQEchVCMFjOKy5qi9O4dO9QkqJ_PDc`UKDq-lAxYR7NrJRP!qFv5 z=`9D6Mch*fC=4Vg<{d~DDRu{vf1QCyG{x{hz%XdQqrAD$5k|J^e7hoL~=K}oQX$9!{b z9ZXlh4*qAnT9u7=~hW9X{~nNHx|V0HA|s5YTXRbk4J;l%UyS7tB{t{yH9E zM@HB?5&=7wBSR0_Z=rWqaS=N@*6qppm(1A0O=L%7&@QqZ-!=|(28S*J*hC8k*BrRC zHSG+3Cc82sqa6?M&p_jSmqo0zDh`Skv77_t@p-#E!afd)me4hCfy=mDR|u3l4kEZ) zqP+}$LFd|qWW@o=y6#2=ANF+|4;_&VpTvW272&V^E%WLe zQ0jb8SkBSk4p7+F6L^$Y?Dq#CY97bq;FeiW=`04%omy%du=Hsu_1BUgLeZuDEYWR! z`NQP%ct~yxU)1qc3}4pqH4InbtO0e_16cXT^g5j0Gq-56}VaQfxUcJ9^Z0qvwDx`swbqvWk zh{ssR{#%C#z`7Cviyb0ljj)vNU{Ej7Ueqwha62jyT_J6JpixJ@WaDgYn6&{9P|rXQ zvXi;|w+0W#UK)fVN)G5!2G2=!7deBh2KmfD_vr86?m?xac!;+!inro%{r$pZlDFvy zdt&o4ZH_+YTT(rn4AmO7CZ|4^Np_ z^zKGTa!2nBeo3PJ4D>*PKX%9DgLnus!zXmypD@cG#)FO+u-Kt4CZEK^)(ppRGKKhh z3nl*=Y10Z!UCw5@*w=N>p!j(_%TQeL-bzMw4SzrL zvgttAShEFvB=J;uw|H|n(O{eqIHv`+1!-)nU+nuq3B?*bEWQ#Udvwsi;dv-WG%zgc z_!@>UluN$9?ySpC)Bz<7Sd2qUi?Caf^$A_dK$rT9#pH{+KM5a_ld}Dk3i6NT`pmSK z0gD|dUq)7?w1^#PL70@{oxKQnpvt*TBh;;Y-e%EFc+U1_yyT@t@ACKFbcAVEL*Bg2 zvoJ89r*XuEJ(WXz15fA5<)C2y)3&a3avTLf1_PEm0JE#dq;v;^XC!(ZgYW8G+s`VV z6w0w)W@pgG$KUHHJy%M58H`HwdRBZ<=Q7aa`1HF0Sy$>(2D*)Z*}%@)h66nK5X|*4 zID`kBv)L9i{eTqjuvt7zIwsX(M;M-z;(i8C=;*5mUe{3uE8!Vd-t^*m-K}^4GJ|b+a2_$}YZR7mk@6i3*xVsiCdcrQ>KTsf_nq$JkGyzbnP@dLx4| ziSC?6@T!hl2yI2>-Ma3Gt*X44bw_MvN!aRay-FrocZA`4WJWu-Akg3kHZRjR;US(F zj_UXZhB544a7W~M+pRP%q5z0uz;XxW?CPkL?qHxxeL>37LsHtuK$rTMVCg+l+Rs3j z`s~LB595I%4KsWk4~Tm$ybJUhBFdlz4{ITEhd59z3#!~;QJv7oPh_7#(w{S4ai zpsyH1-B&;R(*A9qNnS=@YzXIG`;7=$g>gF;;WXt*_F~GDbewRCsGGEPnQoB0{St20 z@ih!z#=~1%wyrcTAk$%Iw%42P9SqpS(cmoYm8?Dnx~aQHP#P{O? zv^PF%iW#@iIOT)KgK}R;JLLn<1m!-DIOWMFf^r`-1m{&eBvFR1>G)cPCm}9MFvH4M zA=AMOvsOyh4hC%EV1}i78{fx3x81=&SM<@qimRk;KLcIrPvS;oJ&eai%y^I&AS1~0 z+s+1g{-oLc<9Ik}hEM2tIm7359Dnsc*8L_PXU;*EzsNzBzkv+0e3EA0FW}+03}4jo zH4NL&lYC!pvhJ&RFfIcYI~FrbUz5@u40NfFO_u&dN_}X8tbUg02L1+w$)pBA!d@L; z&yeR_0N4kNb#KH2z!>ObFdyA4%}VJG26sy|SRf?t!9zvLke7nc&j|!i=_rG*OLT`> z0BK+<9z)6LD{?UQTJ9B}_k2}G0L%3pB&^i&4GiyDBNYC$9ZF{NUK9W*1}t~%W_HCh z$&j~$fiCqY$5P$4&$bo6qwPG2@?Jb*dNDG%S`x?SM-kDWz=dtAA4H8;@tlnl&*Y`I zh$+f+3o0WIrl`(i<28WOt!Mk-$s+q9zF$JP3U#rmWp$3n?9)}{Fd(?4suFhFtAz+m z&lc@?aP4OP2qT=IV(d%DBFm@4#x&G-(kc-E0X|oM0 zLLPan`S^u8&QQ17#a6FME1$_&az7qoeR?fWh{w_J?2w%)@3z;y^*Ghi6G6iMYd~fj zo^sZxV9d<*b$_m#k$EGaaL`jk*4=nG>>-2?;&CKNFzn3p-WbYspGeq$?BG^BTUpY_vqKJ4>l zxv6}*0a?CYI>Xf*Mv{2I1`Ie5I(uZ^8Syz8k;6E=LOLOhoDJ_r@=}c+OEbs=^Xoj) z(Bo+8*7Lv~T*Q(*gN|Ue3$F<=a<({ZdCjw}bi!1B65T(G2ZY|v@I^c@lV6ia<;A*S z3&K%6K%_;wGt8^*Ft579AYuLm)o*=Ssy`r5A#oIuU&jNX#Xv)g`~X@ePU+^h7o1U% z2&yw-{yhVjr_m|yjlX!CPfs=%%L``I|6W7Qb*M?Az6l{)IkRO^*c5L?c%u~iCfxIA z%^q+z`h-MS9}{A=F+3G;&ff+{%{b!h*{1F2T+0R#c|LxbwFVCX3L}h3ai8157H>ci zt1QDPn>RSM`)zH8aF(Dm{c6Pqc;gUX&wTrDJtEM0Hc8B^!?O%NrmHSF!YErgsqa+GZ zTG^6q%|v@_XXK2$RczJPB$|$9WT*j`dWna4S?yLFt6Kqr3M#;yBQ^re;zNC?w;1YW zy<4;OS$q~Rn8i>7I$+3tKKH)&zV|0j{}SGCt_SuY zf5WlN-zds8XmuO#xq_>vEi~J)2#3aZ!JBwgcBXo_>_gBVi*NqgyD5ajX7mE*mvlYy zd3C8D0mb~9q&OW!2PEeJyNVr`WiCZ|iat#7Vh|mYEP?RL2^niDu7raWHKzk4G0POyw+4GG}eLh*(mbMUfT+$KPv0ad8mmYo2_RljM(sEvr#j7o+IgDfGbFeV5 zcYgSNGkb~wGRh;sER^`MgI(!|7V_<(&ixXDCRIAA8@SvK-V=8qvEDpkty7C)hBpqQ zIy?y4QHj3WR+FMmV3$hQBcHoey`QWU@h2!wMv>$!;4-)4vW)J9=^(|6L3CKM1o)(A z$7PvldN`ftK17;xZIxV#tYjHH!v#1jomC2YW2e(n<+ntQx49M{mZX2wX)17_0Gmu2D!`FmbuuiSDj5n+jHDgkIMssE$d$B zYHD|A-WrM`{pf!oi1x44F2xUg6zO1kk=_8DwPYd$=R253VXO&xs%Q@V*mVzZ^bB9Ye@iw0_RH#fgUvxn zA9#js+FPovw_mofFX~b)E&g|(j{bXt&4{EQJi`w6Eq9-J`(+D5QMcXyP1OJ6(YrfX z9FiD;y~DA~G6SHU>tX-X4oHkr?6kSgR2|_{&oRjs;EtVNm%v2Rykf559Zkn24*sz^8|zzh*7= z4?`4>f)0Mby|D9@YN&hYeS0qZGuR8@JN#npPP%_bl&7loS_5z5=IKN4%ex<&-UA#l zsh=I2q@_pOx1|P+=Rq-IiY9_+|13n8A~h(|!PFpK0;B**ZwSs%^}$59oEnDEj|9_E ziCTJWFrCUIvYDVBlho>=q@G50E~qCYRzzx$41t^p#wh5T1F(H2E(L6p;kq6{@#_cU5`STtv%-VgGYir@mP>SgK2r<+~BZfMb#^z+Jth9mAbGVDg4;H@uFioa!rrkEP(x zaI?3Q=O8%`YBUn#mVSz8RKB(J>lMnFJtHL3c#I)f2gUC6EX6B9bV#xR+DW|e!fEMd zQ058R*ykZVk3|eIA-M+Hx!>x4-#pE>6hq`b^whh7LnQUP5%AqoKj~+PuBR44);qm<&1N(HS9pJY^kX)hz>~fC}+kuxDMuV)o2evxmWIj z_{EIk`P2s54n*5limg}z4uf<#^4-!s;fE8&7D(gUfMJl_5A1%4rZjLMHBigVs4hk8 zL3BW(M==bK5c%6F$5QG~r@XC#)Uopr-@{aM?r$VpSi?%%u}wAX?B>TgNkjwlgm_$=F$@EF81!2VZ923B@h3>dFzlsx9&8(iZd%a;90qCq z9g zBYP2Y2_!3H8Yq=hYx=SIMex?@>9a)J`Qh#mm7G>Pd>bo23zOG%JnjPahLZb$k9!t! zPFq88HRwl@zSu_Ej(xx$l8!{aTRKEPA@55yX}byN3yJEYFVv0)?S4tr=8L`BS-?4; zx2NXd&jK=dFLAU^s#Kj(tcUIx`d4(vzIO!IcVE7a@b3bJ^Vu*2&t3d( zp4S3yf9`!x91U1|BF={AmflX&08$&h9-8o+O&AH)J~s_H7uieiAQ-^*&O2jcU{hPJ zQu)o$fc^H-J>c(r9z%E0nDQq_eqp3D=s$c}sy&gqXjUAg9P~yVl+@T}a4kvGmtMOI z6RVhQllrX))`P?vxx;C9_JxXP+tNq{*VJI+Z2^QAUz4eWUwqAgMhTjZCQg{mwlFAC z90#GEGR+|5u~%Eq(ngzSUK&6?U*3Ezd?Cg$jHR@EV##WqWwDeNNGzq6Of_|l5hnij zdVCJ{B4BZ>K;k6HEl7s`n@g+gk#L%a_lJhvb-0E*q9=TfhX)G+dDY6@(sytp`y)AjZ` z&vSa|;DOM|`z1qx&3Br~FfIXYHE3NBj-$astCLB~DV(iGn@y_5escr;+G{d;zQw}M z*RQTBT}ML&@2uHg9Z02i|+^k}J#Z8+R$^X5d~s6EtZ^G?gJtqjxtH&w5ckN74?n=VJj z@eyAw*%bzFf2uHP<8UQ|*1_`JrPpL?ucb72h1XJx*9xAYF29U65<<*AeOYDjM5C$FV%xlqrY{6O+-REtLK~|+)MyW-$Pduk%54L*j>sg*0J(6ywiJ&Nk~R)W zGH4wjHx@<+W0Fi-2IwXhar?1fvL1~WUz5?Z9H1gVGeCN6M6adSWNNQGK!sP+y?Skd zFhGlVt%MK^kjyG52BUZ{luUwlZu$G)=cKU|?el!l zDAqnEnGW`RQ#;HbOVK{J$8+KXL8@#KdDWv8laT4iUVvPT>?&j!F|>wZhrR>a!Tx#wX{@eQ1V*c4Q3_tIo}}xCwj;D{beypYXe2!=e6f0nSjO znr%r?@#h-&cL1#V@=)TCeV;K(hZv#c|HKP4$^eFbNLlnn=jg{`@`Ec1- z_5RZj0!n@b@SJ`}_>OCP_+I0PB)ZLZq;}}0EkowFVO1A%NbO9}9yklR8rf?QeR!VG zrc?Yc9tR|K__i|qEOJ(o0b)(zWdnFCmDEnjCwzCiu1XS}4)9pNtm$!xdO*@i4BH~z z6T%*lbk|~OPZUdfYq2z*Zk}S_yfc0qJ!~EQq0UzW^-I1CT%HN)2LJ;nQC$qXo#J3Q z>{3@i=}ocv2q@-}qP`&7FNxZGj%s^?_JAa6^MX<9{AXk&djp$Ogq05i8zUWwe3#V4 zg4~$l&~^?uA0euXM@5ZxzuM)X9g{@Eyp9^f15KE`uW7XT46YO7b_i#y!lCFUC?>W` za~JSTq@9uPkWNLuGdjm*+>eYik$f_+qY^EPjL<_d8s^?UkLUuh9;shIhi^}@)qfdm z8$Q>MF4FbL=jQ0z2XK+7EC_h+hM0v_JqP!-Iy&B^Ox)%9eQqwB!$s*5vF z`^!PJUlO&s!yD~^Mw>gl(dLHfzXj|NDNJk(bTaZ?vEyT1Z6P_1NK_XMGt%3FXul+C zbHf_#fkvAf)@Vl??Rcu!>qK9OJR*sa^L>}aY2X=1XCvPx^&?#5c}TVWGAM>rlci`D z=z8RHeo+65V4F)6c0w#D2=EkO0>#z$v$WUo}Khuli~ zmV1I_?%Umpg7%PPAh6F#qEGGw4WsCgVP-&)@b&EmJ{sHijv4m$eUt`*& zfiAU3D1@VnR(^wXQtfq)Yq>;Ao?5l#1et_>{(BQ;?7Y0-le>2=1MhAB+S@Pd5RLMr zD2@8J8RcHFW|OtQLfG4VS#}>NuJMBuhoeX`3H;qx|NAb>PDjluWCQRm*tXOKIt~T( zff2}fWY;0r0-G2A8ygz^V)VHJxeEAkd5-SMJ_xe-Kl1LgFqxEjPOHBi7wcV!>SFe( zy$_1>RCF(h^4w~}sXaIzl=K94RMH3dADIi6Wd@==RTJc?6AUpE^aqo^SXrjb3qgCJ z(dOz+gtvk=k7*+sNi{U0@g%as`QUg^Vh!O3zDa+s7CO7G!^cYU?9yEk|Mu?6(vCbQ zOYvf>*noUcE{U;nHcU=!)my&ybPi>UG<3(58l}v}w1=7K_dQe7n41e9eMdG-$)0>* z&R+)p@Q(>8y9&^xsP`#81g2i;UZog71; z3s|r$B3*#!@SsnOF+vr!?uJV(N+aQ%wn5o*%@7mNRMOwXtb`8*Z>E8yz`m2~h z0PC+!mLr=YTI)s7US0gLue4qKaX`r*5jBzxO4nN?hHoR#&T8Zv$sqBh1|gkvP#75Q%I zB7@Da+=q>a#$Kx!7K!@eqX4ztL7SIY55=DbPgSq2e;l+6$AlXT3J^x0# zK7u}EzA=A<7;DTYIfIp9pCSCt_gq-qVZkiUv%{qYnZFf$MVk|l z__T9juC6K+unLFfwFUn{zp-cR~BS?01xaXb&!=@O@0Q{#SKUKZ!vV6487g8-(qP2vM#__py0(TG%2hn&ES#e(w<;~G5 zR>cCV*V0m0O9p%sKZzZ9@8uN1pv5w%CwVjTtsz#L+u@pB0uHHkCGy?U0e&yklASbO z1!O0Q`XW22-3Z#8ovu-Q8(GWjB#jY^?4&`w;*CgZeY3RGo9dY#kI1#L#+;qh-UQ?} ziP~~)c;8~JIeA&|^1~8aT9Em1z-UV9s+;81g>g6FWF=$KZ*@V&wh&}>p`9u_LN|;` z>LAU3H8MzTyb+9Ri{=cyR1bt|4oIeBHOmV!3xMWH>LAMtd#I)_)ObKr$7{xTm>^!# zXx`d_OzpY0P?$H_P4nEq!lG&5Bo)P)Sud?){T_gp?3RRPH9rWV4!5JR+9JEDbsxoq+l{6Zr0gait#fwMa!-gg+6TE1*ql|S zD7qo!wjiC86>kPn&Te}t7AtU!Vpy3n2Hck23|g#+dXhIY-x}=ZBFnluhJiyW9f^Fm z^di5^YRPUIUji(6iTWbDsXZFBIlGNh)RG^~_DL@X{*^vyj9z5AS%k%pRcn2dZqA`M z2tVzNJFOHkXD`F9wue4iUXb}JV6-H4xTZ5!Fuod%*A`@shSMb{%)r#&DVqZ+1SJ;C1~E#s@kGy z)gvtGpXW;aQDn@^FkOJTAgP0_=4x7#({5U#8Ln3r3j5~2MrvV@GC2((`!p~)Nw3BT zn+q~G0GB06U3rtV3deRG$3u|U2c-I%z@$39QPL{>JM@nYYqn%V$m)i57V!s*_=73_ zlSyk1@4cb*V-kOd8j{lx%yN`VR+Bs}aQ)5#THNI(a( zX_N7!ihD`D;y*Y)d=#y<7r9Gq{891fG@2QZa+mz2V4ZW<64qOwNEEjy#*@wo%i5wS zC#;?<%CVMlEY{&wip-+ru;i>`TMo0He+uf=Qm=((fi#uoTc)B8RD63EKS66BqihQ<#@G3ALH2P-S z;16G~@XJfCasDPSwj}S|{O8~|gZF+(-IAfylDo)kK~9FLIXM~HriX+N7mUDkSl8&& zkh-l+me_-#KaZtXB<VN{kn_ax%86*vjcO983?dL9Dh& zhidNwCfo*^O_0)|e6-Ff>>ic_AwbSKdnnEXQBH@}7CRuPL#uGT)yu9OHY`UO18&QG z1}&CBJ+qtX-qeuW;gYxy97pNH$ahP9M_^0t)A$i!l}pqYxlgUXsV*M+w^MupFbsXt z7_rE4oe2GvG(M7A->j#g55HL*8=|&YW6p8D3ed1QXIZ$2dFUjWUkJXVk~(&iv;2+n zYBXM5kg+HMKo)}eHNYrJ>LANykY9*A`@I^R-|;6`RZ+BMh{j9(v+E>WE+Nvh);rKG~YBUMnQ zqz>ZL4d^W54;p_h#vha#|H+iJ5363Zq$J5c5K_+o%!MeITuSmZRrDJGEq9kmXi8Gq z7XloV#Gf!9lo&6hBpF*(q$Ir_0P@fTTB|KmlG?$b9i2im4N^*ykJdRQX?ZSMOYR0X zXN66Qy&-(gPFC!1#ETlwBPteHy_S~3S~B3a>}1el8Pt=!nfcZbE6we2&CUadRO;^y z;k%_>-(^n~PxduF56Dgu^+k44yBM_l(=e@2{7qnXlE#QdcG6%C5K&U=o28|G^*hy% z`7_;EW6n-${lEX@Hi_DDZTNFZYt6~a!k)KzQan48`5+)?Nb0JaypE=j@nlbJr$Ycz%7Tz9Ed#)`M=1q3fJU6hgXc{<(#SoxE$$X5xvLJH_kliG8 z5I!-eTh*G~CUMm)WVgb;$!=O0q#VJE$bJr(-K2FTO?E2`+BI;ln9-y?G1!1q$2ZDu zg?~q?pv-QI#Hkz5S;QYSet(QVC^i0*+3h-38=;HFB-g|F^X%*fOeY@9YDpJp*>LH1 z1GHqfBs9CJ+zf#aN_K@<2PMV}*-ge)71>QMe}zkexeu}0BG;(B37Bw?&~Aa0-Q=V7 zXj<7?K91JA(E6L>;#Sn(CNBq3&Tdw`6hwLNwVPtG0{2o3D^tdR+p?QMixp8%@@D2+ z!v-kY;p*rOS%LpA4eg73x77cc-;&)lo&hX)-)o@0$Zl!}f_8uE17B#MrT3cBg}}ek zCymjIOgDyb9MHXzTHmCbNrVQ;w~Hxa&R&K+|J|XFmKS7x4iHXKhif|H9LCGhcx^#u zAe^r67l5hFn>3(#ZLw5ZH0|>Z49kEtAlZnqR~BS`1<(*l9fbR_rkdu_z$TvlI5cDd znc93km>-QzY*K>eEv>38npWMy;x?dFlKU|>c^Rhq9_7zT>L9DRn%3m>2v^N$7LUss z`{vo176vJkQx|o70GOPl%Q3>{g3KD=vLvZ1Z<1Ew*sf!L2=e-XR9_RARL3_;T7`dy z{;^@rv$Gy#b;CM~_=83K!4&_=q&1HB?$G)%NjC_|sR!n4luOPhd0Gwn9R;-biDzd? zXYSIbGsHP0nTo8$u;JO6j3-q*JJT!vGWYNRT5B(Im)dE-BuwwpNV#hS%h_N(np!%K zeW)Og=T>? zmFA|oR%d~iC8@vFbcZIr#&7vra+t=q0Xa;fzQ|!}&jsy%iCX5`a5}w<$n-LwNq;@? zuk=Y{O+`LiM7Rvh2aUejHu$U5OTSb7*c|o5mW-vU{5k4+@ZK+}TaurhT}5UKaxzTK z$;r?*-6VXtV95NVP}iuWZflbz9%Ebu{fOi~z>h2eW8*^M0?b9g&`9ba%~sAJweiM+ z#>_2y!LVctBFeYjXH*f^^0pYYQ^9=h{MH z-sEu2a{~*Drh$D}>;*JX(ida%aVN|WAX`f6AS=0=)@(U~t7e?r`a)sf_OqEyE>%8G@5N2;LQ%K3jZ>IQTc@du6XFLQ}M zC^i0*S@8;1@t$d?~o}DG3=}_fl2yjqxC9)FZg{_>7 zttz&1di4g=!xtb{Tcks^*8x*`5zP`v=}~FJc+C=c0f*t zR#7aw`xKcIOJP|Va9i#(Xt50HncYnHriSNIr7nrv z=9Fb&g5URsK9V^F7$Qj>yGdDt7|%xI)dd-Az;ktBPhC|gq?6aYw%8~wn#N9I@g?vK zUAgl;i;FufT!=L+FUVX5G)Gd0;+q;xWz9g%CCyvfR$DY} zyM)Crf!H>_PiA2=*08c5ASnmSR|`G6vk1%?w(s7?%O&%_6aeSZQvDi+mtV zyjKGqihQ^9`n&ZnvYE!ifNUmFUt}}26G5A^*%ZaU3>eKmsUBrEQ(ymdTM{cQvYGm^ zE^8T^$2C@%vzgjiz&(v525IyO|&B@Nf4WflEl=+PidQ?(Z-6T7I<$eutu9ADv zZ*@V&wh&}>;Udf`h)Lqo;tmUSsAiXDsM=*CxYQO+vblxDZIBb8g}Z=Vk>qi#ohNND zZ+(~YQAr(jd10lcA!Je;vH=JnscUSe!ULl2CIY9iwjfi7T3aa0n|!HxK83=fIfXV_ z_D+!VrG?&D!^(opARu2#>QLON*KKRfm)*E(M&s5O3j6hisy?(ZNSQAOkc|TKrL?Z3 z$(JLILAwUdEOVsv4%Nv^b$l{k7T%qO_n_YQqW7S*_TH8+XR(?>%S@KcfsilfVXj8G zmT4_fl2dWGgo>2!#7P_hwOiJ?Qjl(B(DzSPTBkS`arHs?#VJwba| zt?euFrP?h(zHGEPp{YF^w4+P-ErXOVk2Wu<%JqeOSv#5asYTYdDB< zzPyH2v8eA+42xaHfZOt=L5tN?uZL!lSi@APA-BVYbSq4}R|CBr`EF_TKC3J8rN(>S z<9Uoo)ED_u?R`M{LKlv^wS#xNdb}T)JEeM;x$`l$6>?I6Bv#H&Hw5BO2SQ`y`_&XM z=R>1*b%!qE%M>sl285H;;hMha#kfBj^Q8%xo9_*tYYTT_YV#&xXkJ?^l@?9=2C+B- za?Z0b5^La59n1@W=1A&LD`lwW3B@FyQ_+)ePBiB0!Te!tXp=lNZ)sa?(X?$Ii~kzr zWM<)PtYLLQW)UzwC3UFPTv=-}Tf$W{CgPQa!oGQsr-ebvWVV6qSAfY(T36B}v+IpP zy9PIcF}I`8z8Gvks^gQ%tnltEya)B}kKTjQ+Iw3vdx+Iq=zuZFW;i=Ge^+64<3*B_ z>;WOkr75Z37I>q_aY<()(`G%yKO}h^S&3o8<2V@`S3Hi>%NCHx?m(h8Co;A3L3>!O zZ7UL)+ToxbZ?rknsBH_{(Yug)ASE*St*A<8xtrol5aq04=-6R7rfrF$oV}K_C?~~E zM8&G?r^q~74hzsawk0&{DOOFrCYpuPRGORS%5AGti?luR-O_>IZFNOL(|7`q(57mA zkp9uUbebQ+AYU;wO2U#Cr`yz=ADK>_C5$<}w`mskn zQ4gEk_vsS6_e<)A3AIW)yac7V1#VPSH@c3qNaUESharsw`(st6U7VACR1lwJ$HodK{$Ai?g++MHn3t_AI3wYINF zuxjUncD&K%WTVt**$X8jk=HheUmmP1PO^+PpoS zr1(|95cWy+D7S>O$mRe$N=dA+$eQYpexLfW^SH(ebJko#Yt)w%Vd;+b+)U10bg`3;nT%l?9m*Knj!8 zp;mHbttqSzSIy`iK5}mCn-r#nLCO?1jO++7g-Pp5niMwC7_@8PxD#MNdY@Y4r8+*D z!V2%s!h2BfhtYdbT6=FxVP~Q<#=FqP3(4i{fV27S0Ay&So}iJcx38ZsJ(1$cGfeN|iC-wrpn5 zV#U5G&2u%tgK#CLaHU5PB{0-O|B6t1GgZ#@7MaOrpNXW@>K-ZO&%*D1Pw! z!)W$N^(eEM`Uk;fL=r13vYGmu_%X}2KA0-Z*-Y)j;JsfGgEtQcyKuD9oa`(N{XpG? zGM@zurlhXANp|}%9sr!HQK#=&rr3?#)2-jMU!ks zuowe55n7l4?ARo8v37oy5A(BtR!i!r+}gJ^ge{*9*$W6DscUSe!W2<2#;9uxGIgl6 zg~Ghamzw8OC@h*&IE%&4ft)Wbti~Ev7G$mhR)C}qwUR4q&6mr#Y8LWkVc+CSEeulT z%S~i|7nm=lbtO%{ywMo6Yv9Z>M@q+IumP!#Pv*NqIb8^Rux7&_!j85>yS zOTA`;*LVjSTTtXnwJSk;xY6ePq}DSaU+&J4bG}sj7%*8o(e42$U&_ata=z5EC&U`v z2U!ek&QrGVMiAwEX|t{eQEtxw#bQw(r5N(1i~+ahOM@1xsa_AwBC!TXtH|3fB>(ZD zSxh<>`EKd_hpn#2ml`hua)?BIkuTLw25rul6BM=d{#p79fq$h>s&|5Em2uS8?M2m&)4&X$iBCSYpwCShn^ zTP&3pO@h6O#jk^$^DNwmHLNVi{05*ok~-8%8LD~aaTm{f(Q|!4rZ!&>=F_pEP4dvZ zrERrE)3z-v-bS39%q%>PHLNbk?EXR9_MD^+wVEqyO=g|7H52j5LSf%L9Mr-fWis1~ z?32J`Cao)JlG$Km(5}HyFn)bNx<;!^Y*HPcOlF05XW>1l_m${9D6PG>C9`R)deD-z zB>f;Ht$i>Tqg=9>$=3;o+c+jVm4w>UABEy++Vl zdy&Z0ZUyb(Mw=6dT3b&d8_$t*B2#-d_>NAXJql7Hlb;35({z>>v3wA$bM~@XvBPrq zvMo`R8?lEtQIum{!m3!6S12-%mcs(Hj%^9edWuz3uZd=%G?nJ2xpL0}Q;YOm^q1F}(^Ct0Yo=>5$ zXii}t7KcGjt`>S@4Sb9YGYCkok~-8%uBM9#Yj7bLzdj(nNi8Nl#)QXqnoQX%Ld@ z49t}%mux0^n$`NP12UrI3TSyas9vE7R(dqVIw)C-ti;e^rzm3si=CogTY#*34y`RH z60F*uAUfP=b8b`X8IWKvKw{*aVAWm=kw-70y#!K%m0tx#g1w66o*>Fu%w`P-QBJV7 z#SSc>*PS-oxtuls|C8ATp!hCyk9M zGO7j!@ul|hU!$fd%|A;mgC*PeA5u%(DA{hileqrF)znay&E~>RCCPUu{~gtG^6aFU zHZ^ADvx_?{+yP;+%iIS{C`o-j&ARWa^%!4S(86j$A;s6C7B(w?2;nF&HArXha-mv3fjC}A0m1j zwJG{dEN%g}5z^a{@0Q;GePQBXPqtyO9-?64OD_Ge>~oUam@?NTdKEWbR&YP~?3c6$ zpHWE+&umKZAEEyUil?fV`=qr&a|O~sPyc0Voa?1)(zMRw zq57TgVcuG}2kaZ^L%^9yY+89!H(0B~MAg8aXqmNI)WYVBClI~}IO8^{2IcfT+UVQW zPX*i82c>7D?VwaYPKYZ~`8CqX#=Eod9@6`K^d6Gd-b1bbr|=?HafA=29!erEG|j&t zOhV2f*#*BoA~Q4hLi#~HXJxIgn6ryibPaH&xCPl0w9lnjTZr0%Xf%oJ{0G1RkUorj zxAexoFlTQj+b~i?|C!N8Mj+~o*=eZ9fb<}V-u|kqKH727&AqSmvw?rPPg)x{sjCy= z9>9)FqTXDRVs#_y3F=WvtRT`Ue00Ny9mxq?S}M#dJfB4Z83-MVB8Tzd9iHOqGw3fKiK_B<#)ouVej7rPG9NW z$ahPJe>6saNn@2o z8rHxN#r}bkroIR&=G_#xu&K|k^sX~;;Tvv=~$`nuMw`lRyY zx1+8Al8WSNU=K@rL%)rtNX7oND;s`RLoJH^o7zugg{V`{qz;+A5;!pxDeftww;eT)Jl<@LkD8{oF@%895744O?nA zu^=x?X0b2@YuOeo_e*qATzXv#UI!#Mfd7?D0uFU}V0P0=RDpWNl z*%Mhw-I%r_*sdnnSb1i4iQSR9hUC%o%yUhEzROL3d>OVi_K5*f-!M3KO>bz;eo5V$ z-ESN$r=VMPFam7B?g{~(Z)$zMZ1zfBtMn$|#z9h7wb!a10UMSgFekVLY>qZq=b>~t z@_Qip7=SA#-)@SE-crr%;@|qsRQxpO9Oa8(C-2Mn601~x5flT~NpS!Kw-0sCwAXHz zknQ9m@KdI-QS>_0X!HDUwBy)?BgKA-?ekG2#)E$~DEU+9cO0c$>tA~V{Zoa0A?cT4 zR)E7J?b#7{J0%>;{M`h_@LZvI6SVVAlbwvvyD#s;sS|jWn4_2FyFihuH)^MHaCF-f z+`bsbR6e@p!AWioj&e4fkd2SL$U`zTI$U;XT$Yb+ zxx12^-KD!O%vs4A2yfzCCJh;VFBOl%J@FX{f$A;*_Fi89#>0x+eY8=ZNRx$&^T$Zun#az~O zUl1LX3v9)!Ih8GFKWl+Om^Z6}PPOqmq}No? zhW86Z!#th(&}dQi$py+6gY4BnJKq$>dv^-1eig7BuRv56D{~o<;&jG#4|j7_JMi&D z%Y0ZVjejt1W7{z72*z`*^C20R-D6ER0gp!{cLO^rc?3fD$ZSPT%NEs-3H7y$^F2N zN*;qS+hnL2le~RsyvFs?g4xy>=99gOMvJmfQa#Q#D>8OD+Y0@TLZ4?_p?|8-=hyZzIHf zHPGvk-zD|s2zIq3#sA59$<;bR9)#+|99F^<}+EK}PWF`6#^=NXsj-@rw{}P+#qd92|pPOm;D9R@@ zNU-@3aJECLnw|We6ui>sA)tF6K}d44?U3D(?S%A2HaXdcw}I(YdN1HqWG z&BR0FJ#P+CCF+a*Z?yZ>js(MllY0oZBu~rO`CcZHwoFnip+DuSTAE8V}3YYQ6MkU7WLA(*jLkQoPLywdO6f++aCKeDzg8jd8xO9WpG6--FBBAe>sp;F_MAMYf? zr>gmR9b!eJjZ^5dSW%uZ8`QlCoD$N`-x2tH)2;qC;7sq;>S9XVM5MUf19T9DVNNwNNwh|C_q_g=43G;`r(6?`ezn z6Q3IXczCk)iLoP}Iyw8{AFSTS^9TwDW9cQ}p$6JKYPMr=#V_sWa6di|nD}FU+1geWd!!WwH9}vGlQz zotisRJ5`pt21?J>eT7k>a|!nI2uYn6H5$Ic=r{-9kA+h z6c3-m`_I)5q3~B?;S(q3j!#y9GZsF6`t+&O)&Cd^Bd1QBoMmGCFR}QUV>E#tcqbP; zg2!U@fmr(F@sr0-pI`=@IC*TENqM^ZRI8$Tsij=~fmj?qac1_%PE8)KzS3F_1N5tn zER_FkOS#&~jw5&BXO7dl7tS21e)vEpZxlh z!s`9aDTHYMxVCxebKy*?uhnJFsALU8z* zAb9qOr}wGB>QY_&%(0WlUZkVf>hkCd$EJ^;4j%sJ`%jELdnAjhu3GXeUHt5^7p9I^ z{k7y%Um!{pjU+b)K1!yLymEpO|G99I57hXNVe$)lZkDkmY_cNJfv(j-8mDj*0Kr zg6P2U&!0YiW{TdN4Tf!RH_+gzlgI1k2kEq*!V+3NkjE4vRJJ2^Rhyc!4+ll>_#M2B07 zM}|qCzn@fer22zTDxNj*{(O`VzcBfU6VsuazJ}z??6KLGNC+N_;Hk>1<_RtX@1;~< zIZwgnE9XyzLcDTbNPM_*p7v6Chi=p)5$(LTpq6@8;)~~c)TK}}c(xvqo zuBIsx^6D*ID4weRuMbt#KlotFRsHqQg!-z!6bi9zeOG6&w~MOhOG(-bTx=0Gdx7(1{7~axh?edJ{%T~?Uf_Q#i`D-b zOK~so1N8;py}%DgKIDcYCW|B07i)FBJ@7V|v|ne0_IOdv+k^R*a(F`~#&Jod?ZLHZ zQwpn_QRc;_`t`_v%)Ie`M84iO{ENC2HVThpq24w;6ECWaZuOm!4cms_RbOk}HuTi; zuxkgvmZL3P>*I>4zN;w2X0{5dnOKe^8^Tn7;0aOi{M&_R z*!I^=_?JPRH!)B1xY!*^+QfWsUCuiecBb1!)t75Yvx)gLwWQd@{Eg&BW2?Vc6hiY} z`L0;+DB8Hi`3jPHi}M%5=7HT#wHdg2i}UZBLU{i|xurP~b_>lGXEtsq>Mf4{gFbC) zj#MufrRrQPxW)N$VCyZ;Uup`~UkiM_#rdBoge}h9AkABxUtp&|9rYIHFO;RQ8~F!8 z(z3<*4?(nji}OJ~pnr0UGaRJbw>S&sX&$NmE=Jq7IR7i6w8i;;wil7F`e8@n1p1WH zxZC-2O2cmF^gD8-n2V1*%O>df+-&tP-i#zWX{9%~^fN9Sj@ zl`n;Iou8_w@J*vreS0W)L3>}|>ft!r6sn(q4VFbPuB%^Gv zP9K{+af+SUFKm-kzZ3+VDtAt2g2_MGCaL~)Enp)Y`Y(<6JJ?~oc>0s4kG>W>$quwec<&m>bA4gPIWuKL-EB<1L-mrlQM zJYIXl2gOM-cI@2-*O^Y>Qzz@`_=APesG&6)V=h*|FAPLI z?4d6|7bGns`$vOl`^bJZNVkuyAM(9;di%(BmVLnk#cksiD*iwr%p?1wg>d`GUMl+J zNHx=p?4N?ocgE|X5br*}n)q<{`DHfb#WUqUQ5WlH%D<{@x~Fum{9(Wo_&*&#*fk%d zTp3gPhYLwa>0c@YbxQw(t)l907iHGyNhjR@T*yMQ9b%HEs?hNdx4=`?{$JvM`FtQ| zrlkJXTXK;Y$t%>dqpam4MWN+l;`KARwOma8V4(;XlS!6Gvdk9~A1;)_P_w7>eN3CD zs@`9(sz3YD|Nkt+-7Kw;J>LnF7uAvKe=m#GKPyXNs()8lBrR*~M}lbk8ao-J+t=97 z2I)6hW4|0-!?hr1PoD^+l$zJrzbJ&?c#XY>HBo0zzdn%H*b8Z0@zKo5#D_KZvDP)_ zlXVwWy~h54wrP$1eRShIQ~ig~kItU@LUkYJ(1|lI9h*k#&GgubFC4G_1I*zQCnryR zsd_WF!-J=fed*ZecoMgp0@I(5GpcvOKKs(?GkhNKeX>5VRQ^L0SYe|tf1w(H9Z$FW zpQdnR{Nr=8gU4o%RcoqJ;hzM%5H{|b4jr3*>G+xIUm^eGv(+Evsu7!5{VMF>@tN7F z>RsGtj=sQWNGGc^nXUI+{{^>`;|zQ}gOASgZ?qWV{$c#t)2Ggy;U+bTep%5cPQCEb8I#hB$D{Q3ac z3jP!~GvjQ3XQuc(qf~Tr2QvO+r%I78f*PmqPJHeJTg|$)&vWxZTaF)_Jsx`~#{D~r z`6!L2tS^`HPjQDbe(+>&&~?k7NzLo$F2&M;<3Gue&Bjo^_GSFQ@tI?%d1M|%f29i% z`~A-o7>E9CYzk7G--J*KedsLk`{lZJroKUQ6xkc7u z{sY~ZkDNX=bNqDbk3X+y^!PN7z8SA)r;i`2H<-`8w^X!*`PVI~SnIj>*^+u4MA7r_ zS2TTsZurdcGiUhVA`hPd2`e9hq|LyIPXHT8_ zi4(`GzmJ?{=4Tbvr4JZ0uz$K2)(161Cr-|uss5$KG43)`PgMUN$q`!r1t;2Qcr;$U z@B6W875zO$b-pEW!ITlSiP7>u);x;P--Q(#ag~ORs)Ia-D724X_N>KtDE1 z&~*HE{RWBSFCVO@gL=|2OnD3(1y{g0m;mYcX8If08gq+t*hAv;T-*02>0)FAElb9XQ zbo{5P$1mYokDKZ{z1#po*urK^l z*?F$F7omRFEFIsf-93Huuj94D8!sIf)B(rSF`2mVK4KL*LZ;wrCyIy&*`0$~m@r<_C1sV>@YpYB7q4*I}e&<%P)I{st* zSEic|dq@YbJ>>AIZsNp71qz;621KK3hZtKX5dvCZE|zYkmOlYjDDL$(fFGxmXB z6Vv7jbQ7fGTeWL{Yy4_hiZ@2tc#TLp_X@AdBzNY~FE_+F3>e>t}S2DsJ^gMC2$9uxx0nV>*+o4NW1z-es{6) zX9t_$4(J9~fc{?BlmCNn;(s06-;V!1{H)(~rN3+HCitzkBl-Dzlw~jkE`R|r2=;=0 z&;xowJLmvk@BF6e%Nfwmns!|;!u!Sbb5K9HPsbv%HE@&M@Ib&{H%~zQLilxX16%>u zKsu7&I<_0YYw{X+gpKkcW$*VN)z|A`sMqdv459O*^m%gYMc^0K{W|$YWYhA{ z3m_fIegNG#*aP-~MQnCM(~<1PkZIQswCe?Z;Op5Z{TA`svAYF*1UA4;unw+(Rp8@? zC9n+Av4Kz6hj@JjkGNJm1|8rbc!a(kx_v*B{Jh@Z0gE79=b;zDcKcMmjZXV3K>Jm& z2HZ30myTqg^t0%^j*WmBuorl3>jizl{ZJ3+1baX_u5%r~4Se*`%k};a^e#w;U+rE5 zyXtGpCfCI-u7SItLtqKr8c4@=_#0r0=K+tw1Mm=BX&vsju7V}70y@~^EJ7=2JJ_O*$KWow4{id#h@FoAue76$b7=>?obwPEryqSg z{2+7;q~lw)o59CV*HgSXVj1rovKgpf^_vIj*lxd!ZtNS_-KzB~&{gpD;_W5IAlL=^ zz!tV0&ThFe5OE(H$yDr zO@V1({7I<$xibECzaeZ!zzTNdelOXn9|pH-{VH?~q$An&VzUo)fFAGwn|A0O=slqS zZLr;c6`M8SoS6g<;qS4JTZcXX>G)RduHdr?QoL)#GTtV*3XH!2y#+1fZ}(fmW(90v zw+Kx~vQxhddVu=0uib9vp7tU*3g*E8m;imCAL!o;w);OoX70Gd!^F-m_Il)&bzn}J zCcn(tSHRrj*H_YUy_RdY7rS(PJ-P3UH%+IN9&p#L6dI(n(Y_EcT1?b%-caBcUk z%H7)=cO7^ht6&Z2zXHsggX}u=CiE6a$9DTI zbZg(ht{0v9$Hw>ub{EhsfhlkvjDSfn2!=sF7yx}>FZg=#&N4RXTI1YE$Jdju*7irS z)!tX$PXMn~W6*TmpuCszS)g4%7y#+;CG_f*?QCJ*@YycfcH&2NU2ZXai%wd+7@5bLuVm`uKl3UPoQu_I9NDyzd?aSGj*(<$iAs zx(@vRF00UVe5-ad_+11KK!yJu=zZX`_1j<(_@7?V(Sc1r7zBQsAsx%`*1x@7N$;F+ zF5jf@9)j!O2G{_bU>`c4S)?P`uOeFm6JQw}#cmjy4%gZgxD8xC&beD)1zZQ|kXP4^ zZ-@S%4d}B4^f5*{lxdUZoj$#_k1^75p1!#RCK!u(;Ip-H;61wc?AOr^K+}=z)BXE> z`po-x`~P;)pFPTf&+n#ypE(=_eZbEn(jl+Tu~-Bbfd4T?AD^@6V~lht)8;z30rc4b z`jq3@$-Qki@ZSGE*aTOB_vGH=kE8P*I~~dX0y6Kn2Z8tfXR+H0O~)n5i{K`>1=90? zCHSi#9rEfbeA~bly!YGsJOn<2Fh)9*X`^iq&{p4c%yMsf*85ZL;d~yx)qxGT4;}#T zW$!`Lk?e0Hy92x@zX@&|2bzvMl<$I0WP89a;QjYKWZpNYLtfnw7zW61nb}mI0sfiI^@;e2M>Vvz}^$<6oQF2fWYmo+91f%)>8(bjYi_3+{p2;11B|Ch*?L80k=^ zjkfL7r>(x}@Lv2V@N4DnQ*T4V9vJHW_!7En>gpreZy?(QGr+y~hH;?j*ra?Fcz^sD zJOth!UjyDBr$b&{55B#i3v>g0I-&X)BOS`L@m_u$=rauTF-AHzxF@&<=G-s3Hw3d_ z3QPm7+yP_gu0zw2>^G5J1#{pEn8$7k znvM<1o8S@H0uR7La24DG>5x~~jc*Uw1G<1dyP^6RBOS`L83z+UpCO=+G1B3eRMx=0 z_hJk7f_~5o`oIlzd!Xq^_I`tQH`wf^4Z=9kbhN{FfFUpp2EZWL4f;VkAmL2SV~@QshF!1qQDp<9HeBiYX* z^W}^Ez!x9-ZbV;Nn2vLl&x32g*AZ@ltH8G+`uf6j$g6t;a;_l)@}GG7~(jt%|5 zBj5|c9)O3ymyr1av2@6*>&Dj?gZVzOE})NZ4%5dN=}@N42p9wU3;}(Nkq%!1H34S( z=|eCDX23X@07ub{LDS)Dp7u~40wcgzJ`I9&B>ix$AE@>H(0zrSugo&eH?#94K-1vD z@1y^~IpE8H=7Fyinn5=OO^2@n>Y;oTOafo;GXc`ET|ZvyN1$V101Sb2JlqyF~8Jos@^c1n2@oARS3RUh4;-gPG zrNgq{cksIpcM5rL8{-S+z&YS^7WpAC4F-VEanf-G{u*d|6a5Vy*ZfWB7VtU34Ui7y z=~<2cwe~K!SLpW~+(u>>fPYSmWj>}CmRNg=onLz_aXX{oeA^dN7O+?zj;V~smo$Odyr`6R_uwvDY?(=>A-1m2H((UZ* zIp@v$exBd&`Tu*K_qlKGeSc4J#Gv@2949zVa~$J1&JjZ^X*)Q!a7=KFhig4ADRIOg z*7K819D0jq3N|zAICOnPI-K<#i^IAOLGk)7#z~Gd9LG6MaKz9~nof=# z9FrUq;aYE3+{SSm$0m*#6kp;P=g@a1V$k;)_i=R2CLPBSt~YX?;;ipI9^g305ySsg zU$4N^|J#@FnST>U42Ow3&M}L)Iurje*LyimzY5Jcq~&~qL;p{o(iz#~{}27T3t4wK z^!l$&91FPCXZaZP9HE_~jkr$9IhJtj2zvdT^@_7{XdK-g;Kup`ju<0D0TG(;&mX6-D3lTxhn>8Nu#L0YqURU%xxYfKYuQbcuDwCYz3sq zM)HHw_ZP*%QqnlU5Al*l_j}>SUI0-cryp1}UVro2M!w*!diu+O+_=|IyGHo&Y~u9e z^&LHAPu5*S13eVWTZ$TeHr=D6Nn=l8Xh>fucR6)szo%%-<-5oF$V0zhK+j`wtebo? z9?%!XqiT2eNdB%!dh=Dh?j0db1o|^x^4_p`Nyeqk#Vq4cY5_iMJ3KrubpeHE6Q&Iy$STRu*bPA zJsoWvFP%MGklyL7ei1!7gWfvi%p;fIk!?(1Chrz1qPmc^%M1HWZsE}SuKYT;d*j{^ z3nfmv3b%8d4dw3nQ#Q#wEICPBR8@K%cXGTO^mg6n9|Ub8PUWf`wL#%`IrJP;Y0jW` z=5i(+*D*ioQRU>r98qsBcl^01Ee`Ev-n;yyH^HI0D*cKFI2cH?9+b=dsL^XjuN^(z zbYjq@j*oN1{2C^y+XBk{5|JUOOa*O1qF(DQHA(9;zTQsApP2P0gPz*kj$S)@4aTsd z-d`ELO#?N_rXTwa5790}z0X6GTl_uF$Iv^5o^JT8jV?sJ1CZj>_sL08FlbSxsCYfa zwbn1`%|dV1IrI)AS9_&58@<`*(EBcOjfM2;(5pkQfrPRH1(mBle2ydLx9EkMWYG&% z8>*oDBcnIG(AVc@;Ui@F;rbbC=VR;FTy#KZXVl;XZN4?*w();YoN%Hjk zD9!Y)uG0JPYtBm==EquOdTmvD4_tFzav>Y-7-G)rtMvAaotLy;6tyyYd2i5*{deLc z=OriBWO~X^ht@ltV>rU@^=~zpAw=0|mEIrkuT9pOe@I8Y4_E1Z|2wrw!;+X=R+g%4 z%p>_lE&hOGCdlHY&YF`koP6c1qO|EaI({S4y{2pzo!~!CEvV^$Pi+Fk?pzp zL!N3wsk&b%)P|CEU-0Zp(E9J$&rYrLp8d{K>$zudI9j(o``M-S*|WEHt;3$x3cucZ zW*0`#x~fp??ihak^z2tqt&^U$;xdmX-3fia+GyQVsC6rdU*9~d=aNM0m_n_-tw+#$ zrBIt(?9Ogoa_kpGtv?F2$y|5VI^+3Lch-91*$;r$4bR*}2wEQ$unc$BI^cPpJI6n@ z$*bd~JJ;$-zX`R8nMlOfCa*P8@$0JC7_8G@P$gej#Tc3iwQg6DMbuX86ja`uoCQVu zk>$!l;&^DKS4(66CiJhkeUd*ec)9LBKGZvT>@RY1`E8sGV)BzkMLsX&Uo>)+ulubJ zbuN9h2i;L5Z>y5GmCL^{@gwF_&q`i6s~(BtU6Wku>USuNXRP1&q}Nw_ujDdvtlxGc zUyXb>4I6#Zz=HL&C=--mgL z?(Z?Ey(({NGRDkFJ{NdD=UCo}FkdvDUnG9ZpY!1($RFjr2VTJ<7WJndB+>;x-f{lv z+p;R}c$K_$cTlH4B|l?WHQ!UNw3i<=Ecy0_D$^e{EcubYu9P?I$yoAjf0MDw-)~s* zr_A^t3cLwH4fgtNxak!870zPmca-hR+xNq!|BoOSd;NLIQFxDGrT42A7s>TN z$LqKT!3E#HTOO(8x;vDM!o{wfomKMj@_1h4>f1v7eem^f)6LZdU;n+P{wIkS$NIC) zNcI^%1MfGioMcNrEOcMCiWJ+kx2!NHxsU{6J>ZJ=RR86e!nb!xRr?lK$+uRuZ~U<= zz3RQgufd<%5PLKV?|;KW$j@#ow$8ibMa<4_Y5`@cmh5RPX_*!^uNOz8~6+G3MTmq&Psof^Ee+y^srX^H0QeS zW%3`v?ayZN)9|zZ%K94gFJN7r{rzk{%!9Wa2rr zW=Qt&4)~}B+w8gMWx=ruYbHVT5X8k;1u$S3} zrP*Rw`K>T4`7XnfA22L=lWrm|czbC!EcxjUI@tx^-r27R$o;W6Lwna(rQcq~6Q+Ht z&(11&@{5?iug`45s?R>dO26N*h{>`}?#{ zta3EoJJeoW!bJWHc$VQWz_Sg11+Fu!k|$07eM9+$P_~!TF^2U@a(FMNxW4Q*a^-iR zsz3Ku$@f+DM?LlN!H?&-jNgTY$q#0z&*Q&}a&NyazpmuE!PuXEztdJF-&MuqrvHCJ zdEz>*1>W=bQQ{r+U59(gk1tLsk88%H)561~!D4 z|9X@D669j3#qnq}THh^K0CXlEt^f+b_UBNRaEFXGiOB5)%01aC3c@ z{xk5@C0Tm?!>o9Dmi{^TaULqg^!f+e+}G8(FMO-K%UO6Qxam)X{FlKEZ>n)G7?HdK zUcZ?2HOPD6?QhA_e+Zs^WtM&yykl9G{!8$ok0IK}psCLXkc%f#Qu~yCtFe#!k=L;)+7{&d;T`a< zz)!SOK*i+-;vpi+P`<5{wmB#)*;`q-uro0|8&D! z;JHY}?}rbezmFthjlb9j-=E{?N0waaBi~2*lkf^6V*f9GXC{~a62qTHU#xv!)UVr6 zslUkZW9W-Fnfy;K|AJgRp9tCC^YC0Af=1RCxtk2ngF6g2!u^I51%run#y^W4-M{1@8T&}-v;+(_zw2_O9D%?zPw)g^;izre3+N~6Zwl9 zoW8%G+!Ox^!F*AFZ#Dh*4Ehs>e+p;8e||Xlu2?@m{)Y`q(sWBE*VU17{ru&uQe|&zbZ|O_3^MP22S2_7@hV`1h_&ja_y}B0G{$>G5E@nR53`c!EJ?(@0 zLwfOMxMcWVc#GjbglBz~Jz~i3A$Y>b_rvY%4^IU7L0J8#aa8$-;hjeRhwyg(H?fF@ zN&a)VVG?D6STFH8Lj4y9mcO0dCjC5EpSSg87wI>_dyRZ0e86xD$DsD!3r`vO{jfei zFG8mL^dtVmM*aj`denbjl>8a^sFD8wK4JKIxSjfIeUiRj9B|sm_2Y*a7I5+UD!vNV z{#ExQrEi6snJ=5*i`Y-DhwFC%1hwaOc)sBxyx8yul-}?J+-g`p`8o`LUh-i77xO&! z5xCRHzYgaNe;=-Uj`oJ}d>%f)=l3P9eskQ*4T?tp)vrSLN%|z{FNHOK)!sLpHz#=; ze2>xB3kkLv?uT>iFPlUDn_)dqS`k<;G1y`B{{)^i{1CjyuwIhj_WP{67g38R;QdDa zGkyvgX_3=bMk z;qA=Ve$uPIimzz-X_ z40oU5%i+fjUkM*Fd>!0yfIbcFT?6a$vhV+S$vfdAM!yF>W_S!fX?P2K#_-4BjbEV; zYkmJb2+#f`m3Q^0uJByLPr|z2E>Qn4{|>?N|0frn*N}V{USRZp0xvOq25vDthX*q| z!u?+3dl@{=c+aQ&i?EMHu9OLH-cjZ{%Nw^?C5wFdpB4^?corM?>;0xMcK?!+M^&Kjil-ILG=E=UWYv zw2Ah|@q7im#iWwWM}>bEzf z-wIC|{rjZKd5eEc5V{%E%TKMx-@`TY`Z zVLfRJ`meZz`aP2AUjpm-SM1-{!zWDoD_}j(mpy6zUk9Hy@(x(fAGQYhd*E500vspF z5L|C~3q0TO1iaYr1900h%4FWFywAbSM*cY5YWUldoBRJUcsKUGK;<*PPQe{Uf7V>? zuZAy%cT#`tk5%4l;hd2-!9~NZupN)pO3!?Y_IE41?`*ao9CC8<2>IU&>-k;m&k6V* zlm92-ZH7MsPn!JYDCRWd7su=C@D8K@47`{2MEm$5tpA7Y4fE}%lAq4z&&%+nNnd{{ z_iMw8;QfYM;Dd%&!%rE$1-A3yz3?gQFSdUK*8f)yh5q;h_*s+w6Y!xYu-PF0BCO|? z?Sa1r$ImMo-+zW4!#vS?p&Na!9uxcrjj&)|cMXLHE^Q?UO3dxmvR z_1_K0|KDHCF6h&6-6YBcwfD=Cf0H$j=Md6Q7UhyfT}cmaSkt~C+_vB$4=`>LDMjx`%LrYVpsqh?ykW!#~Xh~)2^}cgs+Mg2lJ(Tu5o!wQ`5{! zslKV|zj>PSwNgB3x-WmGxv`<4%_K3D>I<%ws-?RI@^@32F}+SXxq&ac4kp1#)UCV$ z8efZedhyQv620O$$pt5byk%S71odUs!Y~>14CT7~-@A0J@2n=hrLuTvb1Juu>4<-` zHI4^YZMb#gs`kdEO-qyB0UXVcps{)BvTJ#paW}8mCQF@CaxbK%f;(5n6uSmnro}W@ z#*FlJFTHwN)UxSXymHwU*C$UnDsTDnVkXN~3*|Ob)UuYSw)C2^o{!8jbM+Y>8#4L3 zC|r@2Oq_D+DSIR;C#s5aiLy9XymQjq*EKZMmGtqNeCM#tVdJu8S79C@PNe!4y6+gp zSo%hKarNXb(jNTt^~gmLb+bifN2Z6%i+BW#nDmRD)wVrc|Zx zL>Tn{Ai})PkqEo0mXOuCN|NXtB?Zw8B?Za!lKRixCMTM?q$rwRQk2Y4lIk#X@AZf3 z&Cq*MG($<}Y*Uz!GY*uO&D^T8Yw?fBehp*Kk>wMjY;n;okOAo83ZiKgw(EYlfceXiw^$#luKDY+9b)upn-1$V#FD0r>Wgljs8-_8u&H9Bxr zI(p|oG3C06`wKpbNBakQOJPH|dR?3Lb2oO}wDS6n^rjnb*sywIy7Bsz9jmp=tJs0% zDkJ<3F>QPIy6e}jS(WG~Lt)p5d#Yi%v%Qfq#w$e6ooVpUiAM?NdPLq2ga4RL`TxZi z3V%aP@U4gsmy{TJ5pnL)c+QyYwL|2YgVpGmo+vskn8ey2RC0S9+#<`y7^w{Uzn<-a0Z+$`1}FopSl(ecasO>}521dR)VOeLUS*h%S1a z!*R-WZZ%WtK;O91U9WK89vHUOOw+D>SNA|VHhj14$vwqlS{!LYW7Vqks>bD%g8%Yz zb{)9$7%OgIGtR~{x|+ldPjFyLyP|7g=W|1YURLw_-PCz9!RrTm^ZYt(Zb{Tp=*opG z@S#{J6~;Hq;fkBfc%A7kbdBVKUlLlAeF~6$y#229=6s)~=7@8t$`7%89@$*)hfp~of-{qNjO8Uu(UI-qHl^x{*d zV!&y!OCgW8=}mVJN4x36XT9t2=xwB<&=$OpliF7Ikqniq%8ig~1%ok%$YPsxv$38&O&_BC=gNZKS7v#FkXyBuHbOFZr>P z$IfgbxvimFghPVp1BVjI4sTtZvov1)CVDJ-R8p_Fj#s@lcvtUkQrS$rMLA!|a%nYM z%CR#Z8_nmuzo)gqoy~wVP2=Z_-zRdHq0=kvCp8OJ?`S@MXJzYUZ?Sr5$}b`PV!>P} z?|=v0G}RV*csM`kYQd_JXOBNNOr@OLB=1a#X0_#q3aNZ)r7{WTmtPPDo%zseJXLk| z^rtwf&ucj3&X}c7-j9nTc{x*Z9h$lRWj32df)sr8sAz$P83$UnWVeX9e9BIRLpDUZ z)w+{=h!$u5;Lxk2=-|1UrL@%1lcRnt0j{kpS=d8cLm@IH9CVJ1-~tHSt(wCc%dA}K zcCO>oj`vX%%8&Pnkl~tPmQ$Wcs7ic1=QEORB5A^^qB%jA`n#PjMhj{9#E;S%Jw_@dzi7VXX8Dco``A3J=NHr5 z@v2Mm?OH!p^7kH`^~ydi z^;Dbt6s`?~8keqR{*P=<-SSn=&F&|hRusoU&;WV2hc4@l1#j@l=wLoyaf8dU)TYqw z2%LF3f0b+9Qv|x-uQ|G94HYU)#7)PxJWmYbHq0g8=yvFuxn|{&ZgH$MYKKA-hIK1f z7^}Enm5q~iIxdvjIk<6K#eDXLNQ_1yG_Kqhb?~Z{1?-0_<9Lj6FjrgrSgE%q9o7Rs zB_>%M3Gc%(4sTzcCn@StRQ&kJWxN}sa-!62m+qRu7)OU^GSF~C=4qksFjq zNFUl8Y7v?oO}o6WV{e2T#e_W0u?4{x%FBe@x!Hcye5)AXGE{6im(por%UM||mwuFm zuyWs&A0Ma~&roS~ma751$w-9Zix%%JC)gYc7#|9$p27Krw7jXd4RTBT==2VD%TuEL YbmBgZxB+(0-25DglhOC8yTc~`4Maz', and */ - /* contains system-specific files that are always included first when */ - /* building the library. */ + /* The build directory is usually `builds/', and contains */ + /* system-specific files that are always included first when building */ + /* the library. */ /* */ - /* This ANSI version should stay in `include/freetype/config'. */ + /* This ANSI version should stay in `include/config/'. */ /* */ /*************************************************************************/ @@ -53,7 +53,7 @@ FT_BEGIN_HEADER /* These macros can be toggled to suit a specific system. The current */ /* ones are defaults used to compile FreeType in an ANSI C environment */ /* (16bit compilers are also supported). Copy this file to your own */ - /* `freetype/builds/' directory, and edit it to port the engine. */ + /* `builds/' directory, and edit it to port the engine. */ /* */ /*************************************************************************/ @@ -200,6 +200,30 @@ FT_BEGIN_HEADER /* */ typedef unsigned XXX FT_UInt32; + + /*************************************************************************/ + /* */ + /* */ + /* FT_Int64 */ + /* */ + /* A typedef for a 64bit signed integer type. The size depends on */ + /* the configuration. Only defined if there is real 64bit support; */ + /* otherwise, it gets emulated with a structure (if necessary). */ + /* */ + typedef signed XXX FT_Int64; + + + /*************************************************************************/ + /* */ + /* */ + /* FT_UInt64 */ + /* */ + /* A typedef for a 64bit unsigned integer type. The size depends on */ + /* the configuration. Only defined if there is real 64bit support; */ + /* otherwise, it gets emulated with a structure (if necessary). */ + /* */ + typedef unsigned XXX FT_UInt64; + /* */ #endif @@ -239,13 +263,24 @@ FT_BEGIN_HEADER /* FT_LONG64 must be defined if a 64-bit type is available */ #define FT_LONG64 -#define FT_INT64 long +#define FT_INT64 long +#define FT_UINT64 unsigned long -#elif defined( _MSC_VER ) && _MSC_VER >= 900 /* Visual C++ (and Intel C++) */ + /*************************************************************************/ + /* */ + /* A 64-bit data type may create compilation problems if you compile */ + /* in strict ANSI mode. To avoid them, we disable other 64-bit data */ + /* types if __STDC__ is defined. You can however ignore this rule */ + /* by defining the FT_CONFIG_OPTION_FORCE_INT64 configuration macro. */ + /* */ +#elif !defined( __STDC__ ) || defined( FT_CONFIG_OPTION_FORCE_INT64 ) + +#if defined( _MSC_VER ) && _MSC_VER >= 900 /* Visual C++ (and Intel C++) */ /* this compiler provides the __int64 type */ #define FT_LONG64 -#define FT_INT64 __int64 +#define FT_INT64 __int64 +#define FT_UINT64 unsigned __int64 #elif defined( __BORLANDC__ ) /* Borland C++ */ @@ -254,7 +289,8 @@ FT_BEGIN_HEADER /* this compiler provides the __int64 type */ #define FT_LONG64 -#define FT_INT64 __int64 +#define FT_INT64 __int64 +#define FT_UINT64 unsigned __int64 #elif defined( __WATCOMC__ ) /* Watcom C++ */ @@ -263,35 +299,24 @@ FT_BEGIN_HEADER #elif defined( __MWERKS__ ) /* Metrowerks CodeWarrior */ #define FT_LONG64 -#define FT_INT64 long long int +#define FT_INT64 long long int +#define FT_UINT64 unsigned long long int #elif defined( __GNUC__ ) /* GCC provides the `long long' type */ #define FT_LONG64 -#define FT_INT64 long long int - -#endif /* FT_SIZEOF_LONG == (64 / FT_CHAR_BIT) */ - - - /*************************************************************************/ - /* */ - /* A 64-bit data type will create compilation problems if you compile */ - /* in strict ANSI mode. To avoid them, we disable its use if __STDC__ */ - /* is defined. You can however ignore this rule by defining the */ - /* FT_CONFIG_OPTION_FORCE_INT64 configuration macro. */ - /* */ -#if defined( FT_LONG64 ) && !defined( FT_CONFIG_OPTION_FORCE_INT64 ) +#define FT_INT64 long long int +#define FT_UINT64 unsigned long long int -#ifdef __STDC__ - - /* undefine the 64-bit macros in strict ANSI compilation mode */ -#undef FT_LONG64 -#undef FT_INT64 +#endif /* _MSC_VER */ -#endif /* __STDC__ */ +#endif /* FT_SIZEOF_LONG == (64 / FT_CHAR_BIT) */ -#endif /* FT_LONG64 && !FT_CONFIG_OPTION_FORCE_INT64 */ +#ifdef FT_LONG64 + typedef FT_INT64 FT_Int64; + typedef FT_UINT64 FT_UInt64; +#endif #define FT_BEGIN_STMNT do { @@ -299,147 +324,6 @@ FT_BEGIN_HEADER #define FT_DUMMY_STMNT FT_BEGIN_STMNT FT_END_STMNT -#ifndef FT_CONFIG_OPTION_NO_ASSEMBLER - /* Provide assembler fragments for performance-critical functions. */ - /* These must be defined `static __inline__' with GCC. */ - -#if defined( __CC_ARM ) || defined( __ARMCC__ ) /* RVCT */ -#define FT_MULFIX_ASSEMBLER FT_MulFix_arm - - /* documentation is in freetype.h */ - - static __inline FT_Int32 - FT_MulFix_arm( FT_Int32 a, - FT_Int32 b ) - { - register FT_Int32 t, t2; - - - __asm - { - smull t2, t, b, a /* (lo=t2,hi=t) = a*b */ - mov a, t, asr #31 /* a = (hi >> 31) */ - add a, a, #0x8000 /* a += 0x8000 */ - adds t2, t2, a /* t2 += a */ - adc t, t, #0 /* t += carry */ - mov a, t2, lsr #16 /* a = t2 >> 16 */ - orr a, a, t, lsl #16 /* a |= t << 16 */ - } - return a; - } - -#endif /* __CC_ARM || __ARMCC__ */ - - -#ifdef __GNUC__ - -#if defined( __arm__ ) && !defined( __thumb__ ) && \ - !( defined( __CC_ARM ) || defined( __ARMCC__ ) ) -#define FT_MULFIX_ASSEMBLER FT_MulFix_arm - - /* documentation is in freetype.h */ - - static __inline__ FT_Int32 - FT_MulFix_arm( FT_Int32 a, - FT_Int32 b ) - { - register FT_Int32 t, t2; - - - __asm__ __volatile__ ( - "smull %1, %2, %4, %3\n\t" /* (lo=%1,hi=%2) = a*b */ - "mov %0, %2, asr #31\n\t" /* %0 = (hi >> 31) */ - "add %0, %0, #0x8000\n\t" /* %0 += 0x8000 */ - "adds %1, %1, %0\n\t" /* %1 += %0 */ - "adc %2, %2, #0\n\t" /* %2 += carry */ - "mov %0, %1, lsr #16\n\t" /* %0 = %1 >> 16 */ - "orr %0, %0, %2, lsl #16\n\t" /* %0 |= %2 << 16 */ - : "=r"(a), "=&r"(t2), "=&r"(t) - : "r"(a), "r"(b) ); - return a; - } - -#endif /* __arm__ && !__thumb__ && !( __CC_ARM || __ARMCC__ ) */ - -#if defined( __i386__ ) -#define FT_MULFIX_ASSEMBLER FT_MulFix_i386 - - /* documentation is in freetype.h */ - - static __inline__ FT_Int32 - FT_MulFix_i386( FT_Int32 a, - FT_Int32 b ) - { - register FT_Int32 result; - - - __asm__ __volatile__ ( - "imul %%edx\n" - "movl %%edx, %%ecx\n" - "sarl $31, %%ecx\n" - "addl $0x8000, %%ecx\n" - "addl %%ecx, %%eax\n" - "adcl $0, %%edx\n" - "shrl $16, %%eax\n" - "shll $16, %%edx\n" - "addl %%edx, %%eax\n" - : "=a"(result), "=d"(b) - : "a"(a), "d"(b) - : "%ecx", "cc" ); - return result; - } - -#endif /* i386 */ - -#endif /* __GNUC__ */ - - -#ifdef _MSC_VER /* Visual C++ */ - -#ifdef _M_IX86 - -#define FT_MULFIX_ASSEMBLER FT_MulFix_i386 - - /* documentation is in freetype.h */ - - static __inline FT_Int32 - FT_MulFix_i386( FT_Int32 a, - FT_Int32 b ) - { - register FT_Int32 result; - - __asm - { - mov eax, a - mov edx, b - imul edx - mov ecx, edx - sar ecx, 31 - add ecx, 8000h - add eax, ecx - adc edx, 0 - shr eax, 16 - shl edx, 16 - add eax, edx - mov result, eax - } - return result; - } - -#endif /* _M_IX86 */ - -#endif /* _MSC_VER */ - -#endif /* !FT_CONFIG_OPTION_NO_ASSEMBLER */ - - -#ifdef FT_CONFIG_OPTION_INLINE_MULFIX -#ifdef FT_MULFIX_ASSEMBLER -#define FT_MULFIX_INLINED FT_MULFIX_ASSEMBLER -#endif -#endif - - #ifdef FT_MAKE_OPTION_SINGLE_OBJECT #define FT_LOCAL( x ) static x @@ -457,6 +341,9 @@ FT_BEGIN_HEADER #endif /* FT_MAKE_OPTION_SINGLE_OBJECT */ +#define FT_LOCAL_ARRAY( x ) extern const x +#define FT_LOCAL_ARRAY_DEF( x ) const x + #ifndef FT_BASE diff --git a/include/freetype/config/ftheader.h b/include/config/ftheader.h similarity index 87% rename from include/freetype/config/ftheader.h rename to include/config/ftheader.h index 2a7b8c4..b623629 100644 --- a/include/freetype/config/ftheader.h +++ b/include/config/ftheader.h @@ -4,7 +4,7 @@ /* */ /* Build macros of the FreeType 2 library. */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010 by */ +/* Copyright 1996-2008, 2010, 2012, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -107,7 +107,7 @@ * */ #ifndef FT_CONFIG_CONFIG_H -#define FT_CONFIG_CONFIG_H +#define FT_CONFIG_CONFIG_H #endif @@ -122,7 +122,7 @@ * */ #ifndef FT_CONFIG_STANDARD_LIBRARY_H -#define FT_CONFIG_STANDARD_LIBRARY_H +#define FT_CONFIG_STANDARD_LIBRARY_H #endif @@ -137,7 +137,7 @@ * */ #ifndef FT_CONFIG_OPTIONS_H -#define FT_CONFIG_OPTIONS_H +#define FT_CONFIG_OPTIONS_H #endif @@ -153,7 +153,7 @@ * */ #ifndef FT_CONFIG_MODULES_H -#define FT_CONFIG_MODULES_H +#define FT_CONFIG_MODULES_H #endif /* */ @@ -170,7 +170,7 @@ * base FreeType~2 API. * */ -#define FT_FREETYPE_H +#define FT_FREETYPE_H /************************************************************************* @@ -185,7 +185,7 @@ * It is included by @FT_FREETYPE_H. * */ -#define FT_ERRORS_H +#define FT_ERRORS_H /************************************************************************* @@ -198,7 +198,7 @@ * list of FreeType~2 module error offsets (and messages). * */ -#define FT_MODULE_ERRORS_H +#define FT_MODULE_ERRORS_H /************************************************************************* @@ -214,7 +214,7 @@ * It is included by @FT_FREETYPE_H. * */ -#define FT_SYSTEM_H +#define FT_SYSTEM_H /************************************************************************* @@ -230,7 +230,7 @@ * It is included by @FT_FREETYPE_H. * */ -#define FT_IMAGE_H +#define FT_IMAGE_H /************************************************************************* @@ -245,7 +245,7 @@ * It is included by @FT_FREETYPE_H. * */ -#define FT_TYPES_H +#define FT_TYPES_H /************************************************************************* @@ -260,7 +260,7 @@ * (Most applications will never need to include this file.) * */ -#define FT_LIST_H +#define FT_LIST_H /************************************************************************* @@ -273,7 +273,7 @@ * scalable outline management API of FreeType~2. * */ -#define FT_OUTLINE_H +#define FT_OUTLINE_H /************************************************************************* @@ -286,7 +286,7 @@ * API which manages multiple @FT_Size objects per face. * */ -#define FT_SIZES_H +#define FT_SIZES_H /************************************************************************* @@ -299,7 +299,7 @@ * module management API of FreeType~2. * */ -#define FT_MODULE_H +#define FT_MODULE_H /************************************************************************* @@ -312,7 +312,46 @@ * renderer module management API of FreeType~2. * */ -#define FT_RENDER_H +#define FT_RENDER_H + + + /************************************************************************* + * + * @macro: + * FT_AUTOHINTER_H + * + * @description: + * A macro used in #include statements to name the file containing + * structures and macros related to the auto-hinting module. + * + */ +#define FT_AUTOHINTER_H + + + /************************************************************************* + * + * @macro: + * FT_CFF_DRIVER_H + * + * @description: + * A macro used in #include statements to name the file containing + * structures and macros related to the CFF driver module. + * + */ +#define FT_CFF_DRIVER_H + + + /************************************************************************* + * + * @macro: + * FT_TRUETYPE_DRIVER_H + * + * @description: + * A macro used in #include statements to name the file containing + * structures and macros related to the TrueType driver module. + * + */ +#define FT_TRUETYPE_DRIVER_H /************************************************************************* @@ -325,7 +364,7 @@ * types and API specific to the Type~1 format. * */ -#define FT_TYPE1_TABLES_H +#define FT_TYPE1_TABLES_H /************************************************************************* @@ -340,7 +379,7 @@ * definitions, taken from the TrueType and OpenType specifications. * */ -#define FT_TRUETYPE_IDS_H +#define FT_TRUETYPE_IDS_H /************************************************************************* @@ -353,7 +392,7 @@ * types and API specific to the TrueType (as well as OpenType) format. * */ -#define FT_TRUETYPE_TABLES_H +#define FT_TRUETYPE_TABLES_H /************************************************************************* @@ -367,7 +406,7 @@ * SFNT-based font formats (i.e., TrueType and OpenType). * */ -#define FT_TRUETYPE_TAGS_H +#define FT_TRUETYPE_TAGS_H /************************************************************************* @@ -381,7 +420,7 @@ * face. * */ -#define FT_BDF_H +#define FT_BDF_H /************************************************************************* @@ -395,7 +434,7 @@ * face. * */ -#define FT_CID_H +#define FT_CID_H /************************************************************************* @@ -408,7 +447,7 @@ * definitions of an API which supports gzip-compressed files. * */ -#define FT_GZIP_H +#define FT_GZIP_H /************************************************************************* @@ -421,7 +460,7 @@ * definitions of an API which supports LZW-compressed files. * */ -#define FT_LZW_H +#define FT_LZW_H /************************************************************************* @@ -434,7 +473,7 @@ * definitions of an API which supports bzip2-compressed files. * */ -#define FT_BZIP2_H +#define FT_BZIP2_H /************************************************************************* @@ -447,7 +486,7 @@ * definitions of an API which supports Windows FNT files. * */ -#define FT_WINFONTS_H +#define FT_WINFONTS_H /************************************************************************* @@ -460,7 +499,7 @@ * API of the optional glyph management component. * */ -#define FT_GLYPH_H +#define FT_GLYPH_H /************************************************************************* @@ -473,7 +512,7 @@ * API of the optional bitmap conversion component. * */ -#define FT_BITMAP_H +#define FT_BITMAP_H /************************************************************************* @@ -486,7 +525,7 @@ * API of the optional exact bounding box computation routines. * */ -#define FT_BBOX_H +#define FT_BBOX_H /************************************************************************* @@ -499,7 +538,7 @@ * API of the optional FreeType~2 cache sub-system. * */ -#define FT_CACHE_H +#define FT_CACHE_H /************************************************************************* @@ -573,7 +612,7 @@ * compiled on the Mac (note that the base API still works though). * */ -#define FT_MAC_H +#define FT_MAC_H /************************************************************************* @@ -586,7 +625,7 @@ * optional multiple-masters management API of FreeType~2. * */ -#define FT_MULTIPLE_MASTERS_H +#define FT_MULTIPLE_MASTERS_H /************************************************************************* @@ -600,7 +639,7 @@ * SFNT-based font formats (i.e., TrueType and OpenType). * */ -#define FT_SFNT_NAMES_H +#define FT_SFNT_NAMES_H /************************************************************************* @@ -614,7 +653,7 @@ * GPOS, GSUB, JSTF). * */ -#define FT_OPENTYPE_VALIDATE_H +#define FT_OPENTYPE_VALIDATE_H /************************************************************************* @@ -628,7 +667,7 @@ * mort, morx, bsln, just, kern, opbd, trak, prop). * */ -#define FT_GX_VALIDATE_H +#define FT_GX_VALIDATE_H /************************************************************************* @@ -641,7 +680,7 @@ * FreeType~2 API which accesses PFR-specific data. * */ -#define FT_PFR_H +#define FT_PFR_H /************************************************************************* @@ -653,7 +692,7 @@ * A macro used in #include statements to name the file containing the * FreeType~2 API which provides functions to stroke outline paths. */ -#define FT_STROKER_H +#define FT_STROKER_H /************************************************************************* @@ -665,7 +704,7 @@ * A macro used in #include statements to name the file containing the * FreeType~2 API which performs artificial obliquing and emboldening. */ -#define FT_SYNTHESIS_H +#define FT_SYNTHESIS_H /************************************************************************* @@ -678,7 +717,7 @@ * FreeType~2 API which provides functions specific to the XFree86 and * X.Org X11 servers. */ -#define FT_XFREE86_H +#define FT_XFREE86_H /************************************************************************* @@ -691,7 +730,7 @@ * FreeType~2 API which performs trigonometric computations (e.g., * cosines and arc tangents). */ -#define FT_TRIGONOMETRY_H +#define FT_TRIGONOMETRY_H /************************************************************************* @@ -703,7 +742,7 @@ * A macro used in #include statements to name the file containing the * FreeType~2 API which performs color filtering for subpixel rendering. */ -#define FT_LCD_FILTER_H +#define FT_LCD_FILTER_H /************************************************************************* @@ -715,7 +754,7 @@ * A macro used in #include statements to name the file containing the * FreeType~2 API which performs color filtering for subpixel rendering. */ -#define FT_UNPATENTED_HINTING_H +#define FT_UNPATENTED_HINTING_H /************************************************************************* @@ -727,7 +766,7 @@ * A macro used in #include statements to name the file containing the * FreeType~2 API which performs color filtering for subpixel rendering. */ -#define FT_INCREMENTAL_H +#define FT_INCREMENTAL_H /************************************************************************* @@ -739,7 +778,7 @@ * A macro used in #include statements to name the file containing the * FreeType~2 API which returns entries from the TrueType GASP table. */ -#define FT_GASP_H +#define FT_GASP_H /************************************************************************* @@ -751,38 +790,38 @@ * A macro used in #include statements to name the file containing the * FreeType~2 API which returns individual and ranged glyph advances. */ -#define FT_ADVANCES_H +#define FT_ADVANCES_H /* */ -#define FT_ERROR_DEFINITIONS_H +#define FT_ERROR_DEFINITIONS_H /* The internals of the cache sub-system are no longer exposed. We */ /* default to FT_CACHE_H at the moment just in case, but we know of */ /* no rogue client that uses them. */ /* */ -#define FT_CACHE_MANAGER_H -#define FT_CACHE_INTERNAL_MRU_H -#define FT_CACHE_INTERNAL_MANAGER_H -#define FT_CACHE_INTERNAL_CACHE_H -#define FT_CACHE_INTERNAL_GLYPH_H -#define FT_CACHE_INTERNAL_IMAGE_H -#define FT_CACHE_INTERNAL_SBITS_H +#define FT_CACHE_MANAGER_H +#define FT_CACHE_INTERNAL_MRU_H +#define FT_CACHE_INTERNAL_MANAGER_H +#define FT_CACHE_INTERNAL_CACHE_H +#define FT_CACHE_INTERNAL_GLYPH_H +#define FT_CACHE_INTERNAL_IMAGE_H +#define FT_CACHE_INTERNAL_SBITS_H -#define FT_INCREMENTAL_H +#define FT_INCREMENTAL_H -#define FT_TRUETYPE_UNPATENTED_H +#define FT_TRUETYPE_UNPATENTED_H /* - * Include internal headers definitions from + * Include internal headers definitions from * only when building the library. */ #ifdef FT2_BUILD_LIBRARY -#define FT_INTERNAL_INTERNAL_H +#define FT_INTERNAL_INTERNAL_H #include FT_INTERNAL_INTERNAL_H #endif /* FT2_BUILD_LIBRARY */ diff --git a/include/freetype/config/ftmodule.h b/include/config/ftmodule.h similarity index 100% rename from include/freetype/config/ftmodule.h rename to include/config/ftmodule.h diff --git a/include/freetype/config/ftoption.h b/include/config/ftoption.h similarity index 86% rename from include/freetype/config/ftoption.h rename to include/config/ftoption.h index 041e24a..12ca25b 100644 --- a/include/freetype/config/ftoption.h +++ b/include/config/ftoption.h @@ -4,7 +4,7 @@ /* */ /* User-selectable configuration macros (specification only). */ /* */ -/* Copyright 1996-2011 by */ +/* Copyright 1996-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -38,9 +38,9 @@ FT_BEGIN_HEADER /* library from a single source directory. */ /* */ /* - You can put a copy of this file in your build directory, more */ - /* precisely in `$BUILD/freetype/config/ftoption.h', where `$BUILD' */ - /* is the name of a directory that is included _before_ the FreeType */ - /* include path during compilation. */ + /* precisely in `$BUILD/config/ftoption.h', where `$BUILD' is the */ + /* name of a directory that is included _before_ the FreeType include */ + /* path during compilation. */ /* */ /* The default FreeType Makefiles and Jamfiles use the build */ /* directory `builds/' by default, but you can easily change */ @@ -51,7 +51,7 @@ FT_BEGIN_HEADER /* locate this file during the build. For example, */ /* */ /* #define FT_CONFIG_OPTIONS_H */ - /* #include */ + /* #include */ /* */ /* will use `$BUILD/myftoptions.h' instead of this file for macro */ /* definitions. */ @@ -59,9 +59,9 @@ FT_BEGIN_HEADER /* Note also that you can similarly pre-define the macro */ /* FT_CONFIG_MODULES_H used to locate the file listing of the modules */ /* that are statically linked to the library at compile time. By */ - /* default, this file is . */ + /* default, this file is . */ /* */ - /* We highly recommend using the third method whenever possible. */ + /* We highly recommend using the third method whenever possible. */ /* */ /*************************************************************************/ @@ -216,6 +216,33 @@ FT_BEGIN_HEADER /*************************************************************************/ /* */ + /* PNG bitmap support. */ + /* */ + /* FreeType now handles loading color bitmap glyphs in the PNG format. */ + /* This requires help from the external libpng library. Uncompressed */ + /* color bitmaps do not need any external libraries and will be */ + /* supported regardless of this configuration. */ + /* */ + /* Define this macro if you want to enable this `feature'. */ + /* */ +#define FT_CONFIG_OPTION_USE_PNG + + + /*************************************************************************/ + /* */ + /* HarfBuzz support. */ + /* */ + /* FreeType uses the HarfBuzz library to improve auto-hinting of */ + /* OpenType fonts. If available, many glyphs not directly addressable */ + /* by a font's character map will be hinted also. */ + /* */ + /* Define this macro if you want to enable this `feature'. */ + /* */ +/* #define FT_CONFIG_OPTION_USE_HARFBUZZ */ + + + /*************************************************************************/ + /* */ /* DLL export compilation */ /* */ /* When compiling FreeType as a DLL, some systems/compilers need a */ @@ -514,7 +541,7 @@ FT_BEGIN_HEADER /* does not contain any glyph name though. */ /* */ /* Accessing SFNT names is done through the functions declared in */ - /* `freetype/ftsnames.h'. */ + /* `ftsnames.h'. */ /* */ #define TT_CONFIG_OPTION_SFNT_NAMES @@ -560,6 +587,28 @@ FT_BEGIN_HEADER /*************************************************************************/ /* */ + /* Define TT_CONFIG_OPTION_SUBPIXEL_HINTING if you want to compile */ + /* EXPERIMENTAL subpixel hinting support into the TrueType driver. This */ + /* replaces the native TrueType hinting mechanism when anything but */ + /* FT_RENDER_MODE_MONO is requested. */ + /* */ + /* Enabling this causes the TrueType driver to ignore instructions under */ + /* certain conditions. This is done in accordance with the guide here, */ + /* with some minor differences: */ + /* */ + /* http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */ + /* */ + /* By undefining this, you only compile the code necessary to hint */ + /* TrueType glyphs with native TT hinting. */ + /* */ + /* This option requires TT_CONFIG_OPTION_BYTECODE_INTERPRETER to be */ + /* defined. */ + /* */ +/* #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 */ @@ -669,7 +718,7 @@ FT_BEGIN_HEADER /*************************************************************************/ /* */ - /* T1_MAX_DICT_DEPTH is the maximal depth of nest dictionaries and */ + /* T1_MAX_DICT_DEPTH is the maximum depth of nest dictionaries and */ /* arrays in the Type 1 stream (see t1load.c). A minimum of 4 is */ /* required. */ /* */ @@ -716,6 +765,49 @@ FT_BEGIN_HEADER /*************************************************************************/ /*************************************************************************/ /**** ****/ + /**** C F F D R I V E R C O N F I G U R A T I O N ****/ + /**** ****/ + /*************************************************************************/ + /*************************************************************************/ + + + /*************************************************************************/ + /* */ + /* Using CFF_CONFIG_OPTION_DARKENING_PARAMETER_{X,Y}{1,2,3,4} it is */ + /* possible to set up the default values of the four control points that */ + /* define the stem darkening behaviour of the (new) CFF engine. For */ + /* more details please read the documentation of the */ + /* `darkening-parameters' property of the cff driver module (file */ + /* `ftcffdrv.h'), which allows the control at run-time. */ + /* */ + /* Do *not* undefine these macros! */ + /* */ +#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_X1 500 +#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y1 400 + +#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_X2 1000 +#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y2 275 + +#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_X3 1667 +#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y3 275 + +#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_X4 2333 +#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y4 0 + + + /*************************************************************************/ + /* */ + /* CFF_CONFIG_OPTION_OLD_ENGINE controls whether the pre-Adobe CFF */ + /* engine gets compiled into FreeType. If defined, it is possible to */ + /* switch between the two engines using the `hinting-engine' property of */ + /* the cff driver module. */ + /* */ +/* #define CFF_CONFIG_OPTION_OLD_ENGINE */ + + + /*************************************************************************/ + /*************************************************************************/ + /**** ****/ /**** A U T O F I T M O D U L E C O N F I G U R A T I O N ****/ /**** ****/ /*************************************************************************/ @@ -752,37 +844,10 @@ FT_BEGIN_HEADER /* - * Define this variable if you want to keep the layout of internal - * structures that was used prior to FreeType 2.2. This also compiles in - * a few obsolete functions to avoid linking problems on typical Unix - * distributions. - * - * For embedded systems or building a new distribution from scratch, it - * is recommended to disable the macro since it reduces the library's code - * size and activates a few memory-saving optimizations as well. - */ -#define FT_CONFIG_OPTION_OLD_INTERNALS - - - /* - * To detect legacy cache-lookup call from a rogue client (<= 2.1.7), - * we restrict the number of charmaps in a font. The current API of - * FTC_CMapCache_Lookup() takes cmap_index & charcode, but old API - * takes charcode only. To determine the passed value is for cmap_index - * or charcode, the possible cmap_index is restricted not to exceed - * the minimum possible charcode by a rogue client. It is also very - * unlikely that a rogue client is interested in Unicode values 0 to 15. - * - * NOTE: The original threshold was 4 deduced from popular number of - * cmap subtables in UCS-4 TrueType fonts, but now it is not - * irregular for OpenType fonts to have more than 4 subtables, - * because variation selector subtables are available for Apple - * and Microsoft platforms. + * This macro is obsolete. Support has been removed in FreeType + * version 2.5. */ - -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS -#define FT_MAX_CHARMAP_CACHEABLE 15 -#endif +/* #define FT_CONFIG_OPTION_OLD_INTERNALS */ /* @@ -796,6 +861,35 @@ FT_BEGIN_HEADER #define TT_USE_BYTECODE_INTERPRETER #endif + + /* + * Check CFF darkening parameters. The checks are the same as in function + * `cff_property_set' in file `cffdrivr.c'. + */ +#if CFF_CONFIG_OPTION_DARKENING_PARAMETER_X1 < 0 || \ + CFF_CONFIG_OPTION_DARKENING_PARAMETER_X2 < 0 || \ + CFF_CONFIG_OPTION_DARKENING_PARAMETER_X3 < 0 || \ + CFF_CONFIG_OPTION_DARKENING_PARAMETER_X4 < 0 || \ + \ + CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y1 < 0 || \ + CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y2 < 0 || \ + CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y3 < 0 || \ + CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y4 < 0 || \ + \ + CFF_CONFIG_OPTION_DARKENING_PARAMETER_X1 > \ + CFF_CONFIG_OPTION_DARKENING_PARAMETER_X2 || \ + CFF_CONFIG_OPTION_DARKENING_PARAMETER_X2 > \ + CFF_CONFIG_OPTION_DARKENING_PARAMETER_X3 || \ + CFF_CONFIG_OPTION_DARKENING_PARAMETER_X3 > \ + CFF_CONFIG_OPTION_DARKENING_PARAMETER_X4 || \ + \ + CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y1 > 500 || \ + CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y2 > 500 || \ + CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y3 > 500 || \ + CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y4 > 500 +#error "Invalid CFF darkening parameters!" +#endif + FT_END_HEADER diff --git a/include/freetype/config/ftstdlib.h b/include/config/ftstdlib.h similarity index 98% rename from include/freetype/config/ftstdlib.h rename to include/config/ftstdlib.h index 11d5d0e..b940efc 100644 --- a/include/freetype/config/ftstdlib.h +++ b/include/config/ftstdlib.h @@ -5,7 +5,7 @@ /* ANSI-specific library and header configuration file (specification */ /* only). */ /* */ -/* Copyright 2002-2007, 2009, 2011 by */ +/* Copyright 2002-2007, 2009, 2011-2012 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -159,7 +159,7 @@ /* on certain platforms */ #define ft_longjmp longjmp -#define ft_setjmp( b ) setjmp( *(jmp_buf*) &(b) ) /* same thing here */ +#define ft_setjmp( b ) setjmp( *(ft_jmp_buf*) &(b) ) /* same thing here */ /* the following is only used for debugging purposes, i.e., if */ diff --git a/include/freetype/freetype.h b/include/freetype.h similarity index 93% rename from include/freetype/freetype.h rename to include/freetype.h index 63c291a..27fd44b 100644 --- a/include/freetype/freetype.h +++ b/include/freetype.h @@ -4,7 +4,7 @@ /* */ /* FreeType high-level API and common types (specification only). */ /* */ -/* Copyright 1996-2012 by */ +/* Copyright 1996-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -16,6 +16,10 @@ /***************************************************************************/ +#ifndef __FREETYPE_H__ +#define __FREETYPE_H__ + + #ifndef FT_FREETYPE_H #error "`ft2build.h' hasn't been included yet!" #error "Please always use macros to include FreeType header files." @@ -25,14 +29,10 @@ #endif -#ifndef __FREETYPE_H__ -#define __FREETYPE_H__ - - #include #include FT_CONFIG_CONFIG_H -#include FT_ERRORS_H #include FT_TYPES_H +#include FT_ERRORS_H FT_BEGIN_HEADER @@ -42,6 +42,38 @@ FT_BEGIN_HEADER /*************************************************************************/ /* */ /*

    */ + /* header_inclusion */ + /* */ + /* */ + /* FreeType's header inclusion scheme */ + /* */ + /* <Abstract> */ + /* How client applications should include FreeType header files. */ + /* */ + /* <Description> */ + /* To be as flexible as possible (and for historical reasons), */ + /* FreeType uses a very special inclusion scheme to load header */ + /* files, for example */ + /* */ + /* { */ + /* #include <ft2build.h> */ + /* */ + /* #include FT_FREETYPE_H */ + /* #include FT_OUTLINE_H */ + /* } */ + /* */ + /* A compiler and its preprocessor only needs an include path to find */ + /* the file `ft2build.h'; the exact locations and names of the other */ + /* FreeType header files are hidden by preprocessor macro names, */ + /* loaded by `ft2build.h'. The API documentation always gives the */ + /* header macro name needed for a particular function. */ + /* */ + /*************************************************************************/ + + + /*************************************************************************/ + /* */ + /* <Section> */ /* user_allocation */ /* */ /* <Title> */ @@ -81,7 +113,8 @@ FT_BEGIN_HEADER /* The FreeType~2 base font interface. */ /* */ /* <Description> */ - /* This section describes the public high-level API of FreeType~2. */ + /* This section describes the most important public high-level API */ + /* functions of FreeType~2. */ /* */ /* <Order> */ /* FT_Library */ @@ -90,6 +123,7 @@ FT_BEGIN_HEADER /* FT_GlyphSlot */ /* FT_CharMap */ /* FT_Encoding */ + /* FT_ENC_TAG */ /* */ /* FT_FaceRec */ /* */ @@ -98,13 +132,30 @@ FT_BEGIN_HEADER /* FT_FACE_FLAG_FIXED_WIDTH */ /* FT_FACE_FLAG_HORIZONTAL */ /* FT_FACE_FLAG_VERTICAL */ + /* FT_FACE_FLAG_COLOR */ /* FT_FACE_FLAG_SFNT */ + /* FT_FACE_FLAG_CID_KEYED */ + /* FT_FACE_FLAG_TRICKY */ /* FT_FACE_FLAG_KERNING */ /* FT_FACE_FLAG_MULTIPLE_MASTERS */ /* FT_FACE_FLAG_GLYPH_NAMES */ /* FT_FACE_FLAG_EXTERNAL_STREAM */ - /* FT_FACE_FLAG_FAST_GLYPHS */ /* FT_FACE_FLAG_HINTER */ + /* FT_FACE_FLAG_TRICKY */ + /* */ + /* FT_HAS_HORIZONTAL */ + /* FT_HAS_VERTICAL */ + /* FT_HAS_KERNING */ + /* FT_HAS_FIXED_SIZES */ + /* FT_HAS_GLYPH_NAMES */ + /* FT_HAS_MULTIPLE_MASTERS */ + /* FT_HAS_COLOR */ + /* */ + /* FT_IS_SFNT */ + /* FT_IS_SCALABLE */ + /* FT_IS_FIXED_WIDTH */ + /* FT_IS_CID_KEYED */ + /* FT_IS_TRICKY */ /* */ /* FT_STYLE_FLAG_BOLD */ /* FT_STYLE_FLAG_ITALIC */ @@ -123,6 +174,7 @@ FT_BEGIN_HEADER /* */ /* FT_New_Face */ /* FT_Done_Face */ + /* FT_Reference_Face */ /* FT_New_Memory_Face */ /* FT_Open_Face */ /* FT_Open_Args */ @@ -135,10 +187,13 @@ FT_BEGIN_HEADER /* FT_Request_Size */ /* FT_Select_Size */ /* FT_Size_Request_Type */ + /* FT_Size_RequestRec */ /* FT_Size_Request */ /* FT_Set_Transform */ /* FT_Load_Glyph */ /* FT_Get_Char_Index */ + /* FT_Get_First_Char */ + /* FT_Get_Next_Char */ /* FT_Get_Name_Index */ /* FT_Load_Char */ /* */ @@ -155,11 +210,11 @@ FT_BEGIN_HEADER /* FT_LOAD_NO_SCALE */ /* FT_LOAD_NO_HINTING */ /* FT_LOAD_NO_BITMAP */ - /* FT_LOAD_CROP_BITMAP */ + /* FT_LOAD_NO_AUTOHINT */ + /* FT_LOAD_COLOR */ /* */ /* FT_LOAD_VERTICAL_LAYOUT */ /* FT_LOAD_IGNORE_TRANSFORM */ - /* FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH */ /* FT_LOAD_FORCE_AUTOHINT */ /* FT_LOAD_NO_RECURSE */ /* FT_LOAD_PEDANTIC */ @@ -170,6 +225,8 @@ FT_BEGIN_HEADER /* FT_LOAD_TARGET_LCD */ /* FT_LOAD_TARGET_LCD_V */ /* */ + /* FT_LOAD_TARGET_MODE */ + /* */ /* FT_Render_Glyph */ /* FT_Render_Mode */ /* FT_Get_Kerning */ @@ -183,14 +240,22 @@ FT_BEGIN_HEADER /* FT_Set_Charmap */ /* FT_Get_Charmap_Index */ /* */ - /* FT_FSTYPE_INSTALLABLE_EMBEDDING */ - /* FT_FSTYPE_RESTRICTED_LICENSE_EMBEDDING */ - /* FT_FSTYPE_PREVIEW_AND_PRINT_EMBEDDING */ - /* FT_FSTYPE_EDITABLE_EMBEDDING */ - /* FT_FSTYPE_NO_SUBSETTING */ - /* FT_FSTYPE_BITMAP_EMBEDDING_ONLY */ - /* */ /* FT_Get_FSType_Flags */ + /* FT_Get_SubGlyph_Info */ + /* */ + /* FT_Face_Internal */ + /* FT_Size_Internal */ + /* FT_Slot_Internal */ + /* */ + /* FT_FACE_FLAG_XXX */ + /* FT_STYLE_FLAG_XXX */ + /* FT_OPEN_XXX */ + /* FT_LOAD_XXX */ + /* FT_LOAD_TARGET_XXX */ + /* FT_SUBGLYPH_FLAG_XXX */ + /* FT_FSTYPE_XXX */ + /* */ + /* FT_HAS_FAST_GLYPHS */ /* */ /*************************************************************************/ @@ -237,6 +302,10 @@ FT_BEGIN_HEADER /* If not disabled with @FT_LOAD_NO_HINTING, the values represent */ /* dimensions of the hinted glyph (in case hinting is applicable). */ /* */ + /* Stroking a glyph with an outside border does not increase */ + /* `horiAdvance' or `vertAdvance'; you have to manually adjust these */ + /* values to account for the added width and height. */ + /* */ typedef struct FT_Glyph_Metrics_ { FT_Pos width; @@ -325,18 +394,27 @@ FT_BEGIN_HEADER /* It also embeds a memory manager (see @FT_Memory), as well as a */ /* scan-line converter object (see @FT_Raster). */ /* */ - /* For multi-threading applications each thread should have its own */ - /* FT_Library object. */ + /* In multi-threaded applications, make sure that the same FT_Library */ + /* object or any of its children doesn't get accessed in parallel. */ /* */ /* <Note> */ /* Library objects are normally created by @FT_Init_FreeType, and */ - /* destroyed with @FT_Done_FreeType. */ + /* destroyed with @FT_Done_FreeType. If you need reference-counting */ + /* (cf. @FT_Reference_Library), use @FT_New_Library and */ + /* @FT_Done_Library. */ /* */ typedef struct FT_LibraryRec_ *FT_Library; /*************************************************************************/ /* */ + /* <Section> */ + /* module_management */ + /* */ + /*************************************************************************/ + + /*************************************************************************/ + /* */ /* <Type> */ /* FT_Module */ /* */ @@ -376,6 +454,13 @@ FT_BEGIN_HEADER /*************************************************************************/ /* */ + /* <Section> */ + /* base_interface */ + /* */ + /*************************************************************************/ + + /*************************************************************************/ + /* */ /* <Type> */ /* FT_Face */ /* */ @@ -411,7 +496,8 @@ FT_BEGIN_HEADER /* <Note> */ /* Each @FT_Face has an _active_ @FT_Size object that is used by */ /* functions like @FT_Load_Glyph to determine the scaling */ - /* transformation which is used to load and hint glyphs and metrics. */ + /* transformation that in turn is used to load and hint glyphs and */ + /* metrics. */ /* */ /* You can use @FT_Set_Char_Size, @FT_Set_Pixel_Sizes, */ /* @FT_Request_Size or even @FT_Select_Size to change the content */ @@ -546,11 +632,12 @@ FT_BEGIN_HEADER /* FT_ENCODING_MS_SYMBOL :: */ /* Corresponds to the Microsoft Symbol encoding, used to encode */ /* mathematical symbols in the 32..255 character code range. For */ - /* more information, see `http://www.ceviz.net/symbol.htm'. */ + /* more information, see */ + /* `http://www.kostis.net/charsets/symbol.htm'. */ /* */ /* FT_ENCODING_SJIS :: */ /* Corresponds to Japanese SJIS encoding. More info at */ - /* at `http://langsupport.japanreference.com/encoding.shtml'. */ + /* at `http://en.wikipedia.org/wiki/Shift_JIS'. */ /* See note on multi-byte encodings below. */ /* */ /* FT_ENCODING_GB2312 :: */ @@ -564,7 +651,7 @@ FT_BEGIN_HEADER /* FT_ENCODING_WANSUNG :: */ /* Corresponds to the Korean encoding system known as Wansung. */ /* For more information see */ - /* `http://www.microsoft.com/typography/unicode/949.txt'. */ + /* `http://msdn.microsoft.com/en-US/goglobal/cc305154'. */ /* */ /* FT_ENCODING_JOHAB :: */ /* The Korean standard character set (KS~C 5601-1992), which */ @@ -639,10 +726,10 @@ FT_BEGIN_HEADER /* FT_ENCODING_APPLE_ROMAN). */ /* */ /* If `platform_id' is @TT_PLATFORM_MACINTOSH, use the function */ - /* @FT_Get_CMap_Language_ID to query the Mac language ID which may */ + /* @FT_Get_CMap_Language_ID to query the Mac language ID that may */ /* be needed to be able to distinguish Apple encoding variants. See */ /* */ - /* http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/README.TXT */ + /* http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/Readme.txt */ /* */ /* to get an idea how to do that. Basically, if the language ID */ /* is~0, don't use it, otherwise subtract 1 from the language ID. */ @@ -684,15 +771,8 @@ FT_BEGIN_HEADER } FT_Encoding; - /*************************************************************************/ - /* */ - /* <Enum> */ - /* ft_encoding_xxx */ - /* */ - /* <Description> */ - /* These constants are deprecated; use the corresponding @FT_Encoding */ - /* values instead. */ - /* */ + /* these constants are deprecated; use the corresponding `FT_Encoding' */ + /* values instead */ #define ft_encoding_none FT_ENCODING_NONE #define ft_encoding_unicode FT_ENCODING_UNICODE #define ft_encoding_symbol FT_ENCODING_MS_SYMBOL @@ -802,7 +882,7 @@ FT_BEGIN_HEADER /* highest CID used in the font. */ /* */ /* family_name :: The face's family name. This is an ASCII */ - /* string, usually in English, which describes */ + /* string, usually in English, that describes */ /* the typeface's family (like `Times New */ /* Roman', `Bodoni', `Garamond', etc). This */ /* is a least common denominator used to list */ @@ -814,7 +894,7 @@ FT_BEGIN_HEADER /* PDF file). */ /* */ /* style_name :: The face's style name. This is an ASCII */ - /* string, usually in English, which describes */ + /* string, usually in English, that describes */ /* the typeface's style (like `Italic', */ /* `Bold', `Condensed', etc). Not all font */ /* formats provide a style name, so this field */ @@ -844,8 +924,8 @@ FT_BEGIN_HEADER /* expressed in font units (see */ /* `units_per_EM'). The box is large enough */ /* to contain any glyph from the font. Thus, */ - /* `bbox.yMax' can be seen as the `maximal */ - /* ascender', and `bbox.yMin' as the `minimal */ + /* `bbox.yMax' can be seen as the `maximum */ + /* ascender', and `bbox.yMin' as the `minimum */ /* descender'. Only relevant for scalable */ /* formats. */ /* */ @@ -871,19 +951,22 @@ FT_BEGIN_HEADER /* usually negative. Only relevant for */ /* scalable formats. */ /* */ - /* height :: The height is the vertical distance */ + /* height :: This value is the vertical distance */ /* between two consecutive baselines, */ /* expressed in font units. It is always */ /* positive. Only relevant for scalable */ /* formats. */ /* */ - /* max_advance_width :: The maximal advance width, in font units, */ + /* If you want the global glyph height, use */ + /* `ascender - descender'. */ + /* */ + /* max_advance_width :: The maximum advance width, in font units, */ /* for all glyphs in this face. This can be */ /* used to make word wrapping computations */ /* faster. Only relevant for scalable */ /* formats. */ /* */ - /* max_advance_height :: The maximal advance height, in font units, */ + /* max_advance_height :: The maximum advance height, in font units, */ /* for all glyphs in this face. This is only */ /* relevant for vertical layouts, and is set */ /* to `height' for fonts that do not provide */ @@ -1045,7 +1128,7 @@ FT_BEGIN_HEADER /* exist make FT_Load_Glyph return successfully; in all other cases */ /* you get an `FT_Err_Invalid_Argument' error. */ /* */ - /* Note that CID-keyed fonts which are in an SFNT wrapper don't */ + /* Note that CID-keyed fonts that are in an SFNT wrapper don't */ /* have this flag set since the glyphs are accessed in the normal */ /* way (using contiguous indices); the `CID-ness' isn't visible to */ /* the application. */ @@ -1053,7 +1136,7 @@ FT_BEGIN_HEADER /* FT_FACE_FLAG_TRICKY :: */ /* Set if the font is `tricky', this is, it always needs the */ /* font format's native hinting engine to get a reasonable result. */ - /* A typical example is the Chinese font `mingli.ttf' which uses */ + /* A typical example is the Chinese font `mingli.ttf' that uses */ /* TrueType bytecode instructions to move and scale all of its */ /* subglyphs. */ /* */ @@ -1066,6 +1149,10 @@ FT_BEGIN_HEADER /* Currently, there are about a dozen TrueType fonts in the list of */ /* tricky fonts; they are hard-coded in file `ttobjs.c'. */ /* */ + /* FT_FACE_FLAG_COLOR :: */ + /* Set if the font has color glyph tables. To access color glyphs */ + /* use @FT_LOAD_COLOR. */ + /* */ #define FT_FACE_FLAG_SCALABLE ( 1L << 0 ) #define FT_FACE_FLAG_FIXED_SIZES ( 1L << 1 ) #define FT_FACE_FLAG_FIXED_WIDTH ( 1L << 2 ) @@ -1080,6 +1167,7 @@ FT_BEGIN_HEADER #define FT_FACE_FLAG_HINTER ( 1L << 11 ) #define FT_FACE_FLAG_CID_KEYED ( 1L << 12 ) #define FT_FACE_FLAG_TRICKY ( 1L << 13 ) +#define FT_FACE_FLAG_COLOR ( 1L << 14 ) /************************************************************************* @@ -1105,8 +1193,8 @@ FT_BEGIN_HEADER * FT_HAS_VERTICAL( face ) * * @description: - * A macro that returns true whenever a face object contains vertical - * metrics. + * A macro that returns true whenever a face object contains real + * vertical metrics (and not only synthesized ones). * */ #define FT_HAS_VERTICAL( face ) \ @@ -1264,6 +1352,20 @@ FT_BEGIN_HEADER ( face->face_flags & FT_FACE_FLAG_TRICKY ) + /************************************************************************* + * + * @macro: + * FT_HAS_COLOR( face ) + * + * @description: + * A macro that returns true whenever a face object contains + * tables for color glyphs. + * + */ +#define FT_HAS_COLOR( face ) \ + ( face->face_flags & FT_FACE_FLAG_COLOR ) + + /*************************************************************************/ /* */ /* <Const> */ @@ -1338,7 +1440,7 @@ FT_BEGIN_HEADER /* height :: The height in 26.6 fractional pixels. See */ /* @FT_FaceRec for the details. */ /* */ - /* max_advance :: The maximal advance width in 26.6 fractional */ + /* max_advance :: The maximum advance width in 26.6 fractional */ /* pixels. See @FT_FaceRec for the details. */ /* */ /* <Note> */ @@ -1385,9 +1487,9 @@ FT_BEGIN_HEADER /* <Fields> */ /* face :: Handle to the parent face object. */ /* */ - /* generic :: A typeless pointer, which is unused by the FreeType */ - /* library or any of its drivers. It can be used by */ - /* client applications to link their own data to each size */ + /* generic :: A typeless pointer, unused by the FreeType library or */ + /* any of its drivers. It can be used by client */ + /* applications to link their own data to each size */ /* object. */ /* */ /* metrics :: Metrics for this size object. This field is read-only. */ @@ -1455,10 +1557,10 @@ FT_BEGIN_HEADER /* listed through a direct, single-linked list */ /* using its `next' field. */ /* */ - /* generic :: A typeless pointer which is unused by the */ - /* FreeType library or any of its drivers. It */ - /* can be used by client applications to link */ - /* their own data to each glyph slot object. */ + /* generic :: A typeless pointer unused by the FreeType */ + /* library or any of its drivers. It can be */ + /* used by client applications to link their own */ + /* data to each glyph slot object. */ /* */ /* metrics :: The metrics of the last loaded glyph in the */ /* slot. The returned values depend on the last */ @@ -1485,8 +1587,8 @@ FT_BEGIN_HEADER /* */ /* advance :: This shorthand is, depending on */ /* @FT_LOAD_IGNORE_TRANSFORM, the transformed */ - /* advance width for the glyph (in 26.6 */ - /* fractional pixel format). As specified with */ + /* (hinted) advance width for the glyph, in 26.6 */ + /* fractional pixel format. As specified with */ /* @FT_LOAD_VERTICAL_LAYOUT, it uses either the */ /* `horiAdvance' or the `vertAdvance' value of */ /* `metrics' field. */ @@ -1505,15 +1607,15 @@ FT_BEGIN_HEADER /* change between calls of @FT_Load_Glyph and a */ /* few other functions. */ /* */ - /* bitmap_left :: This is the bitmap's left bearing expressed */ - /* in integer pixels. Of course, this is only */ - /* valid if the format is */ - /* @FT_GLYPH_FORMAT_BITMAP. */ + /* bitmap_left :: The bitmap's left bearing expressed in */ + /* integer pixels. Only valid if the format is */ + /* @FT_GLYPH_FORMAT_BITMAP, this is, if the */ + /* glyph slot contains a bitmap. */ /* */ - /* bitmap_top :: This is the bitmap's top bearing expressed in */ - /* integer pixels. Remember that this is the */ - /* distance from the baseline to the top-most */ - /* glyph scanline, upwards y~coordinates being */ + /* bitmap_top :: The bitmap's top bearing expressed in integer */ + /* pixels. Remember that this is the distance */ + /* from the baseline to the top-most glyph */ + /* scanline, upwards y~coordinates being */ /* *positive*. */ /* */ /* outline :: The outline descriptor for the current glyph */ @@ -1527,7 +1629,6 @@ FT_BEGIN_HEADER /* This field is only valid for the composite */ /* glyph format that should normally only be */ /* loaded with the @FT_LOAD_NO_RECURSE flag. */ - /* For now this is internal to FreeType. */ /* */ /* subglyphs :: An array of subglyph descriptors for */ /* composite glyphs. There are `num_subglyphs' */ @@ -1575,7 +1676,7 @@ FT_BEGIN_HEADER /* `slot->format' is also changed to @FT_GLYPH_FORMAT_BITMAP. */ /* */ /* <Note> */ - /* Here a small pseudo code fragment which shows how to use */ + /* Here a small pseudo code fragment that shows how to use */ /* `lsb_delta' and `rsb_delta': */ /* */ /* { */ @@ -1671,6 +1772,9 @@ FT_BEGIN_HEADER /* For multi-threading applications each thread should have its own */ /* FT_Library object. */ /* */ + /* If you need reference-counting (cf. @FT_Reference_Library), use */ + /* @FT_New_Library and @FT_Done_Library. */ + /* */ FT_EXPORT( FT_Error ) FT_Init_FreeType( FT_Library *alibrary ); @@ -1715,16 +1819,6 @@ FT_BEGIN_HEADER /* */ /* FT_OPEN_PARAMS :: Use the `num_params' and `params' fields. */ /* */ - /* ft_open_memory :: Deprecated; use @FT_OPEN_MEMORY instead. */ - /* */ - /* ft_open_stream :: Deprecated; use @FT_OPEN_STREAM instead. */ - /* */ - /* ft_open_pathname :: Deprecated; use @FT_OPEN_PATHNAME instead. */ - /* */ - /* ft_open_driver :: Deprecated; use @FT_OPEN_DRIVER instead. */ - /* */ - /* ft_open_params :: Deprecated; use @FT_OPEN_PARAMS instead. */ - /* */ /* <Note> */ /* The `FT_OPEN_MEMORY', `FT_OPEN_STREAM', and `FT_OPEN_PATHNAME' */ /* flags are mutually exclusive. */ @@ -1735,11 +1829,14 @@ FT_BEGIN_HEADER #define FT_OPEN_DRIVER 0x8 #define FT_OPEN_PARAMS 0x10 -#define ft_open_memory FT_OPEN_MEMORY /* deprecated */ -#define ft_open_stream FT_OPEN_STREAM /* deprecated */ -#define ft_open_pathname FT_OPEN_PATHNAME /* deprecated */ -#define ft_open_driver FT_OPEN_DRIVER /* deprecated */ -#define ft_open_params FT_OPEN_PARAMS /* deprecated */ + + /* these constants are deprecated; use the corresponding `FT_OPEN_XXX' */ + /* values instead */ +#define ft_open_memory FT_OPEN_MEMORY +#define ft_open_stream FT_OPEN_STREAM +#define ft_open_pathname FT_OPEN_PATHNAME +#define ft_open_driver FT_OPEN_DRIVER +#define ft_open_params FT_OPEN_PARAMS /*************************************************************************/ @@ -1801,25 +1898,25 @@ FT_BEGIN_HEADER /* opening a new face. */ /* */ /* <Note> */ - /* The stream type is determined by the contents of `flags' which */ + /* The stream type is determined by the contents of `flags' that */ /* are tested in the following order by @FT_Open_Face: */ /* */ - /* If the `FT_OPEN_MEMORY' bit is set, assume that this is a */ + /* If the @FT_OPEN_MEMORY bit is set, assume that this is a */ /* memory file of `memory_size' bytes, located at `memory_address'. */ /* The data are are not copied, and the client is responsible for */ /* releasing and destroying them _after_ the corresponding call to */ /* @FT_Done_Face. */ /* */ - /* Otherwise, if the `FT_OPEN_STREAM' bit is set, assume that a */ + /* Otherwise, if the @FT_OPEN_STREAM bit is set, assume that a */ /* custom input stream `stream' is used. */ /* */ - /* Otherwise, if the `FT_OPEN_PATHNAME' bit is set, assume that this */ + /* Otherwise, if the @FT_OPEN_PATHNAME bit is set, assume that this */ /* is a normal file and use `pathname' to open it. */ /* */ - /* If the `FT_OPEN_DRIVER' bit is set, @FT_Open_Face only tries to */ + /* If the @FT_OPEN_DRIVER bit is set, @FT_Open_Face only tries to */ /* open the file with the driver whose handler is in `driver'. */ /* */ - /* If the `FT_OPEN_PARAMS' bit is set, the parameters given by */ + /* If the @FT_OPEN_PARAMS bit is set, the parameters given by */ /* `num_params' and `params' is used. They are ignored otherwise. */ /* */ /* Ideally, both the `pathname' and `params' fields should be tagged */ @@ -1865,6 +1962,10 @@ FT_BEGIN_HEADER /* <Return> */ /* FreeType error code. 0~means success. */ /* */ + /* <Note> */ + /* Use @FT_Done_Face to destroy the created @FT_Face object (along */ + /* with its slot and sizes). */ + /* */ FT_EXPORT( FT_Error ) FT_New_Face( FT_Library library, const char* filepathname, @@ -1878,7 +1979,7 @@ FT_BEGIN_HEADER /* FT_New_Memory_Face */ /* */ /* <Description> */ - /* This function calls @FT_Open_Face to open a font which has been */ + /* This function calls @FT_Open_Face to open a font that has been */ /* loaded into memory. */ /* */ /* <InOut> */ @@ -1924,7 +2025,7 @@ FT_BEGIN_HEADER /* library :: A handle to the library resource. */ /* */ /* <Input> */ - /* args :: A pointer to an `FT_Open_Args' structure which must */ + /* args :: A pointer to an `FT_Open_Args' structure that must */ /* be filled by the caller. */ /* */ /* face_index :: The index of the face within the font. The first */ @@ -1940,7 +2041,7 @@ FT_BEGIN_HEADER /* */ /* <Note> */ /* Unlike FreeType 1.x, this function automatically creates a glyph */ - /* slot for the face object which can be accessed directly through */ + /* slot for the face object that can be accessed directly through */ /* `face->glyph'. */ /* */ /* FT_Open_Face can be used to quickly check whether the font */ @@ -1949,7 +2050,7 @@ FT_BEGIN_HEADER /* if the font format is recognized, or non-zero otherwise; */ /* the function returns a more or less empty face handle in `*aface' */ /* (if `aface' isn't NULL). The only useful field in this special */ - /* case is `face->num_faces' which gives the number of faces within */ + /* case is `face->num_faces' that gives the number of faces within */ /* the font file. After examination, the returned @FT_Face structure */ /* should be deallocated with a call to @FT_Done_Face. */ /* */ @@ -2007,7 +2108,7 @@ FT_BEGIN_HEADER /* face :: The target face object. */ /* */ /* <Input> */ - /* parameters :: A pointer to @FT_Open_Args which must be filled by */ + /* parameters :: A pointer to @FT_Open_Args that must be filled by */ /* the caller. */ /* */ /* <Return> */ @@ -2038,7 +2139,7 @@ FT_BEGIN_HEADER /* then only destroys a face if the counter is~1, otherwise it simply */ /* decrements the counter. */ /* */ - /* This function helps in managing life-cycles of structures which */ + /* This function helps in managing life-cycles of structures that */ /* reference @FT_Face objects. */ /* */ /* <Input> */ @@ -2227,6 +2328,14 @@ FT_BEGIN_HEADER /* particular bitmap strike. Use @FT_Select_Size instead in that */ /* case. */ /* */ + /* The relation between the requested size and the resulting glyph */ + /* size is dependent entirely on how the size is defined in the */ + /* source face. The font designer chooses the final size of each */ + /* glyph relative to this size. For more information refer to */ + /* `http://www.freetype.org/freetype2/docs/glyphs/glyphs-2.html' */ + /* */ + /* Don't use this function if you are using the FreeType cache API. */ + /* */ FT_EXPORT( FT_Error ) FT_Request_Size( FT_Face face, FT_Size_Request req ); @@ -2296,6 +2405,13 @@ FT_BEGIN_HEADER /* <Return> */ /* FreeType error code. 0~means success. */ /* */ + /* <Note> */ + /* You should not rely on the resulting glyphs matching, or being */ + /* constrained, to this pixel size. Refer to @FT_Request_Size to */ + /* understand how requested sizes relate to actual sizes. */ + /* */ + /* Don't use this function if you are using the FreeType cache API. */ + /* */ FT_EXPORT( FT_Error ) FT_Set_Pixel_Sizes( FT_Face face, FT_UInt pixel_width, @@ -2334,7 +2450,7 @@ FT_BEGIN_HEADER /* the details. */ /* */ /* For subsetted CID-keyed fonts, `FT_Err_Invalid_Argument' is */ - /* returned for invalid CID values (this is, for CID values which */ + /* returned for invalid CID values (this is, for CID values that */ /* don't have a corresponding glyph in the font). See the discussion */ /* of the @FT_FACE_FLAG_CID_KEYED flag for more details. */ /* */ @@ -2409,14 +2525,20 @@ FT_BEGIN_HEADER * behaviour to more specific and useful cases. * * FT_LOAD_NO_SCALE :: - * Don't scale the outline glyph loaded, but keep it in font units. + * Don't scale the loaded outline glyph but keep it in font units. * * This flag implies @FT_LOAD_NO_HINTING and @FT_LOAD_NO_BITMAP, and * unsets @FT_LOAD_RENDER. * + * If the font is `tricky' (see @FT_FACE_FLAG_TRICKY for more), using + * FT_LOAD_NO_SCALE usually yields meaningless outlines because the + * subglyphs must be scaled and positioned with hinting instructions. + * This can be solved by loading the font without FT_LOAD_NO_SCALE and + * setting the character size to `font->units_per_EM'. + * * FT_LOAD_NO_HINTING :: - * Disable hinting. This generally generates `blurrier' bitmap glyph - * when the glyph is rendered in any of the anti-aliased modes. See + * Disable hinting. This generally generates `blurrier' bitmap glyphs + * when the glyph are rendered in any of the anti-aliased modes. See * also the note below. * * This flag is implied by @FT_LOAD_NO_SCALE. @@ -2435,18 +2557,19 @@ FT_BEGIN_HEADER * @FT_LOAD_NO_SCALE always sets this flag. * * FT_LOAD_VERTICAL_LAYOUT :: - * Load the glyph for vertical text layout. _Don't_ use it as it is - * problematic currently. + * Load the glyph for vertical text layout. In particular, the + * `advance' value in the @FT_GlyphSlotRec structure is set to the + * `vertAdvance' value of the `metrics' field. + * + * In case @FT_HAS_VERTICAL doesn't return true, you shouldn't use + * this flag currently. Reason is that in this case vertical metrics + * get synthesized, and those values are not always consistent across + * various font formats. * * FT_LOAD_FORCE_AUTOHINT :: * Indicates that the auto-hinter is preferred over the font's native * hinter. See also the note below. * - * FT_LOAD_CROP_BITMAP :: - * Indicates that the font driver should crop the loaded bitmap glyph - * (i.e., remove all space around its black bits). Not all drivers - * implement this. - * * FT_LOAD_PEDANTIC :: * Indicates that the font driver should perform pedantic verifications * during glyph loading. This is mostly used to detect broken glyphs @@ -2457,18 +2580,12 @@ FT_BEGIN_HEADER * result in partially hinted or distorted glyphs in case a glyph's * bytecode is buggy. * - * FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH :: - * Ignored. Deprecated. - * * FT_LOAD_NO_RECURSE :: - * This flag is only used internally. It merely indicates that the - * font driver should not load composite glyphs recursively. Instead, - * it should set the `num_subglyph' and `subglyphs' values of the - * glyph slot accordingly, and set `glyph->format' to - * @FT_GLYPH_FORMAT_COMPOSITE. - * - * The description of sub-glyphs is not available to client - * applications for now. + * Indicate that the font driver should not load composite glyphs + * recursively. Instead, it should set the `num_subglyph' and + * `subglyphs' values of the glyph slot accordingly, and set + * `glyph->format' to @FT_GLYPH_FORMAT_COMPOSITE. The description of + * subglyphs can then be accessed with @FT_Get_SubGlyph_Info. * * This flag implies @FT_LOAD_NO_SCALE and @FT_LOAD_IGNORE_TRANSFORM. * @@ -2493,6 +2610,20 @@ FT_BEGIN_HEADER * FT_LOAD_NO_AUTOHINT :: * Disable auto-hinter. See also the note below. * + * FT_LOAD_COLOR :: + * This flag is used to request loading of color embedded-bitmap + * images. The resulting color bitmaps, if available, will have the + * @FT_PIXEL_MODE_BGRA format. When the flag is not used and color + * bitmaps are found, they will be converted to 256-level gray + * bitmaps transparently. Those bitmaps will be in the + * @FT_PIXEL_MODE_GRAY format. + * + * FT_LOAD_CROP_BITMAP :: + * Ignored. Deprecated. + * + * FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH :: + * Ignored. Deprecated. + * * @note: * By default, hinting is enabled and the font's native hinter (see * @FT_FACE_FLAG_HINTER) is preferred over the auto-hinter. You can @@ -2507,6 +2638,13 @@ FT_BEGIN_HEADER * Besides deciding which hinter to use, you can also decide which * hinting algorithm to use. See @FT_LOAD_TARGET_XXX for details. * + * Note that the auto-hinter needs a valid Unicode cmap (either a native + * one or synthesized by FreeType) for producing correct results. If a + * font provides an incorrect mapping (for example, assigning the + * character code U+005A, LATIN CAPITAL LETTER Z, to a glyph depicting a + * mathematical integral sign), the auto-hinter might produce useless + * results. + * */ #define FT_LOAD_DEFAULT 0x0 #define FT_LOAD_NO_SCALE ( 1L << 0 ) @@ -2523,6 +2661,8 @@ FT_BEGIN_HEADER #define FT_LOAD_MONOCHROME ( 1L << 12 ) #define FT_LOAD_LINEAR_DESIGN ( 1L << 13 ) #define FT_LOAD_NO_AUTOHINT ( 1L << 15 ) + /* Bits 16..19 are used by `FT_LOAD_TARGET_' */ +#define FT_LOAD_COLOR ( 1L << 20 ) /* */ @@ -2579,8 +2719,9 @@ FT_BEGIN_HEADER * `load_flags'. They can't be ORed. * * If @FT_LOAD_RENDER is also set, the glyph is rendered in the - * corresponding mode (i.e., the mode which matches the used algorithm - * best) unless @FT_LOAD_MONOCHROME is set. + * corresponding mode (i.e., the mode that matches the used algorithm + * best). An exeption is FT_LOAD_TARGET_MONO since it implies + * @FT_LOAD_MONOCHROME. * * You can use a hinting algorithm that doesn't correspond to the same * rendering mode. As an example, it is possible to use the `light' @@ -2719,19 +2860,8 @@ FT_BEGIN_HEADER } FT_Render_Mode; - /*************************************************************************/ - /* */ - /* <Enum> */ - /* ft_render_mode_xxx */ - /* */ - /* <Description> */ - /* These constants are deprecated. Use the corresponding */ - /* @FT_Render_Mode values instead. */ - /* */ - /* <Values> */ - /* ft_render_mode_normal :: see @FT_RENDER_MODE_NORMAL */ - /* ft_render_mode_mono :: see @FT_RENDER_MODE_MONO */ - /* */ + /* these constants are deprecated; use the corresponding */ + /* `FT_Render_Mode' values instead */ #define ft_render_mode_normal FT_RENDER_MODE_NORMAL #define ft_render_mode_mono FT_RENDER_MODE_MONO @@ -2758,6 +2888,10 @@ FT_BEGIN_HEADER /* <Return> */ /* FreeType error code. 0~means success. */ /* */ + /* <Note> */ + /* To get meaningful results, font scaling values must be set with */ + /* functions like @FT_Set_Char_Size before calling FT_Render_Glyph. */ + /* */ FT_EXPORT( FT_Error ) FT_Render_Glyph( FT_GlyphSlot slot, FT_Render_Mode render_mode ); @@ -2791,39 +2925,10 @@ FT_BEGIN_HEADER } FT_Kerning_Mode; - /*************************************************************************/ - /* */ - /* <Const> */ - /* ft_kerning_default */ - /* */ - /* <Description> */ - /* This constant is deprecated. Please use @FT_KERNING_DEFAULT */ - /* instead. */ - /* */ + /* these constants are deprecated; use the corresponding */ + /* `FT_Kerning_Mode' values instead */ #define ft_kerning_default FT_KERNING_DEFAULT - - - /*************************************************************************/ - /* */ - /* <Const> */ - /* ft_kerning_unfitted */ - /* */ - /* <Description> */ - /* This constant is deprecated. Please use @FT_KERNING_UNFITTED */ - /* instead. */ - /* */ #define ft_kerning_unfitted FT_KERNING_UNFITTED - - - /*************************************************************************/ - /* */ - /* <Const> */ - /* ft_kerning_unscaled */ - /* */ - /* <Description> */ - /* This constant is deprecated. Please use @FT_KERNING_UNSCALED */ - /* instead. */ - /* */ #define ft_kerning_unscaled FT_KERNING_UNSCALED @@ -2922,7 +3027,7 @@ FT_BEGIN_HEADER /* */ /* glyph_index :: The glyph index. */ /* */ - /* buffer_max :: The maximal number of bytes available in the */ + /* buffer_max :: The maximum number of bytes available in the */ /* buffer. */ /* */ /* <Output> */ @@ -2944,9 +3049,8 @@ FT_BEGIN_HEADER /* glyph index~0 always corresponds to the `missing glyph' (called */ /* `.notdef'). */ /* */ - /* This function is not compiled within the library if the config */ - /* macro `FT_CONFIG_OPTION_NO_GLYPH_NAMES' is defined in */ - /* `include/freetype/config/ftoptions.h'. */ + /* This function always returns an error if the config macro */ + /* `FT_CONFIG_OPTION_NO_GLYPH_NAMES' is not defined in `ftoptions.h'. */ /* */ FT_EXPORT( FT_Error ) FT_Get_Glyph_Name( FT_Face face, @@ -3002,8 +3106,8 @@ FT_BEGIN_HEADER /* */ /* Because many fonts contain more than a single cmap for Unicode */ /* encoding, this function has some special code to select the one */ - /* which covers Unicode best (`best' in the sense that a UCS-4 cmap */ - /* is preferred to a UCS-2 cmap). It is thus preferable to */ + /* that covers Unicode best (`best' in the sense that a UCS-4 cmap is */ + /* preferred to a UCS-2 cmap). It is thus preferable to */ /* @FT_Set_Charmap in this case. */ /* */ FT_EXPORT( FT_Error ) @@ -3081,9 +3185,15 @@ FT_BEGIN_HEADER /* <Note> */ /* If you use FreeType to manipulate the contents of font files */ /* directly, be aware that the glyph index returned by this function */ - /* doesn't always correspond to the internal indices used within */ - /* the file. This is done to ensure that value~0 always corresponds */ - /* to the `missing glyph'. */ + /* doesn't always correspond to the internal indices used within the */ + /* file. This is done to ensure that value~0 always corresponds to */ + /* the `missing glyph'. If the first glyph is not named `.notdef', */ + /* then for Type~1 and Type~42 fonts, `.notdef' will be moved into */ + /* the glyph ID~0 position, and whatever was there will be moved to */ + /* the position `.notdef' had. For Type~1 fonts, if there is no */ + /* `.notdef' glyph at all, then one will be created at index~0 and */ + /* whatever was there will be moved to the last index -- Type~42 */ + /* fonts are considered invalid under this condition. */ /* */ FT_EXPORT( FT_UInt ) FT_Get_Char_Index( FT_Face face, @@ -3351,7 +3461,7 @@ FT_BEGIN_HEADER /* */ /* <Note> */ /* Use this function rather than directly reading the `fs_type' field */ - /* in the @PS_FontInfoRec structure which is only guaranteed to */ + /* in the @PS_FontInfoRec structure, which is only guaranteed to */ /* return the correct results for Type~1 fonts. */ /* */ /* <Since> */ @@ -3383,9 +3493,13 @@ FT_BEGIN_HEADER /* code range for CJK characters. */ /* */ /* An IVS is registered and unique; for further details please refer */ - /* to Unicode Technical Report #37, the Ideographic Variation */ - /* Database. To date (October 2007), the character with the most */ - /* variants is U+908A, having 8~such IVS. */ + /* to Unicode Technical Standard #37, the Ideographic Variation */ + /* Database: */ + /* */ + /* http://www.unicode.org/reports/tr37/ */ + /* */ + /* To date (November 2014), the character with the most variants is */ + /* U+9089, having 32 such IVS. */ /* */ /* Adobe and MS decided to support IVS with a new cmap subtable */ /* (format~14). It is an odd subtable because it is not a mapping of */ @@ -3527,7 +3641,7 @@ FT_BEGIN_HEADER /* The character codepoint in Unicode. */ /* */ /* <Return> */ - /* A pointer to an array of variant selector code points which are */ + /* A pointer to an array of variant selector code points that are */ /* active for the given character, or NULL if the corresponding list */ /* is empty. */ /* */ @@ -3561,7 +3675,7 @@ FT_BEGIN_HEADER /* The variant selector code point in Unicode. */ /* */ /* <Return> */ - /* A list of all the code points which are specified by this selector */ + /* A list of all the code points that are specified by this selector */ /* (both default and non-default codes are returned) or NULL if there */ /* is no valid cmap or the variant selector is invalid. */ /* */ @@ -3614,7 +3728,7 @@ FT_BEGIN_HEADER /* */ /* <Description> */ /* A very simple function used to perform the computation `(a*b)/c' */ - /* with maximal accuracy (it uses a 64-bit intermediate integer */ + /* with maximum accuracy (it uses a 64-bit intermediate integer */ /* whenever necessary). */ /* */ /* This function isn't necessarily as fast as some processor specific */ @@ -3636,12 +3750,6 @@ FT_BEGIN_HEADER FT_Long c ); - /* */ - - /* The following #if 0 ... #endif is for the documentation formatter, */ - /* hiding the internal `FT_MULFIX_INLINED' macro. */ - -#if 0 /*************************************************************************/ /* */ /* <Function> */ @@ -3649,8 +3757,8 @@ FT_BEGIN_HEADER /* */ /* <Description> */ /* A very simple function used to perform the computation */ - /* `(a*b)/0x10000' with maximal accuracy. Most of the time this is */ - /* used to multiply a given value by a 16.16 fixed float factor. */ + /* `(a*b)/0x10000' with maximum accuracy. Most of the time this is */ + /* used to multiply a given value by a 16.16 fixed-point factor. */ /* */ /* <Input> */ /* a :: The first multiplier. */ @@ -3675,17 +3783,6 @@ FT_BEGIN_HEADER FT_MulFix( FT_Long a, FT_Long b ); - /* */ -#endif - -#ifdef FT_MULFIX_INLINED -#define FT_MulFix( a, b ) FT_MULFIX_INLINED( a, b ) -#else - FT_EXPORT( FT_Long ) - FT_MulFix( FT_Long a, - FT_Long b ); -#endif - /*************************************************************************/ /* */ @@ -3694,22 +3791,16 @@ FT_BEGIN_HEADER /* */ /* <Description> */ /* A very simple function used to perform the computation */ - /* `(a*0x10000)/b' with maximal accuracy. Most of the time, this is */ - /* used to divide a given value by a 16.16 fixed float factor. */ + /* `(a*0x10000)/b' with maximum accuracy. Most of the time, this is */ + /* used to divide a given value by a 16.16 fixed-point factor. */ /* */ /* <Input> */ - /* a :: The first multiplier. */ - /* b :: The second multiplier. Use a 16.16 factor here whenever */ - /* possible (see note below). */ + /* a :: The numerator. */ + /* b :: The denominator. Use a 16.16 factor here. */ /* */ /* <Return> */ /* The result of `(a*0x10000)/b'. */ /* */ - /* <Note> */ - /* The optimization for FT_DivFix() is simple: If (a~<<~16) fits in */ - /* 32~bits, then the division is computed directly. Otherwise, we */ - /* use a specialized version of @FT_MulDiv. */ - /* */ FT_EXPORT( FT_Long ) FT_DivFix( FT_Long a, FT_Long b ); @@ -3809,6 +3900,18 @@ FT_BEGIN_HEADER /* even a new release of FreeType with only documentation changes */ /* increases the version number. */ /* */ + /* <Order> */ + /* FT_Library_Version */ + /* */ + /* FREETYPE_MAJOR */ + /* FREETYPE_MINOR */ + /* FREETYPE_PATCH */ + /* */ + /* FT_Face_CheckTrueTypePatents */ + /* FT_Face_SetUnpatentedHinting */ + /* */ + /* FREETYPE_XXX */ + /* */ /*************************************************************************/ @@ -3833,8 +3936,8 @@ FT_BEGIN_HEADER * */ #define FREETYPE_MAJOR 2 -#define FREETYPE_MINOR 4 -#define FREETYPE_PATCH 9 +#define FREETYPE_MINOR 5 +#define FREETYPE_PATCH 5 /*************************************************************************/ diff --git a/include/freetype/internal/internal.h b/include/freetype/internal/internal.h deleted file mode 100644 index f500a65..0000000 --- a/include/freetype/internal/internal.h +++ /dev/null @@ -1,51 +0,0 @@ -/***************************************************************************/ -/* */ -/* internal.h */ -/* */ -/* Internal header files (specification only). */ -/* */ -/* Copyright 1996-2001, 2002, 2003, 2004 by */ -/* David Turner, Robert Wilhelm, and Werner Lemberg. */ -/* */ -/* This file is part of the FreeType project, and may only be used, */ -/* modified, and distributed under the terms of the FreeType project */ -/* license, LICENSE.TXT. By continuing to use, modify, or distribute */ -/* this file you indicate that you have read the license and */ -/* understand and accept it fully. */ -/* */ -/***************************************************************************/ - - - /*************************************************************************/ - /* */ - /* This file is automatically included by `ft2build.h'. */ - /* Do not include it manually! */ - /* */ - /*************************************************************************/ - - -#define FT_INTERNAL_OBJECTS_H <freetype/internal/ftobjs.h> -#define FT_INTERNAL_PIC_H <freetype/internal/ftpic.h> -#define FT_INTERNAL_STREAM_H <freetype/internal/ftstream.h> -#define FT_INTERNAL_MEMORY_H <freetype/internal/ftmemory.h> -#define FT_INTERNAL_DEBUG_H <freetype/internal/ftdebug.h> -#define FT_INTERNAL_CALC_H <freetype/internal/ftcalc.h> -#define FT_INTERNAL_DRIVER_H <freetype/internal/ftdriver.h> -#define FT_INTERNAL_TRACE_H <freetype/internal/fttrace.h> -#define FT_INTERNAL_GLYPH_LOADER_H <freetype/internal/ftgloadr.h> -#define FT_INTERNAL_SFNT_H <freetype/internal/sfnt.h> -#define FT_INTERNAL_SERVICE_H <freetype/internal/ftserv.h> -#define FT_INTERNAL_RFORK_H <freetype/internal/ftrfork.h> -#define FT_INTERNAL_VALIDATE_H <freetype/internal/ftvalid.h> - -#define FT_INTERNAL_TRUETYPE_TYPES_H <freetype/internal/tttypes.h> -#define FT_INTERNAL_TYPE1_TYPES_H <freetype/internal/t1types.h> - -#define FT_INTERNAL_POSTSCRIPT_AUX_H <freetype/internal/psaux.h> -#define FT_INTERNAL_POSTSCRIPT_HINTS_H <freetype/internal/pshints.h> -#define FT_INTERNAL_POSTSCRIPT_GLOBALS_H <freetype/internal/psglobal.h> - -#define FT_INTERNAL_AUTOHINT_H <freetype/internal/autohint.h> - - -/* END */ diff --git a/include/ft2build.h b/include/ft2build.h index 923d887..6f8eb7f 100644 --- a/include/ft2build.h +++ b/include/ft2build.h @@ -3,9 +3,8 @@ /* ft2build.h */ /* */ /* FreeType 2 build and setup macros. */ -/* (Generic version) */ /* */ -/* Copyright 1996-2001, 2006 by */ +/* Copyright 1996-2001, 2006, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -19,21 +18,25 @@ /*************************************************************************/ /* */ - /* This file corresponds to the default `ft2build.h' file for */ - /* FreeType 2. It uses the `freetype' include root. */ + /* This is the `entry point' for FreeType header file inclusions. It is */ + /* the only header file which should be included directly; all other */ + /* FreeType header files should be accessed with macro names (after */ + /* including `ft2build.h'). */ /* */ - /* Note that specific platforms might use a different configuration. */ - /* See builds/unix/ft2unix.h for an example. */ + /* A typical example is */ + /* */ + /* #include <ft2build.h> */ + /* #include FT_FREETYPE_H */ /* */ /*************************************************************************/ -#ifndef __FT2_BUILD_GENERIC_H__ -#define __FT2_BUILD_GENERIC_H__ +#ifndef __FT2BUILD_H__ +#define __FT2BUILD_H__ -#include <freetype/config/ftheader.h> +#include <config/ftheader.h> -#endif /* __FT2_BUILD_GENERIC_H__ */ +#endif /* __FT2BUILD_H__ */ /* END */ diff --git a/include/freetype/ftadvanc.h b/include/ftadvanc.h similarity index 89% rename from include/freetype/ftadvanc.h rename to include/ftadvanc.h index b2451be..955f93f 100644 --- a/include/freetype/ftadvanc.h +++ b/include/ftadvanc.h @@ -4,7 +4,7 @@ /* */ /* Quick computation of advance widths (specification only). */ /* */ -/* Copyright 2008 by */ +/* Copyright 2008, 2013, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -48,6 +48,11 @@ FT_BEGIN_HEADER * @description: * This section contains functions to quickly extract advance values * without handling glyph outlines, if possible. + * + * @order: + * FT_Get_Advance + * FT_Get_Advances + * */ @@ -64,11 +69,11 @@ FT_BEGIN_HEADER /* corresponding hinting mode or font driver doesn't allow for very */ /* quick advance computation. */ /* */ - /* Typically, glyphs which are either unscaled, unhinted, bitmapped, */ + /* Typically, glyphs that are either unscaled, unhinted, bitmapped, */ /* or light-hinted can have their advance width computed very */ /* quickly. */ /* */ - /* Normal and bytecode hinted modes, which require loading, scaling, */ + /* Normal and bytecode hinted modes that require loading, scaling, */ /* and hinting of the glyph outline, are extremely slow by */ /* comparison. */ /* */ @@ -82,8 +87,7 @@ FT_BEGIN_HEADER /* */ /* <Description> */ /* Retrieve the advance value of a given glyph outline in an */ - /* @FT_Face. By default, the unhinted advance is returned in font */ - /* units. */ + /* @FT_Face. */ /* */ /* <Input> */ /* face :: The source @FT_Face handle. */ @@ -94,8 +98,9 @@ FT_BEGIN_HEADER /* calling @FT_Load_Glyph, used to determine what kind */ /* of advances you need. */ /* <Output> */ - /* padvance :: The advance value, in either font units or 16.16 */ - /* format. */ + /* padvance :: The advance value. If scaling is performed (based on */ + /* the value of `load_flags'), the advance value is in */ + /* 16.16 format. Otherwise, it is in font units. */ /* */ /* If @FT_LOAD_VERTICAL_LAYOUT is set, this is the */ /* vertical advance corresponding to a vertical layout. */ @@ -127,8 +132,7 @@ FT_BEGIN_HEADER /* */ /* <Description> */ /* Retrieve the advance values of several glyph outlines in an */ - /* @FT_Face. By default, the unhinted advances are returned in font */ - /* units. */ + /* @FT_Face. */ /* */ /* <Input> */ /* face :: The source @FT_Face handle. */ @@ -141,8 +145,12 @@ FT_BEGIN_HEADER /* calling @FT_Load_Glyph. */ /* */ /* <Output> */ - /* padvance :: The advances, in either font units or 16.16 format. */ - /* This array must contain at least `count' elements. */ + /* padvance :: The advance values. This array, to be provided by the */ + /* caller, must contain at least `count' elements. */ + /* */ + /* If scaling is performed (based on the value of */ + /* `load_flags'), the advance values are in 16.16 format. */ + /* Otherwise, they are in font units. */ /* */ /* If @FT_LOAD_VERTICAL_LAYOUT is set, these are the */ /* vertical advances corresponding to a vertical layout. */ @@ -168,7 +176,7 @@ FT_BEGIN_HEADER FT_Int32 load_flags, FT_Fixed *padvances ); -/* */ + /* */ FT_END_HEADER diff --git a/include/ftautoh.h b/include/ftautoh.h new file mode 100644 index 0000000..59191ab --- /dev/null +++ b/include/ftautoh.h @@ -0,0 +1,402 @@ +/***************************************************************************/ +/* */ +/* ftautoh.h */ +/* */ +/* FreeType API for controlling the auto-hinter (specification only). */ +/* */ +/* Copyright 2012, 2013 by */ +/* David Turner, Robert Wilhelm, and Werner Lemberg. */ +/* */ +/* This file is part of the FreeType project, and may only be used, */ +/* modified, and distributed under the terms of the FreeType project */ +/* license, LICENSE.TXT. By continuing to use, modify, or distribute */ +/* this file you indicate that you have read the license and */ +/* understand and accept it fully. */ +/* */ +/***************************************************************************/ + + +#ifndef __FTAUTOH_H__ +#define __FTAUTOH_H__ + +#include <ft2build.h> +#include FT_FREETYPE_H + +#ifdef FREETYPE_H +#error "freetype.h of FreeType 1 has been loaded!" +#error "Please fix the directory search order for header files" +#error "so that freetype.h of FreeType 2 is found first." +#endif + + +FT_BEGIN_HEADER + + + /************************************************************************** + * + * @section: + * auto_hinter + * + * @title: + * The auto-hinter + * + * @abstract: + * Controlling the auto-hinting module. + * + * @description: + * While FreeType's auto-hinter doesn't expose API functions by itself, + * it is possible to control its behaviour with @FT_Property_Set and + * @FT_Property_Get. The following lists the available properties + * together with the necessary macros and structures. + * + * Note that the auto-hinter's module name is `autofitter' for + * historical reasons. + * + */ + + + /************************************************************************** + * + * @property: + * glyph-to-script-map + * + * @description: + * *Experimental* *only* + * + * The auto-hinter provides various script modules to hint glyphs. + * Examples of supported scripts are Latin or CJK. Before a glyph is + * auto-hinted, the Unicode character map of the font gets examined, and + * the script is then determined based on Unicode character ranges, see + * below. + * + * OpenType fonts, however, often provide much more glyphs than + * character codes (small caps, superscripts, ligatures, swashes, etc.), + * to be controlled by so-called `features'. Handling OpenType features + * can be quite complicated and thus needs a separate library on top of + * FreeType. + * + * The mapping between glyph indices and scripts (in the auto-hinter + * sense, see the @FT_AUTOHINTER_SCRIPT_XXX values) is stored as an + * array with `num_glyphs' elements, as found in the font's @FT_Face + * structure. The `glyph-to-script-map' property returns a pointer to + * this array, which can be modified as needed. Note that the + * modification should happen before the first glyph gets processed by + * the auto-hinter so that the global analysis of the font shapes + * actually uses the modified mapping. + * + * The following example code demonstrates how to access it (omitting + * the error handling). + * + * { + * FT_Library library; + * FT_Face face; + * FT_Prop_GlyphToScriptMap prop; + * + * + * FT_Init_FreeType( &library ); + * FT_New_Face( library, "foo.ttf", 0, &face ); + * + * prop.face = face; + * + * FT_Property_Get( library, "autofitter", + * "glyph-to-script-map", &prop ); + * + * // adjust `prop.map' as needed right here + * + * FT_Load_Glyph( face, ..., FT_LOAD_FORCE_AUTOHINT ); + * } + * + */ + + + /************************************************************************** + * + * @enum: + * FT_AUTOHINTER_SCRIPT_XXX + * + * @description: + * *Experimental* *only* + * + * A list of constants used for the @glyph-to-script-map property to + * specify the script submodule the auto-hinter should use for hinting a + * particular glyph. + * + * @values: + * FT_AUTOHINTER_SCRIPT_NONE :: + * Don't auto-hint this glyph. + * + * FT_AUTOHINTER_SCRIPT_LATIN :: + * Apply the latin auto-hinter. For the auto-hinter, `latin' is a + * very broad term, including Cyrillic and Greek also since characters + * from those scripts share the same design constraints. + * + * By default, characters from the following Unicode ranges are + * assigned to this submodule. + * + * { + * U+0020 - U+007F // Basic Latin (no control characters) + * U+00A0 - U+00FF // Latin-1 Supplement (no control characters) + * U+0100 - U+017F // Latin Extended-A + * U+0180 - U+024F // Latin Extended-B + * U+0250 - U+02AF // IPA Extensions + * U+02B0 - U+02FF // Spacing Modifier Letters + * U+0300 - U+036F // Combining Diacritical Marks + * U+0370 - U+03FF // Greek and Coptic + * U+0400 - U+04FF // Cyrillic + * U+0500 - U+052F // Cyrillic Supplement + * U+1D00 - U+1D7F // Phonetic Extensions + * U+1D80 - U+1DBF // Phonetic Extensions Supplement + * U+1DC0 - U+1DFF // Combining Diacritical Marks Supplement + * U+1E00 - U+1EFF // Latin Extended Additional + * U+1F00 - U+1FFF // Greek Extended + * U+2000 - U+206F // General Punctuation + * U+2070 - U+209F // Superscripts and Subscripts + * U+20A0 - U+20CF // Currency Symbols + * U+2150 - U+218F // Number Forms + * U+2460 - U+24FF // Enclosed Alphanumerics + * U+2C60 - U+2C7F // Latin Extended-C + * U+2DE0 - U+2DFF // Cyrillic Extended-A + * U+2E00 - U+2E7F // Supplemental Punctuation + * U+A640 - U+A69F // Cyrillic Extended-B + * U+A720 - U+A7FF // Latin Extended-D + * U+FB00 - U+FB06 // Alphab. Present. Forms (Latin Ligatures) + * U+1D400 - U+1D7FF // Mathematical Alphanumeric Symbols + * U+1F100 - U+1F1FF // Enclosed Alphanumeric Supplement + * } + * + * FT_AUTOHINTER_SCRIPT_CJK :: + * Apply the CJK auto-hinter, covering Chinese, Japanese, Korean, old + * Vietnamese, and some other scripts. + * + * By default, characters from the following Unicode ranges are + * assigned to this submodule. + * + * { + * U+1100 - U+11FF // Hangul Jamo + * U+2E80 - U+2EFF // CJK Radicals Supplement + * U+2F00 - U+2FDF // Kangxi Radicals + * U+2FF0 - U+2FFF // Ideographic Description Characters + * U+3000 - U+303F // CJK Symbols and Punctuation + * U+3040 - U+309F // Hiragana + * U+30A0 - U+30FF // Katakana + * U+3100 - U+312F // Bopomofo + * U+3130 - U+318F // Hangul Compatibility Jamo + * U+3190 - U+319F // Kanbun + * U+31A0 - U+31BF // Bopomofo Extended + * U+31C0 - U+31EF // CJK Strokes + * U+31F0 - U+31FF // Katakana Phonetic Extensions + * U+3200 - U+32FF // Enclosed CJK Letters and Months + * U+3300 - U+33FF // CJK Compatibility + * U+3400 - U+4DBF // CJK Unified Ideographs Extension A + * U+4DC0 - U+4DFF // Yijing Hexagram Symbols + * U+4E00 - U+9FFF // CJK Unified Ideographs + * U+A960 - U+A97F // Hangul Jamo Extended-A + * U+AC00 - U+D7AF // Hangul Syllables + * U+D7B0 - U+D7FF // Hangul Jamo Extended-B + * U+F900 - U+FAFF // CJK Compatibility Ideographs + * U+FE10 - U+FE1F // Vertical forms + * U+FE30 - U+FE4F // CJK Compatibility Forms + * U+FF00 - U+FFEF // Halfwidth and Fullwidth Forms + * U+1B000 - U+1B0FF // Kana Supplement + * U+1D300 - U+1D35F // Tai Xuan Hing Symbols + * U+1F200 - U+1F2FF // Enclosed Ideographic Supplement + * U+20000 - U+2A6DF // CJK Unified Ideographs Extension B + * U+2A700 - U+2B73F // CJK Unified Ideographs Extension C + * U+2B740 - U+2B81F // CJK Unified Ideographs Extension D + * U+2F800 - U+2FA1F // CJK Compatibility Ideographs Supplement + * } + * + * FT_AUTOHINTER_SCRIPT_INDIC :: + * Apply the indic auto-hinter, covering all major scripts from the + * Indian sub-continent and some other related scripts like Thai, Lao, + * or Tibetan. + * + * By default, characters from the following Unicode ranges are + * assigned to this submodule. + * + * { + * U+0900 - U+0DFF // Indic Range + * U+0F00 - U+0FFF // Tibetan + * U+1900 - U+194F // Limbu + * U+1B80 - U+1BBF // Sundanese + * U+1C80 - U+1CDF // Meetei Mayak + * U+A800 - U+A82F // Syloti Nagri + * U+11800 - U+118DF // Sharada + * } + * + * Note that currently Indic support is rudimentary only, missing blue + * zone support. + * + */ +#define FT_AUTOHINTER_SCRIPT_NONE 0 +#define FT_AUTOHINTER_SCRIPT_LATIN 1 +#define FT_AUTOHINTER_SCRIPT_CJK 2 +#define FT_AUTOHINTER_SCRIPT_INDIC 3 + + + /************************************************************************** + * + * @struct: + * FT_Prop_GlyphToScriptMap + * + * @description: + * *Experimental* *only* + * + * The data exchange structure for the @glyph-to-script-map property. + * + */ + typedef struct FT_Prop_GlyphToScriptMap_ + { + FT_Face face; + FT_Byte* map; + + } FT_Prop_GlyphToScriptMap; + + + /************************************************************************** + * + * @property: + * fallback-script + * + * @description: + * *Experimental* *only* + * + * If no auto-hinter script module can be assigned to a glyph, a + * fallback script gets assigned to it (see also the + * @glyph-to-script-map property). By default, this is + * @FT_AUTOHINTER_SCRIPT_CJK. Using the `fallback-script' property, + * this fallback value can be changed. + * + * { + * FT_Library library; + * FT_UInt fallback_script = FT_AUTOHINTER_SCRIPT_NONE; + * + * + * FT_Init_FreeType( &library ); + * + * FT_Property_Set( library, "autofitter", + * "fallback-script", &fallback_script ); + * } + * + * @note: + * This property can be used with @FT_Property_Get also. + * + * It's important to use the right timing for changing this value: The + * creation of the glyph-to-script map that eventually uses the + * fallback script value gets triggered either by setting or reading a + * face-specific property like @glyph-to-script-map, or by auto-hinting + * any glyph from that face. In particular, if you have already created + * an @FT_Face structure but not loaded any glyph (using the + * auto-hinter), a change of the fallback script will affect this face. + * + */ + + + /************************************************************************** + * + * @property: + * default-script + * + * @description: + * *Experimental* *only* + * + * If Freetype gets compiled with FT_CONFIG_OPTION_USE_HARFBUZZ to make + * the HarfBuzz library access OpenType features for getting better + * glyph coverages, this property sets the (auto-fitter) script to be + * used for the default (OpenType) script data of a font's GSUB table. + * Features for the default script are intended for all scripts not + * explicitly handled in GSUB; an example is a `dlig' feature, + * containing the combination of the characters `T', `E', and `L' to + * form a `TEL' ligature. + * + * By default, this is @FT_AUTOHINTER_SCRIPT_LATIN. Using the + * `default-script' property, this default value can be changed. + * + * { + * FT_Library library; + * FT_UInt default_script = FT_AUTOHINTER_SCRIPT_NONE; + * + * + * FT_Init_FreeType( &library ); + * + * FT_Property_Set( library, "autofitter", + * "default-script", &default_script ); + * } + * + * @note: + * This property can be used with @FT_Property_Get also. + * + * It's important to use the right timing for changing this value: The + * creation of the glyph-to-script map that eventually uses the + * default script value gets triggered either by setting or reading a + * face-specific property like @glyph-to-script-map, or by auto-hinting + * any glyph from that face. In particular, if you have already created + * an @FT_Face structure but not loaded any glyph (using the + * auto-hinter), a change of the default script will affect this face. + * + */ + + + /************************************************************************** + * + * @property: + * increase-x-height + * + * @description: + * For ppem values in the range 6~<= ppem <= `increase-x-height', round + * up the font's x~height much more often than normally. If the value + * is set to~0, which is the default, this feature is switched off. Use + * this property to improve the legibility of small font sizes if + * necessary. + * + * { + * FT_Library library; + * FT_Face face; + * FT_Prop_IncreaseXHeight prop; + * + * + * FT_Init_FreeType( &library ); + * FT_New_Face( library, "foo.ttf", 0, &face ); + * FT_Set_Char_Size( face, 10 * 64, 0, 72, 0 ); + * + * prop.face = face; + * prop.limit = 14; + * + * FT_Property_Set( library, "autofitter", + * "increase-x-height", &prop ); + * } + * + * @note: + * This property can be used with @FT_Property_Get also. + * + * Set this value right after calling @FT_Set_Char_Size, but before + * loading any glyph (using the auto-hinter). + * + */ + + + /************************************************************************** + * + * @struct: + * FT_Prop_IncreaseXHeight + * + * @description: + * The data exchange structure for the @increase-x-height property. + * + */ + typedef struct FT_Prop_IncreaseXHeight_ + { + FT_Face face; + FT_UInt limit; + + } FT_Prop_IncreaseXHeight; + + /* */ + + +FT_END_HEADER + +#endif /* __FTAUTOH_H__ */ + + +/* END */ diff --git a/include/freetype/ftbbox.h b/include/ftbbox.h similarity index 97% rename from include/freetype/ftbbox.h rename to include/ftbbox.h index 9766919..d6800e2 100644 --- a/include/freetype/ftbbox.h +++ b/include/ftbbox.h @@ -4,7 +4,7 @@ /* */ /* FreeType exact bbox computation (specification). */ /* */ -/* Copyright 1996-2001, 2003, 2007, 2011 by */ +/* Copyright 1996-2001, 2003, 2007, 2011, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -60,7 +60,7 @@ FT_BEGIN_HEADER /* <Description> */ /* Compute the exact bounding box of an outline. This is slower */ /* than computing the control box. However, it uses an advanced */ - /* algorithm which returns _very_ quickly when the two boxes */ + /* algorithm that returns _very_ quickly when the two boxes */ /* coincide. Otherwise, the outline Bézier arcs are traversed to */ /* extract their extrema. */ /* */ @@ -78,14 +78,13 @@ FT_BEGIN_HEADER /* @FT_LOAD_NO_SCALE, the resulting BBox is meaningless. To get */ /* reasonable values for the BBox it is necessary to load the glyph */ /* at a large ppem value (so that the hinting instructions can */ - /* properly shift and scale the subglyphs), then extracting the BBox */ + /* properly shift and scale the subglyphs), then extracting the BBox, */ /* which can be eventually converted back to font units. */ /* */ FT_EXPORT( FT_Error ) FT_Outline_Get_BBox( FT_Outline* outline, FT_BBox *abbox ); - /* */ diff --git a/include/freetype/ftbdf.h b/include/ftbdf.h similarity index 96% rename from include/freetype/ftbdf.h rename to include/ftbdf.h index 4f8baf8..6d262e4 100644 --- a/include/freetype/ftbdf.h +++ b/include/ftbdf.h @@ -4,7 +4,7 @@ /* */ /* FreeType API for accessing BDF-specific strings (specification). */ /* */ -/* Copyright 2002, 2003, 2004, 2006, 2009 by */ +/* Copyright 2002-2004, 2006, 2009, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -53,7 +53,7 @@ FT_BEGIN_HEADER /********************************************************************** * * @enum: - * FT_PropertyType + * BDF_PropertyType * * @description: * A list of BDF property types. @@ -106,7 +106,8 @@ FT_BEGIN_HEADER * The property type. * * u.atom :: - * The atom string, if type is @BDF_PROPERTY_TYPE_ATOM. + * The atom string, if type is @BDF_PROPERTY_TYPE_ATOM. May be + * NULL, indicating an empty string. * * u.integer :: * A signed integer, if type is @BDF_PROPERTY_TYPE_INTEGER. @@ -199,7 +200,7 @@ FT_BEGIN_HEADER const char* prop_name, BDF_PropertyRec *aproperty ); - /* */ + /* */ FT_END_HEADER diff --git a/include/freetype/ftbitmap.h b/include/ftbitmap.h similarity index 94% rename from include/freetype/ftbitmap.h rename to include/ftbitmap.h index 9274236..eae7169 100644 --- a/include/freetype/ftbitmap.h +++ b/include/ftbitmap.h @@ -4,7 +4,7 @@ /* */ /* FreeType utility functions for bitmaps (specification). */ /* */ -/* Copyright 2004, 2005, 2006, 2008 by */ +/* Copyright 2004-2006, 2008, 2013, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -45,7 +45,9 @@ FT_BEGIN_HEADER /* Handling FT_Bitmap objects. */ /* */ /* <Description> */ - /* This section contains functions for converting FT_Bitmap objects. */ + /* This section contains functions for handling @FT_Bitmap objects. */ + /* Note that none of the functions changes the bitmap's `flow' (as */ + /* indicated by the sign of the `pitch' field in `FT_Bitmap'). */ /* */ /*************************************************************************/ @@ -122,6 +124,9 @@ FT_BEGIN_HEADER /* If you want to embolden the bitmap owned by a @FT_GlyphSlotRec, */ /* you should call @FT_GlyphSlot_Own_Bitmap on the slot first. */ /* */ + /* Bitmaps in @FT_PIXEL_MODE_GRAY2 and @FT_PIXEL_MODE_GRAY@ format */ + /* are converted to @FT_PIXEL_MODE_GRAY format (i.e., 8bpp). */ + /* */ FT_EXPORT( FT_Error ) FT_Bitmap_Embolden( FT_Library library, FT_Bitmap* bitmap, @@ -135,9 +140,9 @@ FT_BEGIN_HEADER /* FT_Bitmap_Convert */ /* */ /* <Description> */ - /* Convert a bitmap object with depth 1bpp, 2bpp, 4bpp, or 8bpp to a */ - /* bitmap object with depth 8bpp, making the number of used bytes per */ - /* line (a.k.a. the `pitch') a multiple of `alignment'. */ + /* Convert a bitmap object with depth 1bpp, 2bpp, 4bpp, 8bpp or 32bpp */ + /* to a bitmap object with depth 8bpp, making the number of used */ + /* bytes line (a.k.a. the `pitch') a multiple of `alignment'. */ /* */ /* <Input> */ /* library :: A handle to a library object. */ diff --git a/include/freetype/ftbzip2.h b/include/ftbzip2.h similarity index 99% rename from include/freetype/ftbzip2.h rename to include/ftbzip2.h index 1bf81b1..4dce161 100644 --- a/include/freetype/ftbzip2.h +++ b/include/ftbzip2.h @@ -91,7 +91,7 @@ FT_BEGIN_HEADER FT_Stream_OpenBzip2( FT_Stream stream, FT_Stream source ); - /* */ + /* */ FT_END_HEADER diff --git a/include/freetype/ftcache.h b/include/ftcache.h similarity index 94% rename from include/freetype/ftcache.h rename to include/ftcache.h index 6af5306..a30e925 100644 --- a/include/freetype/ftcache.h +++ b/include/ftcache.h @@ -4,7 +4,7 @@ /* */ /* FreeType Cache subsystem (specification). */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010 by */ +/* Copyright 1996-2008, 2010, 2013, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -156,7 +156,7 @@ FT_BEGIN_HEADER * @note: * Never use NULL as a valid @FTC_FaceID. * - * Face IDs are passed by the client to the cache manager, which calls, + * Face IDs are passed by the client to the cache manager that calls, * when needed, the @FTC_Face_Requester to translate them into new * @FT_Face objects. * @@ -209,22 +209,11 @@ FT_BEGIN_HEADER typedef FT_Error (*FTC_Face_Requester)( FTC_FaceID face_id, FT_Library library, - FT_Pointer request_data, + FT_Pointer req_data, FT_Face* aface ); - /* */ - -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS - - /* these macros are incompatible with LLP64, should not be used */ - -#define FT_POINTER_TO_ULONG( p ) ( (FT_ULong)(FT_Pointer)(p) ) - -#define FTC_FACE_ID_HASH( i ) \ - ((FT_UInt32)(( FT_POINTER_TO_ULONG( i ) >> 3 ) ^ \ - ( FT_POINTER_TO_ULONG( i ) << 7 ) ) ) + /* */ -#endif /* FT_CONFIG_OPTION_OLD_INTERNALS */ /*************************************************************************/ /*************************************************************************/ @@ -381,7 +370,7 @@ FT_BEGIN_HEADER /* should never try to discard it yourself. */ /* */ /* The @FT_Face object doesn't necessarily have a current size object */ - /* (i.e., face->size can be 0). If you need a specific `font size', */ + /* (i.e., face->size can be~0). If you need a specific `font size', */ /* use @FTC_Manager_LookupSize instead. */ /* */ /* Never change the face's transformation matrix (i.e., never call */ @@ -705,17 +694,6 @@ FT_BEGIN_HEADER (d1)->width == (d2)->width && \ (d1)->flags == (d2)->flags ) -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS - - /* this macro is incompatible with LLP64, should not be used */ - -#define FTC_IMAGE_TYPE_HASH( d ) \ - (FT_UFast)( FTC_FACE_ID_HASH( (d)->face_id ) ^ \ - ( (d)->width << 8 ) ^ (d)->height ^ \ - ( (d)->flags << 4 ) ) - -#endif /* FT_CONFIG_OPTION_OLD_INTERNALS */ - /*************************************************************************/ /* */ @@ -723,7 +701,7 @@ FT_BEGIN_HEADER /* FTC_ImageCache */ /* */ /* <Description> */ - /* A handle to an glyph image cache object. They are designed to */ + /* A handle to a glyph image cache object. They are designed to */ /* hold many distinct glyph images while not exceeding a certain */ /* memory threshold. */ /* */ @@ -1068,70 +1046,9 @@ FT_BEGIN_HEADER FTC_SBit *sbit, FTC_Node *anode ); - - /* */ - -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS - - /*@***********************************************************************/ - /* */ - /* <Struct> */ - /* FTC_FontRec */ - /* */ - /* <Description> */ - /* A simple structure used to describe a given `font' to the cache */ - /* manager. Note that a `font' is the combination of a given face */ - /* with a given character size. */ - /* */ - /* <Fields> */ - /* face_id :: The ID of the face to use. */ - /* */ - /* pix_width :: The character width in integer pixels. */ - /* */ - /* pix_height :: The character height in integer pixels. */ - /* */ - typedef struct FTC_FontRec_ - { - FTC_FaceID face_id; - FT_UShort pix_width; - FT_UShort pix_height; - - } FTC_FontRec; - - /* */ -#define FTC_FONT_COMPARE( f1, f2 ) \ - ( (f1)->face_id == (f2)->face_id && \ - (f1)->pix_width == (f2)->pix_width && \ - (f1)->pix_height == (f2)->pix_height ) - - /* this macro is incompatible with LLP64, should not be used */ -#define FTC_FONT_HASH( f ) \ - (FT_UInt32)( FTC_FACE_ID_HASH((f)->face_id) ^ \ - ((f)->pix_width << 8) ^ \ - ((f)->pix_height) ) - - typedef FTC_FontRec* FTC_Font; - - - FT_EXPORT( FT_Error ) - FTC_Manager_Lookup_Face( FTC_Manager manager, - FTC_FaceID face_id, - FT_Face *aface ); - - FT_EXPORT( FT_Error ) - FTC_Manager_Lookup_Size( FTC_Manager manager, - FTC_Font font, - FT_Face *aface, - FT_Size *asize ); - -#endif /* FT_CONFIG_OPTION_OLD_INTERNALS */ - - - /* */ - FT_END_HEADER #endif /* __FTCACHE_H__ */ diff --git a/include/ftcffdrv.h b/include/ftcffdrv.h new file mode 100644 index 0000000..f7031bc --- /dev/null +++ b/include/ftcffdrv.h @@ -0,0 +1,262 @@ +/***************************************************************************/ +/* */ +/* ftcffdrv.h */ +/* */ +/* FreeType API for controlling the CFF driver (specification only). */ +/* */ +/* Copyright 2013, 2014 by */ +/* David Turner, Robert Wilhelm, and Werner Lemberg. */ +/* */ +/* This file is part of the FreeType project, and may only be used, */ +/* modified, and distributed under the terms of the FreeType project */ +/* license, LICENSE.TXT. By continuing to use, modify, or distribute */ +/* this file you indicate that you have read the license and */ +/* understand and accept it fully. */ +/* */ +/***************************************************************************/ + + +#ifndef __FTCFFDRV_H__ +#define __FTCFFDRV_H__ + +#include <ft2build.h> +#include FT_FREETYPE_H + +#ifdef FREETYPE_H +#error "freetype.h of FreeType 1 has been loaded!" +#error "Please fix the directory search order for header files" +#error "so that freetype.h of FreeType 2 is found first." +#endif + + +FT_BEGIN_HEADER + + + /************************************************************************** + * + * @section: + * cff_driver + * + * @title: + * The CFF driver + * + * @abstract: + * Controlling the CFF driver module. + * + * @description: + * While FreeType's CFF driver doesn't expose API functions by itself, + * it is possible to control its behaviour with @FT_Property_Set and + * @FT_Property_Get. The list below gives the available properties + * together with the necessary macros and structures. + * + * The CFF driver's module name is `cff'. + * + * *Hinting* *and* *antialiasing* *principles* *of* *the* *new* *engine* + * + * The rasterizer is positioning horizontal features (e.g., ascender + * height & x-height, or crossbars) on the pixel grid and minimizing the + * amount of antialiasing applied to them, while placing vertical + * features (vertical stems) on the pixel grid without hinting, thus + * representing the stem position and weight accurately. Sometimes the + * vertical stems may be only partially black. In this context, + * `antialiasing' means that stems are not positioned exactly on pixel + * borders, causing a fuzzy appearance. + * + * There are two principles behind this approach. + * + * 1) No hinting in the horizontal direction: Unlike `superhinted' + * TrueType, which changes glyph widths to accommodate regular + * inter-glyph spacing, Adobe's approach is `faithful to the design' in + * representing both the glyph width and the inter-glyph spacing + * designed for the font. This makes the screen display as close as it + * can be to the result one would get with infinite resolution, while + * preserving what is considered the key characteristics of each glyph. + * Note that the distances between unhinted and grid-fitted positions at + * small sizes are comparable to kerning values and thus would be + * noticeable (and distracting) while reading if hinting were applied. + * + * One of the reasons to not hint horizontally is antialiasing for LCD + * screens: The pixel geometry of modern displays supplies three + * vertical sub-pixels as the eye moves horizontally across each visible + * pixel. On devices where we can be certain this characteristic is + * present a rasterizer can take advantage of the sub-pixels to add + * increments of weight. In Western writing systems this turns out to + * be the more critical direction anyway; the weights and spacing of + * vertical stems (see above) are central to Armenian, Cyrillic, Greek, + * and Latin type designs. Even when the rasterizer uses greyscale + * antialiasing instead of color (a necessary compromise when one + * doesn't know the screen characteristics), the unhinted vertical + * features preserve the design's weight and spacing much better than + * aliased type would. + * + * 2) Aligment in the vertical direction: Weights and spacing along the + * y~axis are less critical; what is much more important is the visual + * alignment of related features (like cap-height and x-height). The + * sense of alignment for these is enhanced by the sharpness of grid-fit + * edges, while the cruder vertical resolution (full pixels instead of + * 1/3 pixels) is less of a problem. + * + * On the technical side, horizontal alignment zones for ascender, + * x-height, and other important height values (traditionally called + * `blue zones') as defined in the font are positioned independently, + * each being rounded to the nearest pixel edge, taking care of + * overshoot suppression at small sizes, stem darkening, and scaling. + * + * Hstems (this is, hint values defined in the font to help align + * horizontal features) that fall within a blue zone are said to be + * `captured' and are aligned to that zone. Uncaptured stems are moved + * in one of four ways, top edge up or down, bottom edge up or down. + * Unless there are conflicting hstems, the smallest movement is taken + * to minimize distortion. + * + * @order: + * hinting-engine + * no-stem-darkening + * darkening-parameters + * + */ + + + /************************************************************************** + * + * @property: + * hinting-engine + * + * @description: + * Thanks to Adobe, which contributed a new hinting (and parsing) + * engine, an application can select between `freetype' and `adobe' if + * compiled with CFF_CONFIG_OPTION_OLD_ENGINE. If this configuration + * macro isn't defined, `hinting-engine' does nothing. + * + * The default engine is `freetype' if CFF_CONFIG_OPTION_OLD_ENGINE is + * defined, and `adobe' otherwise. + * + * The following example code demonstrates how to select Adobe's hinting + * engine (omitting the error handling). + * + * { + * FT_Library library; + * FT_UInt hinting_engine = FT_CFF_HINTING_ADOBE; + * + * + * FT_Init_FreeType( &library ); + * + * FT_Property_Set( library, "cff", + * "hinting-engine", &hinting_engine ); + * } + * + * @note: + * This property can be used with @FT_Property_Get also. + * + */ + + + /************************************************************************** + * + * @enum: + * FT_CFF_HINTING_XXX + * + * @description: + * A list of constants used for the @hinting-engine property to select + * the hinting engine for CFF fonts. + * + * @values: + * FT_CFF_HINTING_FREETYPE :: + * Use the old FreeType hinting engine. + * + * FT_CFF_HINTING_ADOBE :: + * Use the hinting engine contributed by Adobe. + * + */ +#define FT_CFF_HINTING_FREETYPE 0 +#define FT_CFF_HINTING_ADOBE 1 + + + /************************************************************************** + * + * @property: + * no-stem-darkening + * + * @description: + * By default, the Adobe CFF engine darkens stems at smaller sizes, + * regardless of hinting, to enhance contrast. This feature requires + * a rendering system with proper gamma correction. Setting this + * property, stem darkening gets switched off. + * + * Note that stem darkening is never applied if @FT_LOAD_NO_SCALE is set. + * + * { + * FT_Library library; + * FT_Bool no_stem_darkening = TRUE; + * + * + * FT_Init_FreeType( &library ); + * + * FT_Property_Set( library, "cff", + * "no-stem-darkening", &no_stem_darkening ); + * } + * + * @note: + * This property can be used with @FT_Property_Get also. + * + */ + + + /************************************************************************** + * + * @property: + * darkening-parameters + * + * @description: + * By default, the Adobe CFF engine darkens stems as follows (if the + * `no-stem-darkening' property isn't set): + * + * { + * stem width <= 0.5px: darkening amount = 0.4px + * stem width = 1px: darkening amount = 0.275px + * stem width = 1.667px: darkening amount = 0.275px + * stem width >= 2.333px: darkening amount = 0px + * } + * + * and piecewise linear in-between. At configuration time, these four + * control points can be set with the macro + * `CFF_CONFIG_OPTION_DARKENING_PARAMETERS'. At runtime, the control + * points can be changed using the `darkening-parameters' property, as + * the following example demonstrates. + * + * { + * FT_Library library; + * FT_Int darken_params[8] = { 500, 300, // x1, y1 + * 1000, 200, // x2, y2 + * 1500, 100, // x3, y3 + * 2000, 0 }; // x4, y4 + * + * + * FT_Init_FreeType( &library ); + * + * FT_Property_Set( library, "cff", + * "darkening-parameters", darken_params ); + * } + * + * The x~values give the stem width, and the y~values the darkening + * amount. The unit is 1000th of pixels. All coordinate values must be + * positive; the x~values must be monotonically increasing; the + * y~values must be monotonically decreasing and smaller than or + * equal to 500 (corresponding to half a pixel); the slope of each + * linear piece must be shallower than -1 (e.g., -.4). + * + * @note: + * This property can be used with @FT_Property_Get also. + * + */ + + /* */ + + +FT_END_HEADER + + +#endif /* __FTCFFDRV_H__ */ + + +/* END */ diff --git a/include/freetype/ftchapters.h b/include/ftchapters.h similarity index 85% rename from include/freetype/ftchapters.h rename to include/ftchapters.h index 6cdf54e..d333761 100644 --- a/include/freetype/ftchapters.h +++ b/include/ftchapters.h @@ -1,7 +1,7 @@ /***************************************************************************/ /* */ /* This file defines the structure of the FreeType reference. */ -/* It is used by the python script which generates the HTML files. */ +/* It is used by the python script that generates the HTML files. */ /* */ /***************************************************************************/ @@ -15,6 +15,7 @@ /* General Remarks */ /* */ /* <Sections> */ +/* header_inclusion */ /* user_allocation */ /* */ /***************************************************************************/ @@ -67,6 +68,22 @@ /***************************************************************************/ /* */ /* <Chapter> */ +/* module_specific */ +/* */ +/* <Title> */ +/* Controlling FreeType Modules */ +/* */ +/* <Sections> */ +/* auto_hinter */ +/* cff_driver */ +/* tt_driver */ +/* */ +/***************************************************************************/ + + +/***************************************************************************/ +/* */ +/* <Chapter> */ /* cache_subsystem */ /* */ /* <Title> */ diff --git a/include/freetype/ftcid.h b/include/ftcid.h similarity index 99% rename from include/freetype/ftcid.h rename to include/ftcid.h index 203a30c..17550d8 100644 --- a/include/freetype/ftcid.h +++ b/include/ftcid.h @@ -156,7 +156,8 @@ FT_BEGIN_HEADER FT_UInt glyph_index, FT_UInt *cid ); - /* */ + /* */ + FT_END_HEADER diff --git a/include/freetype/fterrdef.h b/include/fterrdef.h similarity index 95% rename from include/freetype/fterrdef.h rename to include/fterrdef.h index fb4b53b..99b2fad 100644 --- a/include/freetype/fterrdef.h +++ b/include/fterrdef.h @@ -4,7 +4,7 @@ /* */ /* FreeType error codes (specification). */ /* */ -/* Copyright 2002, 2004, 2006, 2007, 2010-2011 by */ +/* Copyright 2002, 2004, 2006, 2007, 2010-2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -31,214 +31,218 @@ /* generic errors */ - FT_NOERRORDEF_( Ok, 0x00, \ + FT_NOERRORDEF_( Ok, 0x00, "no error" ) - FT_ERRORDEF_( Cannot_Open_Resource, 0x01, \ + FT_ERRORDEF_( Cannot_Open_Resource, 0x01, "cannot open resource" ) - FT_ERRORDEF_( Unknown_File_Format, 0x02, \ + FT_ERRORDEF_( Unknown_File_Format, 0x02, "unknown file format" ) - FT_ERRORDEF_( Invalid_File_Format, 0x03, \ + FT_ERRORDEF_( Invalid_File_Format, 0x03, "broken file" ) - FT_ERRORDEF_( Invalid_Version, 0x04, \ + FT_ERRORDEF_( Invalid_Version, 0x04, "invalid FreeType version" ) - FT_ERRORDEF_( Lower_Module_Version, 0x05, \ + FT_ERRORDEF_( Lower_Module_Version, 0x05, "module version is too low" ) - FT_ERRORDEF_( Invalid_Argument, 0x06, \ + FT_ERRORDEF_( Invalid_Argument, 0x06, "invalid argument" ) - FT_ERRORDEF_( Unimplemented_Feature, 0x07, \ + FT_ERRORDEF_( Unimplemented_Feature, 0x07, "unimplemented feature" ) - FT_ERRORDEF_( Invalid_Table, 0x08, \ + FT_ERRORDEF_( Invalid_Table, 0x08, "broken table" ) - FT_ERRORDEF_( Invalid_Offset, 0x09, \ + FT_ERRORDEF_( Invalid_Offset, 0x09, "broken offset within table" ) - FT_ERRORDEF_( Array_Too_Large, 0x0A, \ + FT_ERRORDEF_( Array_Too_Large, 0x0A, "array allocation size too large" ) - FT_ERRORDEF_( Missing_Module, 0x0B, \ + FT_ERRORDEF_( Missing_Module, 0x0B, "missing module" ) + FT_ERRORDEF_( Missing_Property, 0x0C, + "missing property" ) /* glyph/character errors */ - FT_ERRORDEF_( Invalid_Glyph_Index, 0x10, \ + FT_ERRORDEF_( Invalid_Glyph_Index, 0x10, "invalid glyph index" ) - FT_ERRORDEF_( Invalid_Character_Code, 0x11, \ + FT_ERRORDEF_( Invalid_Character_Code, 0x11, "invalid character code" ) - FT_ERRORDEF_( Invalid_Glyph_Format, 0x12, \ + FT_ERRORDEF_( Invalid_Glyph_Format, 0x12, "unsupported glyph image format" ) - FT_ERRORDEF_( Cannot_Render_Glyph, 0x13, \ + FT_ERRORDEF_( Cannot_Render_Glyph, 0x13, "cannot render this glyph format" ) - FT_ERRORDEF_( Invalid_Outline, 0x14, \ + FT_ERRORDEF_( Invalid_Outline, 0x14, "invalid outline" ) - FT_ERRORDEF_( Invalid_Composite, 0x15, \ + FT_ERRORDEF_( Invalid_Composite, 0x15, "invalid composite glyph" ) - FT_ERRORDEF_( Too_Many_Hints, 0x16, \ + FT_ERRORDEF_( Too_Many_Hints, 0x16, "too many hints" ) - FT_ERRORDEF_( Invalid_Pixel_Size, 0x17, \ + FT_ERRORDEF_( Invalid_Pixel_Size, 0x17, "invalid pixel size" ) /* handle errors */ - FT_ERRORDEF_( Invalid_Handle, 0x20, \ + FT_ERRORDEF_( Invalid_Handle, 0x20, "invalid object handle" ) - FT_ERRORDEF_( Invalid_Library_Handle, 0x21, \ + FT_ERRORDEF_( Invalid_Library_Handle, 0x21, "invalid library handle" ) - FT_ERRORDEF_( Invalid_Driver_Handle, 0x22, \ + FT_ERRORDEF_( Invalid_Driver_Handle, 0x22, "invalid module handle" ) - FT_ERRORDEF_( Invalid_Face_Handle, 0x23, \ + FT_ERRORDEF_( Invalid_Face_Handle, 0x23, "invalid face handle" ) - FT_ERRORDEF_( Invalid_Size_Handle, 0x24, \ + FT_ERRORDEF_( Invalid_Size_Handle, 0x24, "invalid size handle" ) - FT_ERRORDEF_( Invalid_Slot_Handle, 0x25, \ + FT_ERRORDEF_( Invalid_Slot_Handle, 0x25, "invalid glyph slot handle" ) - FT_ERRORDEF_( Invalid_CharMap_Handle, 0x26, \ + FT_ERRORDEF_( Invalid_CharMap_Handle, 0x26, "invalid charmap handle" ) - FT_ERRORDEF_( Invalid_Cache_Handle, 0x27, \ + FT_ERRORDEF_( Invalid_Cache_Handle, 0x27, "invalid cache manager handle" ) - FT_ERRORDEF_( Invalid_Stream_Handle, 0x28, \ + FT_ERRORDEF_( Invalid_Stream_Handle, 0x28, "invalid stream handle" ) /* driver errors */ - FT_ERRORDEF_( Too_Many_Drivers, 0x30, \ + FT_ERRORDEF_( Too_Many_Drivers, 0x30, "too many modules" ) - FT_ERRORDEF_( Too_Many_Extensions, 0x31, \ + FT_ERRORDEF_( Too_Many_Extensions, 0x31, "too many extensions" ) /* memory errors */ - FT_ERRORDEF_( Out_Of_Memory, 0x40, \ + FT_ERRORDEF_( Out_Of_Memory, 0x40, "out of memory" ) - FT_ERRORDEF_( Unlisted_Object, 0x41, \ + FT_ERRORDEF_( Unlisted_Object, 0x41, "unlisted object" ) /* stream errors */ - FT_ERRORDEF_( Cannot_Open_Stream, 0x51, \ + FT_ERRORDEF_( Cannot_Open_Stream, 0x51, "cannot open stream" ) - FT_ERRORDEF_( Invalid_Stream_Seek, 0x52, \ + FT_ERRORDEF_( Invalid_Stream_Seek, 0x52, "invalid stream seek" ) - FT_ERRORDEF_( Invalid_Stream_Skip, 0x53, \ + FT_ERRORDEF_( Invalid_Stream_Skip, 0x53, "invalid stream skip" ) - FT_ERRORDEF_( Invalid_Stream_Read, 0x54, \ + FT_ERRORDEF_( Invalid_Stream_Read, 0x54, "invalid stream read" ) - FT_ERRORDEF_( Invalid_Stream_Operation, 0x55, \ + FT_ERRORDEF_( Invalid_Stream_Operation, 0x55, "invalid stream operation" ) - FT_ERRORDEF_( Invalid_Frame_Operation, 0x56, \ + FT_ERRORDEF_( Invalid_Frame_Operation, 0x56, "invalid frame operation" ) - FT_ERRORDEF_( Nested_Frame_Access, 0x57, \ + FT_ERRORDEF_( Nested_Frame_Access, 0x57, "nested frame access" ) - FT_ERRORDEF_( Invalid_Frame_Read, 0x58, \ + FT_ERRORDEF_( Invalid_Frame_Read, 0x58, "invalid frame read" ) /* raster errors */ - FT_ERRORDEF_( Raster_Uninitialized, 0x60, \ + FT_ERRORDEF_( Raster_Uninitialized, 0x60, "raster uninitialized" ) - FT_ERRORDEF_( Raster_Corrupted, 0x61, \ + FT_ERRORDEF_( Raster_Corrupted, 0x61, "raster corrupted" ) - FT_ERRORDEF_( Raster_Overflow, 0x62, \ + FT_ERRORDEF_( Raster_Overflow, 0x62, "raster overflow" ) - FT_ERRORDEF_( Raster_Negative_Height, 0x63, \ + FT_ERRORDEF_( Raster_Negative_Height, 0x63, "negative height while rastering" ) /* cache errors */ - FT_ERRORDEF_( Too_Many_Caches, 0x70, \ + FT_ERRORDEF_( Too_Many_Caches, 0x70, "too many registered caches" ) /* TrueType and SFNT errors */ - FT_ERRORDEF_( Invalid_Opcode, 0x80, \ + FT_ERRORDEF_( Invalid_Opcode, 0x80, "invalid opcode" ) - FT_ERRORDEF_( Too_Few_Arguments, 0x81, \ + FT_ERRORDEF_( Too_Few_Arguments, 0x81, "too few arguments" ) - FT_ERRORDEF_( Stack_Overflow, 0x82, \ + FT_ERRORDEF_( Stack_Overflow, 0x82, "stack overflow" ) - FT_ERRORDEF_( Code_Overflow, 0x83, \ + FT_ERRORDEF_( Code_Overflow, 0x83, "code overflow" ) - FT_ERRORDEF_( Bad_Argument, 0x84, \ + FT_ERRORDEF_( Bad_Argument, 0x84, "bad argument" ) - FT_ERRORDEF_( Divide_By_Zero, 0x85, \ + FT_ERRORDEF_( Divide_By_Zero, 0x85, "division by zero" ) - FT_ERRORDEF_( Invalid_Reference, 0x86, \ + FT_ERRORDEF_( Invalid_Reference, 0x86, "invalid reference" ) - FT_ERRORDEF_( Debug_OpCode, 0x87, \ + FT_ERRORDEF_( Debug_OpCode, 0x87, "found debug opcode" ) - FT_ERRORDEF_( ENDF_In_Exec_Stream, 0x88, \ + FT_ERRORDEF_( ENDF_In_Exec_Stream, 0x88, "found ENDF opcode in execution stream" ) - FT_ERRORDEF_( Nested_DEFS, 0x89, \ + FT_ERRORDEF_( Nested_DEFS, 0x89, "nested DEFS" ) - FT_ERRORDEF_( Invalid_CodeRange, 0x8A, \ + FT_ERRORDEF_( Invalid_CodeRange, 0x8A, "invalid code range" ) - FT_ERRORDEF_( Execution_Too_Long, 0x8B, \ + FT_ERRORDEF_( Execution_Too_Long, 0x8B, "execution context too long" ) - FT_ERRORDEF_( Too_Many_Function_Defs, 0x8C, \ + FT_ERRORDEF_( Too_Many_Function_Defs, 0x8C, "too many function definitions" ) - FT_ERRORDEF_( Too_Many_Instruction_Defs, 0x8D, \ + FT_ERRORDEF_( Too_Many_Instruction_Defs, 0x8D, "too many instruction definitions" ) - FT_ERRORDEF_( Table_Missing, 0x8E, \ + FT_ERRORDEF_( Table_Missing, 0x8E, "SFNT font table missing" ) - FT_ERRORDEF_( Horiz_Header_Missing, 0x8F, \ + FT_ERRORDEF_( Horiz_Header_Missing, 0x8F, "horizontal header (hhea) table missing" ) - FT_ERRORDEF_( Locations_Missing, 0x90, \ + FT_ERRORDEF_( Locations_Missing, 0x90, "locations (loca) table missing" ) - FT_ERRORDEF_( Name_Table_Missing, 0x91, \ + FT_ERRORDEF_( Name_Table_Missing, 0x91, "name table missing" ) - FT_ERRORDEF_( CMap_Table_Missing, 0x92, \ + FT_ERRORDEF_( CMap_Table_Missing, 0x92, "character map (cmap) table missing" ) - FT_ERRORDEF_( Hmtx_Table_Missing, 0x93, \ + FT_ERRORDEF_( Hmtx_Table_Missing, 0x93, "horizontal metrics (hmtx) table missing" ) - FT_ERRORDEF_( Post_Table_Missing, 0x94, \ + FT_ERRORDEF_( Post_Table_Missing, 0x94, "PostScript (post) table missing" ) - FT_ERRORDEF_( Invalid_Horiz_Metrics, 0x95, \ + FT_ERRORDEF_( Invalid_Horiz_Metrics, 0x95, "invalid horizontal metrics" ) - FT_ERRORDEF_( Invalid_CharMap_Format, 0x96, \ + FT_ERRORDEF_( Invalid_CharMap_Format, 0x96, "invalid character map (cmap) format" ) - FT_ERRORDEF_( Invalid_PPem, 0x97, \ + FT_ERRORDEF_( Invalid_PPem, 0x97, "invalid ppem value" ) - FT_ERRORDEF_( Invalid_Vert_Metrics, 0x98, \ + FT_ERRORDEF_( Invalid_Vert_Metrics, 0x98, "invalid vertical metrics" ) - FT_ERRORDEF_( Could_Not_Find_Context, 0x99, \ + FT_ERRORDEF_( Could_Not_Find_Context, 0x99, "could not find context" ) - FT_ERRORDEF_( Invalid_Post_Table_Format, 0x9A, \ + FT_ERRORDEF_( Invalid_Post_Table_Format, 0x9A, "invalid PostScript (post) table format" ) - FT_ERRORDEF_( Invalid_Post_Table, 0x9B, \ + FT_ERRORDEF_( Invalid_Post_Table, 0x9B, "invalid PostScript (post) table" ) /* CFF, CID, and Type 1 errors */ - FT_ERRORDEF_( Syntax_Error, 0xA0, \ + FT_ERRORDEF_( Syntax_Error, 0xA0, "opcode syntax error" ) - FT_ERRORDEF_( Stack_Underflow, 0xA1, \ + FT_ERRORDEF_( Stack_Underflow, 0xA1, "argument stack underflow" ) - FT_ERRORDEF_( Ignore, 0xA2, \ + FT_ERRORDEF_( Ignore, 0xA2, "ignore" ) - FT_ERRORDEF_( No_Unicode_Glyph_Name, 0xA3, \ + FT_ERRORDEF_( No_Unicode_Glyph_Name, 0xA3, "no Unicode glyph name found" ) + FT_ERRORDEF_( Glyph_Too_Big, 0xA4, + "glyph to big for hinting" ) /* BDF errors */ - FT_ERRORDEF_( Missing_Startfont_Field, 0xB0, \ + FT_ERRORDEF_( Missing_Startfont_Field, 0xB0, "`STARTFONT' field missing" ) - FT_ERRORDEF_( Missing_Font_Field, 0xB1, \ + FT_ERRORDEF_( Missing_Font_Field, 0xB1, "`FONT' field missing" ) - FT_ERRORDEF_( Missing_Size_Field, 0xB2, \ + FT_ERRORDEF_( Missing_Size_Field, 0xB2, "`SIZE' field missing" ) - FT_ERRORDEF_( Missing_Fontboundingbox_Field, 0xB3, \ + FT_ERRORDEF_( Missing_Fontboundingbox_Field, 0xB3, "`FONTBOUNDINGBOX' field missing" ) - FT_ERRORDEF_( Missing_Chars_Field, 0xB4, \ + FT_ERRORDEF_( Missing_Chars_Field, 0xB4, "`CHARS' field missing" ) - FT_ERRORDEF_( Missing_Startchar_Field, 0xB5, \ + FT_ERRORDEF_( Missing_Startchar_Field, 0xB5, "`STARTCHAR' field missing" ) - FT_ERRORDEF_( Missing_Encoding_Field, 0xB6, \ + FT_ERRORDEF_( Missing_Encoding_Field, 0xB6, "`ENCODING' field missing" ) - FT_ERRORDEF_( Missing_Bbx_Field, 0xB7, \ + FT_ERRORDEF_( Missing_Bbx_Field, 0xB7, "`BBX' field missing" ) - FT_ERRORDEF_( Bbx_Too_Big, 0xB8, \ + FT_ERRORDEF_( Bbx_Too_Big, 0xB8, "`BBX' too big" ) - FT_ERRORDEF_( Corrupted_Font_Header, 0xB9, \ + FT_ERRORDEF_( Corrupted_Font_Header, 0xB9, "Font header corrupted or missing fields" ) - FT_ERRORDEF_( Corrupted_Font_Glyphs, 0xBA, \ + FT_ERRORDEF_( Corrupted_Font_Glyphs, 0xBA, "Font glyphs corrupted or missing fields" ) diff --git a/include/freetype/fterrors.h b/include/fterrors.h similarity index 93% rename from include/freetype/fterrors.h rename to include/fterrors.h index a54699f..0fa3e4d 100644 --- a/include/freetype/fterrors.h +++ b/include/fterrors.h @@ -4,7 +4,7 @@ /* */ /* FreeType error code handling (specification). */ /* */ -/* Copyright 1996-2001, 2002, 2004, 2007 by */ +/* Copyright 1996-2002, 2004, 2007, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -28,9 +28,8 @@ /* The configuration macro FT_CONFIG_OPTION_USE_MODULE_ERRORS can be */ /* defined in ftoption.h in order to make the higher byte indicate */ /* the module where the error has happened (this is not compatible */ - /* with standard builds of FreeType 2). You can then use the macro */ - /* FT_ERROR_BASE macro to extract the generic error code from an */ - /* FT_Error value. */ + /* with standard builds of FreeType 2). See the file `ftmoderr.h' for */ + /* more details. */ /* */ /* */ /* II - Error Message strings */ @@ -101,12 +100,6 @@ #undef FT_NEED_EXTERN_C -#undef FT_ERR_XCAT -#undef FT_ERR_CAT - -#define FT_ERR_XCAT( x, y ) x ## y -#define FT_ERR_CAT( x, y ) FT_ERR_XCAT( x, y ) - /* FT_ERR_PREFIX is used as a prefix for error identifiers. */ /* By default, we use `FT_Err_'. */ @@ -150,11 +143,11 @@ /* this macro is used to define an error */ -#define FT_ERRORDEF_( e, v, s ) \ +#define FT_ERRORDEF_( e, v, s ) \ FT_ERRORDEF( FT_ERR_CAT( FT_ERR_PREFIX, e ), v + FT_ERR_BASE, s ) /* this is only used for <module>_Err_Ok, which must be 0! */ -#define FT_NOERRORDEF_( e, v, s ) \ +#define FT_NOERRORDEF_( e, v, s ) \ FT_ERRORDEF( FT_ERR_CAT( FT_ERR_PREFIX, e ), v, s ) @@ -194,11 +187,9 @@ #undef FT_NEED_EXTERN_C #undef FT_ERR_BASE - /* FT_KEEP_ERR_PREFIX is needed for ftvalid.h */ -#ifndef FT_KEEP_ERR_PREFIX + /* FT_ERR_PREFIX is needed internally */ +#ifndef FT2_BUILD_LIBRARY #undef FT_ERR_PREFIX -#else -#undef FT_KEEP_ERR_PREFIX #endif #endif /* __FTERRORS_H__ */ diff --git a/include/freetype/ftgasp.h b/include/ftgasp.h similarity index 99% rename from include/freetype/ftgasp.h rename to include/ftgasp.h index 453d4fa..3f3d765 100644 --- a/include/freetype/ftgasp.h +++ b/include/ftgasp.h @@ -120,7 +120,8 @@ FT_Get_Gasp( FT_Face face, FT_UInt ppem ); -/* */ + /* */ + #endif /* _FT_GASP_H_ */ diff --git a/include/freetype/ftglyph.h b/include/ftglyph.h similarity index 95% rename from include/freetype/ftglyph.h rename to include/ftglyph.h index 3de69f7..15fa6a9 100644 --- a/include/freetype/ftglyph.h +++ b/include/ftglyph.h @@ -4,7 +4,7 @@ /* */ /* FreeType convenience functions to handle glyphs (specification). */ /* */ -/* Copyright 1996-2003, 2006, 2008, 2009, 2011 by */ +/* Copyright 1996-2003, 2006, 2008, 2009, 2011, 2013, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -94,7 +94,7 @@ FT_BEGIN_HEADER /* */ /* <Description> */ /* The root glyph structure contains a given glyph image plus its */ - /* advance width in 16.16 fixed float format. */ + /* advance width in 16.16 fixed-point format. */ /* */ /* <Fields> */ /* library :: A handle to the FreeType library object. */ @@ -325,22 +325,8 @@ FT_BEGIN_HEADER } FT_Glyph_BBox_Mode; - /*************************************************************************/ - /* */ - /* <Enum> */ - /* ft_glyph_bbox_xxx */ - /* */ - /* <Description> */ - /* These constants are deprecated. Use the corresponding */ - /* @FT_Glyph_BBox_Mode values instead. */ - /* */ - /* <Values> */ - /* ft_glyph_bbox_unscaled :: See @FT_GLYPH_BBOX_UNSCALED. */ - /* ft_glyph_bbox_subpixels :: See @FT_GLYPH_BBOX_SUBPIXELS. */ - /* ft_glyph_bbox_gridfit :: See @FT_GLYPH_BBOX_GRIDFIT. */ - /* ft_glyph_bbox_truncate :: See @FT_GLYPH_BBOX_TRUNCATE. */ - /* ft_glyph_bbox_pixels :: See @FT_GLYPH_BBOX_PIXELS. */ - /* */ + /* these constants are deprecated; use the corresponding */ + /* `FT_Glyph_BBox_Mode' values instead */ #define ft_glyph_bbox_unscaled FT_GLYPH_BBOX_UNSCALED #define ft_glyph_bbox_subpixels FT_GLYPH_BBOX_SUBPIXELS #define ft_glyph_bbox_gridfit FT_GLYPH_BBOX_GRIDFIT @@ -358,17 +344,17 @@ FT_BEGIN_HEADER /* outline's points, including Bézier control points. Though it */ /* coincides with the exact bounding box for most glyphs, it can be */ /* slightly larger in some situations (like when rotating an outline */ - /* which contains Bézier outside arcs). */ + /* that contains Bézier outside arcs). */ /* */ /* Computing the control box is very fast, while getting the bounding */ /* box can take much more time as it needs to walk over all segments */ /* and arcs in the outline. To get the latter, you can use the */ - /* `ftbbox' component which is dedicated to this single task. */ + /* `ftbbox' component, which is dedicated to this single task. */ /* */ /* <Input> */ /* glyph :: A handle to the source glyph object. */ /* */ - /* mode :: The mode which indicates how to interpret the returned */ + /* mode :: The mode that indicates how to interpret the returned */ /* bounding box values. */ /* */ /* <Output> */ @@ -388,7 +374,7 @@ FT_BEGIN_HEADER /* @FT_LOAD_NO_SCALE, the resulting CBox is meaningless. To get */ /* reasonable values for the CBox it is necessary to load the glyph */ /* at a large ppem value (so that the hinting instructions can */ - /* properly shift and scale the subglyphs), then extracting the CBox */ + /* properly shift and scale the subglyphs), then extracting the CBox, */ /* which can be eventually converted back to font units. */ /* */ /* Note that the maximum coordinates are exclusive, which means that */ @@ -603,7 +589,6 @@ FT_BEGIN_HEADER FT_EXPORT( FT_Error ) FT_Matrix_Invert( FT_Matrix* matrix ); - /* */ diff --git a/include/freetype/ftgxval.h b/include/ftgxval.h similarity index 91% rename from include/freetype/ftgxval.h rename to include/ftgxval.h index 497015c..88c3d93 100644 --- a/include/freetype/ftgxval.h +++ b/include/ftgxval.h @@ -4,7 +4,7 @@ /* */ /* FreeType API for validating TrueTypeGX/AAT tables (specification). */ /* */ -/* Copyright 2004, 2005, 2006 by */ +/* Copyright 2004-2006, 2013 by */ /* Masatake YAMATO, Redhat K.K, */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ @@ -57,9 +57,19 @@ FT_BEGIN_HEADER /* some TrueTypeGX tables (feat, mort, morx, bsln, just, kern, opbd, */ /* trak, prop, lcar). */ /* */ + /* <Order> */ + /* FT_TrueTypeGX_Validate */ + /* FT_TrueTypeGX_Free */ + /* */ + /* FT_ClassicKern_Validate */ + /* FT_ClassicKern_Free */ + /* */ + /* FT_VALIDATE_GX_LENGTH */ + /* FT_VALIDATE_GXXXX */ + /* FT_VALIDATE_CKERNXXX */ + /* */ /*************************************************************************/ - /*************************************************************************/ /* */ /* */ @@ -171,8 +181,6 @@ FT_BEGIN_HEADER FT_VALIDATE_lcar ) - /* */ - /********************************************************************** * * @function: @@ -180,7 +188,7 @@ FT_BEGIN_HEADER * * @description: * Validate various TrueTypeGX tables to assure that all offsets and - * indices are valid. The idea is that a higher-level library which + * indices are valid. The idea is that a higher-level library that * actually does the text layout can access those tables without * error checking (which can be quite time consuming). * @@ -189,7 +197,7 @@ FT_BEGIN_HEADER * A handle to the input face. * * validation_flags :: - * A bit field which specifies the tables to be validated. See + * A bit field that specifies the tables to be validated. See * @FT_VALIDATE_GXXXX for possible values. * * table_length :: @@ -221,8 +229,6 @@ FT_BEGIN_HEADER FT_UInt table_length ); - /* */ - /********************************************************************** * * @function: @@ -248,8 +254,6 @@ FT_BEGIN_HEADER FT_Bytes table ); - /* */ - /********************************************************************** * * @enum: @@ -277,8 +281,6 @@ FT_BEGIN_HEADER #define FT_VALIDATE_CKERN ( FT_VALIDATE_MS | FT_VALIDATE_APPLE ) - /* */ - /********************************************************************** * * @function: @@ -286,7 +288,7 @@ FT_BEGIN_HEADER * * @description: * Validate classic (16-bit format) kern table to assure that the offsets - * and indices are valid. The idea is that a higher-level library which + * and indices are valid. The idea is that a higher-level library that * actually does the text layout can access those tables without error * checking (which can be quite time consuming). * @@ -299,7 +301,7 @@ FT_BEGIN_HEADER * A handle to the input face. * * validation_flags :: - * A bit field which specifies the dialect to be validated. See + * A bit field that specifies the dialect to be validated. See * @FT_VALIDATE_CKERNXXX for possible values. * * @output: @@ -320,8 +322,6 @@ FT_BEGIN_HEADER FT_Bytes *ckern_table ); - /* */ - /********************************************************************** * * @function: @@ -346,8 +346,7 @@ FT_BEGIN_HEADER FT_ClassicKern_Free( FT_Face face, FT_Bytes table ); - - /* */ + /* */ FT_END_HEADER diff --git a/include/freetype/ftgzip.h b/include/ftgzip.h similarity index 74% rename from include/freetype/ftgzip.h rename to include/ftgzip.h index acbc4f0..eb346c6 100644 --- a/include/freetype/ftgzip.h +++ b/include/ftgzip.h @@ -4,7 +4,7 @@ /* */ /* Gzip-compressed stream support. */ /* */ -/* Copyright 2002, 2003, 2004, 2006 by */ +/* Copyright 2002-2004, 2006, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -91,7 +91,53 @@ FT_BEGIN_HEADER FT_Stream_OpenGzip( FT_Stream stream, FT_Stream source ); - /* */ + + /************************************************************************ + * + * @function: + * FT_Gzip_Uncompress + * + * @description: + * Decompress a zipped input buffer into an output buffer. This function + * is modeled after zlib's `uncompress' function. + * + * @input: + * memory :: + * A FreeType memory handle. + * + * input :: + * The input buffer. + * + * input_len :: + * The length of the input buffer. + * + * @output: + * output:: + * The output buffer. + * + * @inout: + * output_len :: + * Before calling the function, this is the the total size of the + * output buffer, which must be large enough to hold the entire + * uncompressed data (so the size of the uncompressed data must be + * known in advance). After calling the function, `output_len' is the + * size of the used data in `output'. + * + * @return: + * FreeType error code. 0~means success. + * + * @note: + * This function may return `FT_Err_Unimplemented_Feature' if your build + * of FreeType was not compiled with zlib support. + */ + FT_EXPORT( FT_Error ) + FT_Gzip_Uncompress( FT_Memory memory, + FT_Byte* output, + FT_ULong* output_len, + const FT_Byte* input, + FT_ULong input_len ); + + /* */ FT_END_HEADER diff --git a/include/freetype/ftimage.h b/include/ftimage.h similarity index 88% rename from include/freetype/ftimage.h rename to include/ftimage.h index 04b5e04..2f7ca2a 100644 --- a/include/freetype/ftimage.h +++ b/include/ftimage.h @@ -5,8 +5,7 @@ /* FreeType glyph image formats and default raster interface */ /* (specification). */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, */ -/* 2010 by */ +/* Copyright 1996-2010, 2013, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -54,7 +53,7 @@ FT_BEGIN_HEADER /* <Description> */ /* The type FT_Pos is used to store vectorial coordinates. Depending */ /* on the context, these can represent distances in integer font */ - /* units, or 16.16, or 26.6 fixed float pixel coordinates. */ + /* units, or 16.16, or 26.6 fixed-point pixel coordinates. */ /* */ typedef signed long FT_Pos; @@ -169,6 +168,15 @@ FT_BEGIN_HEADER /* times taller than the original glyph image. See also */ /* @FT_RENDER_MODE_LCD_V. */ /* */ + /* FT_PIXEL_MODE_BGRA :: */ + /* An image with four 8-bit channels per pixel, representing a */ + /* color image (such as emoticons) with alpha channel. For each */ + /* pixel, the format is BGRA, which means, the blue channel comes */ + /* first in memory. The color channels are pre-multiplied and in */ + /* the sRGB colorspace. For example, full red at half-translucent */ + /* opacity will be represented as `00,00,80,80', not `00,00,FF,80'. */ + /* See also @FT_LOAD_COLOR. */ + /* */ typedef enum FT_Pixel_Mode_ { FT_PIXEL_MODE_NONE = 0, @@ -178,73 +186,21 @@ FT_BEGIN_HEADER FT_PIXEL_MODE_GRAY4, FT_PIXEL_MODE_LCD, FT_PIXEL_MODE_LCD_V, + FT_PIXEL_MODE_BGRA, FT_PIXEL_MODE_MAX /* do not remove */ } FT_Pixel_Mode; - /*************************************************************************/ - /* */ - /* <Enum> */ - /* ft_pixel_mode_xxx */ - /* */ - /* <Description> */ - /* A list of deprecated constants. Use the corresponding */ - /* @FT_Pixel_Mode values instead. */ - /* */ - /* <Values> */ - /* ft_pixel_mode_none :: See @FT_PIXEL_MODE_NONE. */ - /* ft_pixel_mode_mono :: See @FT_PIXEL_MODE_MONO. */ - /* ft_pixel_mode_grays :: See @FT_PIXEL_MODE_GRAY. */ - /* ft_pixel_mode_pal2 :: See @FT_PIXEL_MODE_GRAY2. */ - /* ft_pixel_mode_pal4 :: See @FT_PIXEL_MODE_GRAY4. */ - /* */ + /* these constants are deprecated; use the corresponding `FT_Pixel_Mode' */ + /* values instead. */ #define ft_pixel_mode_none FT_PIXEL_MODE_NONE #define ft_pixel_mode_mono FT_PIXEL_MODE_MONO #define ft_pixel_mode_grays FT_PIXEL_MODE_GRAY #define ft_pixel_mode_pal2 FT_PIXEL_MODE_GRAY2 #define ft_pixel_mode_pal4 FT_PIXEL_MODE_GRAY4 - /* */ - -#if 0 - - /*************************************************************************/ - /* */ - /* <Enum> */ - /* FT_Palette_Mode */ - /* */ - /* <Description> */ - /* THIS TYPE IS DEPRECATED. DO NOT USE IT! */ - /* */ - /* An enumeration type to describe the format of a bitmap palette, */ - /* used with ft_pixel_mode_pal4 and ft_pixel_mode_pal8. */ - /* */ - /* <Values> */ - /* ft_palette_mode_rgb :: The palette is an array of 3-byte RGB */ - /* records. */ - /* */ - /* ft_palette_mode_rgba :: The palette is an array of 4-byte RGBA */ - /* records. */ - /* */ - /* <Note> */ - /* As ft_pixel_mode_pal2, pal4 and pal8 are currently unused by */ - /* FreeType, these types are not handled by the library itself. */ - /* */ - typedef enum FT_Palette_Mode_ - { - ft_palette_mode_rgb = 0, - ft_palette_mode_rgba, - - ft_palette_mode_max /* do not remove */ - - } FT_Palette_Mode; - - /* */ - -#endif - /*************************************************************************/ /* */ @@ -309,13 +265,13 @@ FT_BEGIN_HEADER /* */ typedef struct FT_Bitmap_ { - int rows; - int width; + unsigned int rows; + unsigned int width; int pitch; unsigned char* buffer; - short num_grays; - char pixel_mode; - char palette_mode; + unsigned short num_grays; + unsigned char pixel_mode; + unsigned char palette_mode; void* palette; } FT_Bitmap; @@ -372,7 +328,7 @@ FT_BEGIN_HEADER /* */ /* flags :: A set of bit flags used to characterize the outline */ /* and give hints to the scan-converter and hinter on */ - /* how to convert/grid-fit it. See @FT_OUTLINE_FLAGS. */ + /* how to convert/grid-fit it. See @FT_OUTLINE_XXX. */ /* */ /* <Note> */ /* The B/W rasterizer only checks bit~2 in the `tags' array for the */ @@ -393,6 +349,8 @@ FT_BEGIN_HEADER } FT_Outline; + /* */ + /* Following limits must be consistent with */ /* FT_Outline.{n_contours,n_points} */ #define FT_OUTLINE_CONTOURS_MAX SHRT_MAX @@ -402,7 +360,7 @@ FT_BEGIN_HEADER /*************************************************************************/ /* */ /* <Enum> */ - /* FT_OUTLINE_FLAGS */ + /* FT_OUTLINE_XXX */ /* */ /* <Description> */ /* A list of bit-field constants use for the flags in an outline's */ @@ -483,24 +441,8 @@ FT_BEGIN_HEADER #define FT_OUTLINE_SINGLE_PASS 0x200 - /************************************************************************* - * - * @enum: - * ft_outline_flags - * - * @description: - * These constants are deprecated. Please use the corresponding - * @FT_OUTLINE_FLAGS values. - * - * @values: - * ft_outline_none :: See @FT_OUTLINE_NONE. - * ft_outline_owner :: See @FT_OUTLINE_OWNER. - * ft_outline_even_odd_fill :: See @FT_OUTLINE_EVEN_ODD_FILL. - * ft_outline_reverse_fill :: See @FT_OUTLINE_REVERSE_FILL. - * ft_outline_ignore_dropouts :: See @FT_OUTLINE_IGNORE_DROPOUTS. - * ft_outline_high_precision :: See @FT_OUTLINE_HIGH_PRECISION. - * ft_outline_single_pass :: See @FT_OUTLINE_SINGLE_PASS. - */ + /* these constants are deprecated; use the corresponding */ + /* `FT_OUTLINE_XXX' values instead */ #define ft_outline_none FT_OUTLINE_NONE #define ft_outline_owner FT_OUTLINE_OWNER #define ft_outline_even_odd_fill FT_OUTLINE_EVEN_ODD_FILL @@ -546,7 +488,7 @@ FT_BEGIN_HEADER /* <Input> */ /* to :: A pointer to the target point of the `move to'. */ /* */ - /* user :: A typeless pointer which is passed from the caller of the */ + /* user :: A typeless pointer, which is passed from the caller of the */ /* decomposition function. */ /* */ /* <Return> */ @@ -573,7 +515,7 @@ FT_BEGIN_HEADER /* <Input> */ /* to :: A pointer to the target point of the `line to'. */ /* */ - /* user :: A typeless pointer which is passed from the caller of the */ + /* user :: A typeless pointer, which is passed from the caller of the */ /* decomposition function. */ /* */ /* <Return> */ @@ -604,7 +546,7 @@ FT_BEGIN_HEADER /* */ /* to :: A pointer to the target end point of the conic arc. */ /* */ - /* user :: A typeless pointer which is passed from the caller of */ + /* user :: A typeless pointer, which is passed from the caller of */ /* the decomposition function. */ /* */ /* <Return> */ @@ -636,7 +578,7 @@ FT_BEGIN_HEADER /* */ /* to :: A pointer to the target end point. */ /* */ - /* user :: A typeless pointer which is passed from the caller of */ + /* user :: A typeless pointer, which is passed from the caller of */ /* the decomposition function. */ /* */ /* <Return> */ @@ -787,22 +729,8 @@ FT_BEGIN_HEADER } FT_Glyph_Format; - /*************************************************************************/ - /* */ - /* <Enum> */ - /* ft_glyph_format_xxx */ - /* */ - /* <Description> */ - /* A list of deprecated constants. Use the corresponding */ - /* @FT_Glyph_Format values instead. */ - /* */ - /* <Values> */ - /* ft_glyph_format_none :: See @FT_GLYPH_FORMAT_NONE. */ - /* ft_glyph_format_composite :: See @FT_GLYPH_FORMAT_COMPOSITE. */ - /* ft_glyph_format_bitmap :: See @FT_GLYPH_FORMAT_BITMAP. */ - /* ft_glyph_format_outline :: See @FT_GLYPH_FORMAT_OUTLINE. */ - /* ft_glyph_format_plotter :: See @FT_GLYPH_FORMAT_PLOTTER. */ - /* */ + /* these constants are deprecated; use the corresponding */ + /* `FT_Glyph_Format' values instead. */ #define ft_glyph_format_none FT_GLYPH_FORMAT_NONE #define ft_glyph_format_composite FT_GLYPH_FORMAT_COMPOSITE #define ft_glyph_format_bitmap FT_GLYPH_FORMAT_BITMAP @@ -827,8 +755,8 @@ FT_BEGIN_HEADER /* a a bitmap. This section contains the public API for rasters. */ /* */ /* Note that in FreeType 2, all rasters are now encapsulated within */ - /* specific modules called `renderers'. See `freetype/ftrender.h' for */ - /* more details on renderers. */ + /* specific modules called `renderers'. See `ftrender.h' for more */ + /* details on renderers. */ /* */ /*************************************************************************/ @@ -847,6 +775,21 @@ FT_BEGIN_HEADER /* <Description> */ /* This section contains technical definitions. */ /* */ + /* <Order> */ + /* FT_Raster */ + /* FT_Span */ + /* FT_SpanFunc */ + /* */ + /* FT_Raster_Params */ + /* FT_RASTER_FLAG_XXX */ + /* */ + /* FT_Raster_NewFunc */ + /* FT_Raster_DoneFunc */ + /* FT_Raster_ResetFunc */ + /* FT_Raster_SetModeFunc */ + /* FT_Raster_RenderFunc */ + /* FT_Raster_Funcs */ + /* */ /*************************************************************************/ @@ -856,8 +799,8 @@ FT_BEGIN_HEADER /* FT_Raster */ /* */ /* <Description> */ - /* A handle (pointer) to a raster object. Each object can be used */ - /* independently to convert an outline into a bitmap or pixmap. */ + /* An opaque handle (pointer) to a raster object. Each object can be */ + /* used independently to convert an outline into a bitmap or pixmap. */ /* */ typedef struct FT_RasterRec_* FT_Raster; @@ -868,8 +811,8 @@ FT_BEGIN_HEADER /* FT_Span */ /* */ /* <Description> */ - /* A structure used to model a single span of gray (or black) pixels */ - /* when rendering a monochrome or anti-aliased bitmap. */ + /* A structure used to model a single span of gray pixels when */ + /* rendering an anti-aliased bitmap. */ /* */ /* <Fields> */ /* x :: The span's horizontal start position. */ @@ -877,13 +820,12 @@ FT_BEGIN_HEADER /* len :: The span's length in pixels. */ /* */ /* coverage :: The span color/coverage, ranging from 0 (background) */ - /* to 255 (foreground). Only used for anti-aliased */ - /* rendering. */ + /* to 255 (foreground). */ /* */ /* <Note> */ /* This structure is used by the span drawing callback type named */ - /* @FT_SpanFunc which takes the y~coordinate of the span as a */ - /* a parameter. */ + /* @FT_SpanFunc that takes the y~coordinate of the span as a */ + /* parameter. */ /* */ /* The coverage value is always between 0 and 255. If you want less */ /* gray values, the callback function has to reduce them. */ @@ -948,22 +890,7 @@ FT_BEGIN_HEADER /* FT_Raster_BitTest_Func */ /* */ /* <Description> */ - /* THIS TYPE IS DEPRECATED. DO NOT USE IT. */ - /* */ - /* A function used as a call-back by the monochrome scan-converter */ - /* to test whether a given target pixel is already set to the drawing */ - /* `color'. These tests are crucial to implement drop-out control */ - /* per-se the TrueType spec. */ - /* */ - /* <Input> */ - /* y :: The pixel's y~coordinate. */ - /* */ - /* x :: The pixel's x~coordinate. */ - /* */ - /* user :: User-supplied data that is passed to the callback. */ - /* */ - /* <Return> */ - /* 1~if the pixel is `set', 0~otherwise. */ + /* Deprecated, unimplemented. */ /* */ typedef int (*FT_Raster_BitTest_Func)( int y, @@ -977,21 +904,7 @@ FT_BEGIN_HEADER /* FT_Raster_BitSet_Func */ /* */ /* <Description> */ - /* THIS TYPE IS DEPRECATED. DO NOT USE IT. */ - /* */ - /* A function used as a call-back by the monochrome scan-converter */ - /* to set an individual target pixel. This is crucial to implement */ - /* drop-out control according to the TrueType specification. */ - /* */ - /* <Input> */ - /* y :: The pixel's y~coordinate. */ - /* */ - /* x :: The pixel's x~coordinate. */ - /* */ - /* user :: User-supplied data that is passed to the callback. */ - /* */ - /* <Return> */ - /* 1~if the pixel is `set', 0~otherwise. */ + /* Deprecated, unimplemented. */ /* */ typedef void (*FT_Raster_BitSet_Func)( int y, @@ -1025,8 +938,8 @@ FT_BEGIN_HEADER /* pixmap's buffer _must_ be zeroed before */ /* rendering. */ /* */ - /* Note that for now, direct rendering is */ - /* only possible with anti-aliased glyphs. */ + /* Direct rendering is only possible with */ + /* anti-aliased glyphs. */ /* */ /* FT_RASTER_FLAG_CLIP :: This flag is only used in direct */ /* rendering mode. If set, the output will */ @@ -1044,7 +957,8 @@ FT_BEGIN_HEADER #define FT_RASTER_FLAG_DIRECT 0x2 #define FT_RASTER_FLAG_CLIP 0x4 - /* deprecated */ + /* these constants are deprecated; use the corresponding */ + /* `FT_RASTER_FLAG_XXX' values instead */ #define ft_raster_flag_default FT_RASTER_FLAG_DEFAULT #define ft_raster_flag_aa FT_RASTER_FLAG_AA #define ft_raster_flag_direct FT_RASTER_FLAG_DIRECT @@ -1070,11 +984,11 @@ FT_BEGIN_HEADER /* */ /* gray_spans :: The gray span drawing callback. */ /* */ - /* black_spans :: The black span drawing callback. UNIMPLEMENTED! */ + /* black_spans :: Unused. */ /* */ - /* bit_test :: The bit test callback. UNIMPLEMENTED! */ + /* bit_test :: Unused. */ /* */ - /* bit_set :: The bit set callback. UNIMPLEMENTED! */ + /* bit_set :: Unused. */ /* */ /* user :: User-supplied data that is passed to each drawing */ /* callback. */ @@ -1091,15 +1005,9 @@ FT_BEGIN_HEADER /* */ /* If the @FT_RASTER_FLAG_DIRECT bit flag is set in `flags', the */ /* raster will call the `gray_spans' callback to draw gray pixel */ - /* spans, in the case of an aa glyph bitmap, it will call */ - /* `black_spans', and `bit_test' and `bit_set' in the case of a */ - /* monochrome bitmap. This allows direct composition over a */ - /* pre-existing bitmap through user-provided callbacks to perform the */ - /* span drawing/composition. */ - /* */ - /* Note that the `bit_test' and `bit_set' callbacks are required when */ - /* rendering a monochrome bitmap, as they are crucial to implement */ - /* correct drop-out control as defined in the TrueType specification. */ + /* spans. This allows direct composition over a pre-existing bitmap */ + /* through user-provided callbacks to perform the span drawing and */ + /* composition. Not supported by the monochrome rasterizer. */ /* */ typedef struct FT_Raster_Params_ { @@ -1107,9 +1015,9 @@ FT_BEGIN_HEADER const void* source; int flags; FT_SpanFunc gray_spans; - FT_SpanFunc black_spans; /* doesn't work! */ - FT_Raster_BitTest_Func bit_test; /* doesn't work! */ - FT_Raster_BitSet_Func bit_set; /* doesn't work! */ + FT_SpanFunc black_spans; /* unused */ + FT_Raster_BitTest_Func bit_test; /* unused */ + FT_Raster_BitSet_Func bit_set; /* unused */ void* user; FT_BBox clip_box; @@ -1256,7 +1164,7 @@ FT_BEGIN_HEADER /* XXX: For now, the standard raster doesn't support direct */ /* composition but this should change for the final release (see */ /* the files `demos/src/ftgrays.c' and `demos/src/ftgrays2.c' */ - /* for examples of distinct implementations which support direct */ + /* for examples of distinct implementations that support direct */ /* composition). */ /* */ typedef int @@ -1296,7 +1204,6 @@ FT_BEGIN_HEADER } FT_Raster_Funcs; - /* */ diff --git a/include/freetype/ftincrem.h b/include/ftincrem.h similarity index 99% rename from include/freetype/ftincrem.h rename to include/ftincrem.h index aaf689f..4c0246c 100644 --- a/include/freetype/ftincrem.h +++ b/include/ftincrem.h @@ -4,7 +4,7 @@ /* */ /* FreeType incremental loading (specification). */ /* */ -/* Copyright 2002, 2003, 2006, 2007, 2008, 2010 by */ +/* Copyright 2002, 2003, 2006-2008, 2010, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -45,7 +45,7 @@ FT_BEGIN_HEADER * @description: * This section contains various functions used to perform so-called * `incremental' glyph loading. This is a mode where all glyphs loaded - * from a given @FT_Face are provided by the client application, + * from a given @FT_Face are provided by the client application. * * Apart from that, all other tables are loaded normally from the font * file. This mode is useful when FreeType is used within another @@ -345,6 +345,7 @@ FT_BEGIN_HEADER /* */ + FT_END_HEADER #endif /* __FTINCREM_H__ */ diff --git a/include/freetype/ftlcdfil.h b/include/ftlcdfil.h similarity index 80% rename from include/freetype/ftlcdfil.h rename to include/ftlcdfil.h index 0b55ebe..e8679c1 100644 --- a/include/freetype/ftlcdfil.h +++ b/include/ftlcdfil.h @@ -5,7 +5,7 @@ /* FreeType API for color filtering of subpixel bitmap glyphs */ /* (specification). */ /* */ -/* Copyright 2006, 2007, 2008, 2010 by */ +/* Copyright 2006-2008, 2010, 2013, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -45,14 +45,52 @@ FT_BEGIN_HEADER * * @description: * The @FT_Library_SetLcdFilter API can be used to specify a low-pass - * filter which is then applied to LCD-optimized bitmaps generated + * filter, which is then applied to LCD-optimized bitmaps generated * through @FT_Render_Glyph. This is useful to reduce color fringes - * which would occur with unfiltered rendering. + * that would occur with unfiltered rendering. * * Note that no filter is active by default, and that this function is * *not* implemented in default builds of the library. You need to * #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING in your `ftoption.h' file * in order to activate it. + * + * FreeType generates alpha coverage maps, which are linear by nature. + * For instance, the value 0x80 in bitmap representation means that + * (within numerical precision) 0x80/0xFF fraction of that pixel is + * covered by the glyph's outline. The blending function for placing + * text over a background is + * + * { + * dst = alpha * src + (1 - alpha) * dst , + * } + * + * which is known as OVER. However, when calculating the output of the + * OVER operator, the source colors should first be transformed to a + * linear color space, then alpha blended in that space, and transformed + * back to the output color space. + * + * When linear light blending is used, the default FIR5 filtering + * weights (as given by FT_LCD_FILTER_DEFAULT) are no longer optimal, as + * they have been designed for black on white rendering while lacking + * gamma correction. To preserve color neutrality, weights for a FIR5 + * filter should be chosen according to two free parameters `a' and `c', + * and the FIR weights should be + * + * { + * [a - c, a + c, 2 * a, a + c, a - c] . + * } + * + * This formula generates equal weights for all the color primaries + * across the filter kernel, which makes it colorless. One suggested + * set of weights is + * + * { + * [0x10, 0x50, 0x60, 0x50, 0x10] , + * } + * + * where `a' has value 0x30 and `b' value 0x20. The weights in filter + * may have a sum larger than 0x100, which increases coloration slightly + * but also improves contrast. */ diff --git a/include/freetype/ftlist.h b/include/ftlist.h similarity index 96% rename from include/freetype/ftlist.h rename to include/ftlist.h index bb6f7f1..9950a27 100644 --- a/include/freetype/ftlist.h +++ b/include/ftlist.h @@ -4,7 +4,7 @@ /* */ /* Generic list support for FreeType (specification). */ /* */ -/* Copyright 1996-2001, 2003, 2007, 2010 by */ +/* Copyright 1996-2001, 2003, 2007, 2010, 2013, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -173,7 +173,7 @@ FT_BEGIN_HEADER /* FT_List_Iterator */ /* */ /* <Description> */ - /* An FT_List iterator function which is called during a list parse */ + /* An FT_List iterator function that is called during a list parse */ /* by @FT_List_Iterate. */ /* */ /* <Input> */ @@ -200,7 +200,7 @@ FT_BEGIN_HEADER /* <Input> */ /* list :: A handle to the list. */ /* iterator :: An iterator function, called on each node of the list. */ - /* user :: A user-supplied field which is passed as the second */ + /* user :: A user-supplied field that is passed as the second */ /* argument to the iterator. */ /* */ /* <Return> */ @@ -218,7 +218,7 @@ FT_BEGIN_HEADER /* FT_List_Destructor */ /* */ /* <Description> */ - /* An @FT_List iterator function which is called during a list */ + /* An @FT_List iterator function that is called during a list */ /* finalization by @FT_List_Finalize to destroy all elements in a */ /* given list. */ /* */ @@ -248,11 +248,11 @@ FT_BEGIN_HEADER /* list :: A handle to the list. */ /* */ /* destroy :: A list destructor that will be applied to each element */ - /* of the list. */ + /* of the list. Set this to NULL if not needed. */ /* */ - /* memory :: The current memory object which handles deallocation. */ + /* memory :: The current memory object that handles deallocation. */ /* */ - /* user :: A user-supplied field which is passed as the last */ + /* user :: A user-supplied field that is passed as the last */ /* argument to the destructor. */ /* */ /* <Note> */ @@ -265,7 +265,6 @@ FT_BEGIN_HEADER FT_Memory memory, void* user ); - /* */ diff --git a/include/freetype/ftlzw.h b/include/ftlzw.h similarity index 99% rename from include/freetype/ftlzw.h rename to include/ftlzw.h index 00d4016..857c0c5 100644 --- a/include/freetype/ftlzw.h +++ b/include/ftlzw.h @@ -88,7 +88,7 @@ FT_BEGIN_HEADER FT_Stream_OpenLZW( FT_Stream stream, FT_Stream source ); - /* */ + /* */ FT_END_HEADER diff --git a/include/freetype/ftmac.h b/include/ftmac.h similarity index 98% rename from include/freetype/ftmac.h rename to include/ftmac.h index ab5bab5..42874fe 100644 --- a/include/freetype/ftmac.h +++ b/include/ftmac.h @@ -4,7 +4,7 @@ /* */ /* Additional Mac-specific API. */ /* */ -/* Copyright 1996-2001, 2004, 2006, 2007 by */ +/* Copyright 1996-2001, 2004, 2006, 2007, 2013 by */ /* Just van Rossum, David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -18,7 +18,7 @@ /***************************************************************************/ /* */ -/* NOTE: Include this file after <freetype/freetype.h> and after any */ +/* NOTE: Include this file after FT_FREETYPE_H and after any */ /* Mac-specific headers (because this header uses Mac types such as */ /* Handle, FSSpec, FSRef, etc.) */ /* */ @@ -168,7 +168,7 @@ FT_BEGIN_HEADER /* */ /* <Description> */ /* Return a pathname of the disk file and face index for given font */ - /* name which is handled by ATS framework. */ + /* name that is handled by ATS framework. */ /* */ /* <Input> */ /* fontName :: Mac OS name of the font in ATS framework. */ diff --git a/include/freetype/ftmm.h b/include/ftmm.h similarity index 98% rename from include/freetype/ftmm.h rename to include/ftmm.h index 3aefb9e..2dcfd67 100644 --- a/include/freetype/ftmm.h +++ b/include/ftmm.h @@ -4,7 +4,7 @@ /* */ /* FreeType Multiple Master font interface (specification). */ /* */ -/* Copyright 1996-2001, 2003, 2004, 2006, 2009 by */ +/* Copyright 1996-2001, 2003, 2004, 2006, 2009, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -196,7 +196,7 @@ FT_BEGIN_HEADER /* number of designs). */ /* */ /* num_namedstyles :: The number of named styles; only meaningful for */ - /* GX which allows certain design coordinates to */ + /* GX that allows certain design coordinates to */ /* have a string ID (in the `name' table) */ /* associated with them. The font can tell the */ /* user that, for example, Weight=1.5 is `Bold'. */ @@ -218,9 +218,6 @@ FT_BEGIN_HEADER } FT_MM_Var; - /* */ - - /*************************************************************************/ /* */ /* <Function> */ @@ -258,8 +255,7 @@ FT_BEGIN_HEADER /* */ /* <Output> */ /* amaster :: The Multiple Masters/GX var descriptor. */ - /* Allocates a data structure, which the user must free */ - /* (a single call to FT_FREE will do it). */ + /* Allocates a data structure, which the user must free. */ /* */ /* <Return> */ /* FreeType error code. 0~means success. */ @@ -366,7 +362,6 @@ FT_BEGIN_HEADER FT_UInt num_coords, FT_Fixed* coords ); - /* */ diff --git a/include/freetype/ftmodapi.h b/include/ftmodapi.h similarity index 75% rename from include/freetype/ftmodapi.h rename to include/ftmodapi.h index 8f2e017..980f15d 100644 --- a/include/freetype/ftmodapi.h +++ b/include/ftmodapi.h @@ -4,7 +4,7 @@ /* */ /* FreeType modules public interface (specification). */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2006, 2008, 2009, 2010 by */ +/* Copyright 1996-2003, 2006, 2008-2010, 2012, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -42,11 +42,65 @@ FT_BEGIN_HEADER /* Module Management */ /* */ /* <Abstract> */ - /* How to add, upgrade, and remove modules from FreeType. */ + /* How to add, upgrade, remove, and control modules from FreeType. */ /* */ /* <Description> */ /* The definitions below are used to manage modules within FreeType. */ /* Modules can be added, upgraded, and removed at runtime. */ + /* Additionally, some module properties can be controlled also. */ + /* */ + /* Here is a list of possible values of the `module_name' field in */ + /* the @FT_Module_Class structure. */ + /* */ + /* { */ + /* autofitter */ + /* bdf */ + /* cff */ + /* gxvalid */ + /* otvalid */ + /* pcf */ + /* pfr */ + /* psaux */ + /* pshinter */ + /* psnames */ + /* raster1, raster5 */ + /* sfnt */ + /* smooth, smooth-lcd, smooth-lcdv */ + /* truetype */ + /* type1 */ + /* type42 */ + /* t1cid */ + /* winfonts */ + /* } */ + /* */ + /* Note that the FreeType Cache sub-system is not a FreeType module. */ + /* */ + /* <Order> */ + /* FT_Module */ + /* FT_Module_Constructor */ + /* FT_Module_Destructor */ + /* FT_Module_Requester */ + /* FT_Module_Class */ + /* */ + /* FT_Add_Module */ + /* FT_Get_Module */ + /* FT_Remove_Module */ + /* FT_Add_Default_Modules */ + /* */ + /* FT_Property_Set */ + /* FT_Property_Get */ + /* */ + /* FT_New_Library */ + /* FT_Done_Library */ + /* FT_Reference_Library */ + /* */ + /* FT_Renderer */ + /* FT_Renderer_Class */ + /* */ + /* FT_Get_Renderer */ + /* FT_Set_Renderer */ + /* */ + /* FT_Set_Debug_Hook */ /* */ /*************************************************************************/ @@ -118,7 +172,7 @@ FT_BEGIN_HEADER /* A function used to query a given module for a specific interface. */ /* */ /* <Input> */ - /* module :: The module to finalize. */ + /* module :: The module to be searched. */ /* */ /* name :: The name of the interface in the module. */ /* */ @@ -249,6 +303,137 @@ FT_BEGIN_HEADER FT_Module module ); + /********************************************************************** + * + * @function: + * FT_Property_Set + * + * @description: + * Set a property for a given module. + * + * @input: + * library :: + * A handle to the library the module is part of. + * + * module_name :: + * The module name. + * + * property_name :: + * The property name. Properties are described in the `Synopsis' + * subsection of the module's documentation. + * + * Note that only a few modules have properties. + * + * value :: + * A generic pointer to a variable or structure that gives the new + * value of the property. The exact definition of `value' is + * dependent on the property; see the `Synopsis' subsection of the + * module's documentation. + * + * @return: + * FreeType error code. 0~means success. + * + * @note: + * If `module_name' isn't a valid module name, or `property_name' + * doesn't specify a valid property, or if `value' doesn't represent a + * valid value for the given property, an error is returned. + * + * The following example sets property `bar' (a simple integer) in + * module `foo' to value~1. + * + * { + * FT_UInt bar; + * + * + * bar = 1; + * FT_Property_Set( library, "foo", "bar", &bar ); + * } + * + * Note that the FreeType Cache sub-system doesn't recognize module + * property changes. To avoid glyph lookup confusion within the cache + * you should call @FTC_Manager_Reset to completely flush the cache if + * a module property gets changed after @FTC_Manager_New has been + * called. + * + * It is not possible to set properties of the FreeType Cache + * sub-system itself with FT_Property_Set; use @FTC_Property_Set + * instead. + * + * @since: + * 2.4.11 + * + */ + FT_EXPORT( FT_Error ) + FT_Property_Set( FT_Library library, + const FT_String* module_name, + const FT_String* property_name, + const void* value ); + + + /********************************************************************** + * + * @function: + * FT_Property_Get + * + * @description: + * Get a module's property value. + * + * @input: + * library :: + * A handle to the library the module is part of. + * + * module_name :: + * The module name. + * + * property_name :: + * The property name. Properties are described in the `Synopsis' + * subsection of the module's documentation. + * + * @inout: + * value :: + * A generic pointer to a variable or structure that gives the + * value of the property. The exact definition of `value' is + * dependent on the property; see the `Synopsis' subsection of the + * module's documentation. + * + * @return: + * FreeType error code. 0~means success. + * + * @note: + * If `module_name' isn't a valid module name, or `property_name' + * doesn't specify a valid property, or if `value' doesn't represent a + * valid value for the given property, an error is returned. + * + * The following example gets property `baz' (a range) in module `foo'. + * + * { + * typedef range_ + * { + * FT_Int32 min; + * FT_Int32 max; + * + * } range; + * + * range baz; + * + * + * FT_Property_Get( library, "foo", "baz", &baz ); + * } + * + * It is not possible to retrieve properties of the FreeType Cache + * sub-system with FT_Property_Get; use @FTC_Property_Get instead. + * + * @since: + * 2.4.11 + * + */ + FT_EXPORT( FT_Error ) + FT_Property_Get( FT_Library library, + const FT_String* module_name, + const FT_String* property_name, + void* value ); + + /*************************************************************************/ /* */ /* <Function> */ @@ -260,7 +445,7 @@ FT_BEGIN_HEADER /* @FT_Done_Library then only destroys a library if the counter is~1, */ /* otherwise it simply decrements the counter. */ /* */ - /* This function helps in managing life-cycles of structures which */ + /* This function helps in managing life-cycles of structures that */ /* reference @FT_Library objects. */ /* */ /* <Input> */ @@ -333,7 +518,7 @@ FT_BEGIN_HEADER FT_EXPORT( FT_Error ) FT_Done_Library( FT_Library library ); -/* */ + /* */ typedef void (*FT_DebugHook_Func)( void* arg ); @@ -426,17 +611,17 @@ FT_BEGIN_HEADER * The library implements a bytecode interpreter that doesn't * support the patented operations of the TrueType virtual machine. * - * Its main use is to load certain Asian fonts which position and + * Its main use is to load certain Asian fonts that position and * scale glyph components with bytecode instructions. It produces * bad output for most other fonts. * - * FT_TRUETYPE_ENGINE_TYPE_PATENTED :: + * FT_TRUETYPE_ENGINE_TYPE_PATENTED :: * The library implements a bytecode interpreter that covers * the full instruction set of the TrueType virtual machine (this * was governed by patents until May 2010, hence the name). * * @since: - * 2.2 + * 2.2 * */ typedef enum FT_TrueTypeEngineType_ @@ -471,7 +656,6 @@ FT_BEGIN_HEADER FT_EXPORT( FT_TrueTypeEngineType ) FT_Get_TrueType_Engine_Type( FT_Library library ); - /* */ diff --git a/include/freetype/ftmoderr.h b/include/ftmoderr.h similarity index 63% rename from include/freetype/ftmoderr.h rename to include/ftmoderr.h index 1bf3b38..5a27db1 100644 --- a/include/freetype/ftmoderr.h +++ b/include/ftmoderr.h @@ -4,7 +4,7 @@ /* */ /* FreeType module error offsets (specification). */ /* */ -/* Copyright 2001, 2002, 2003, 2004, 2005, 2010 by */ +/* Copyright 2001-2005, 2010, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -18,17 +18,57 @@ /*************************************************************************/ /* */ - /* This file is used to define the FreeType module error offsets. */ + /* This file is used to define the FreeType module error codes. */ /* */ - /* The lower byte gives the error code, the higher byte gives the */ - /* module. The base module has error offset 0. For example, the error */ - /* `FT_Err_Invalid_File_Format' has value 0x003, the error */ - /* `TT_Err_Invalid_File_Format' has value 0x1103, the error */ - /* `T1_Err_Invalid_File_Format' has value 0x1203, etc. */ + /* If the macro FT_CONFIG_OPTION_USE_MODULE_ERRORS in `ftoption.h' is */ + /* set, the lower byte of an error value identifies the error code as */ + /* usual. In addition, the higher byte identifies the module. For */ + /* example, the error `FT_Err_Invalid_File_Format' has value 0x0003, the */ + /* error `TT_Err_Invalid_File_Format' has value 0x1303, the error */ + /* `T1_Err_Invalid_File_Format' has value 0x1403, etc. */ + /* */ + /* Note that `FT_Err_Ok', `TT_Err_Ok', etc. are always equal to zero, */ + /* including the high byte. */ + /* */ + /* If FT_CONFIG_OPTION_USE_MODULE_ERRORS isn't set, the higher byte of */ + /* an error value is set to zero. */ + /* */ + /* To hide the various `XXX_Err_' prefixes in the source code, FreeType */ + /* provides some macros in `fttypes.h'. */ + /* */ + /* FT_ERR( err ) */ + /* Add current error module prefix (as defined with the */ + /* `FT_ERR_PREFIX' macro) to `err'. For example, in the BDF module */ + /* the line */ + /* */ + /* error = FT_ERR( Invalid_Outline ); */ + /* */ + /* expands to */ + /* */ + /* error = BDF_Err_Invalid_Outline; */ + /* */ + /* For simplicity, you can always use `FT_Err_Ok' directly instead */ + /* of `FT_ERR( Ok )'. */ + /* */ + /* FT_ERR_EQ( errcode, err ) */ + /* FT_ERR_NEQ( errcode, err ) */ + /* Compare error code `errcode' with the error `err' for equality */ + /* and inequality, respectively. Example: */ + /* */ + /* if ( FT_ERR_EQ( error, Invalid_Outline ) ) */ + /* ... */ + /* */ + /* Using this macro you don't have to think about error prefixes. */ + /* Of course, if module errors are not active, the above example is */ + /* the same as */ + /* */ + /* if ( error == FT_Err_Invalid_Outline ) */ + /* ... */ + /* */ + /* FT_ERROR_BASE( errcode ) */ + /* FT_ERROR_MODULE( errcode ) */ + /* Get base error and module error code, respectively. */ /* */ - /* Undefine the macro FT_CONFIG_OPTION_USE_MODULE_ERRORS in ftoption.h */ - /* to make the higher byte always zero (disabling the module error */ - /* mechanism). */ /* */ /* It can also be used to create a module error message table easily */ /* with something like */ @@ -48,9 +88,6 @@ /* #include FT_MODULE_ERRORS_H */ /* } */ /* */ - /* To use such a table, all errors must be ANDed with 0xFF00 to remove */ - /* the error code. */ - /* */ /*************************************************************************/ @@ -124,6 +161,7 @@ FT_MODERRDEF( Type1, 0x1300, "Type 1 module" ) FT_MODERRDEF( Type42, 0x1400, "Type 42 module" ) FT_MODERRDEF( Winfonts, 0x1500, "Windows FON/FNT module" ) + FT_MODERRDEF( GXvalid, 0x1600, "GX validation module" ) #ifdef FT_MODERR_END_LIST diff --git a/include/freetype/ftotval.h b/include/ftotval.h similarity index 91% rename from include/freetype/ftotval.h rename to include/ftotval.h index 027f2e8..75ba03e 100644 --- a/include/freetype/ftotval.h +++ b/include/ftotval.h @@ -4,7 +4,7 @@ /* */ /* FreeType API for validating OpenType tables (specification). */ /* */ -/* Copyright 2004, 2005, 2006, 2007 by */ +/* Copyright 2004-2007, 2013, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -58,6 +58,12 @@ FT_BEGIN_HEADER /* This section contains the declaration of functions to validate */ /* some OpenType tables (BASE, GDEF, GPOS, GSUB, JSTF, MATH). */ /* */ + /* <Order> */ + /* FT_OpenType_Validate */ + /* FT_OpenType_Free */ + /* */ + /* FT_VALIDATE_OTXXX */ + /* */ /*************************************************************************/ @@ -107,8 +113,6 @@ FT_BEGIN_HEADER FT_VALIDATE_JSTF | \ FT_VALIDATE_MATH - /* */ - /********************************************************************** * * @function: @@ -116,7 +120,7 @@ FT_BEGIN_HEADER * * @description: * Validate various OpenType tables to assure that all offsets and - * indices are valid. The idea is that a higher-level library which + * indices are valid. The idea is that a higher-level library that * actually does the text layout can access those tables without * error checking (which can be quite time consuming). * @@ -125,7 +129,7 @@ FT_BEGIN_HEADER * A handle to the input face. * * validation_flags :: - * A bit field which specifies the tables to be validated. See + * A bit field that specifies the tables to be validated. See * @FT_VALIDATE_OTXXX for possible values. * * @output: @@ -165,8 +169,6 @@ FT_BEGIN_HEADER FT_Bytes *GSUB_table, FT_Bytes *JSTF_table ); - /* */ - /********************************************************************** * * @function: @@ -191,8 +193,7 @@ FT_BEGIN_HEADER FT_OpenType_Free( FT_Face face, FT_Bytes table ); - - /* */ + /* */ FT_END_HEADER diff --git a/include/freetype/ftoutln.h b/include/ftoutln.h similarity index 90% rename from include/freetype/ftoutln.h rename to include/ftoutln.h index 1cf3c3f..d3b8fbd 100644 --- a/include/freetype/ftoutln.h +++ b/include/ftoutln.h @@ -5,7 +5,7 @@ /* Support for the FT_Outline type used to store glyph shapes of */ /* most scalable font formats (specification). */ /* */ -/* Copyright 1996-2003, 2005-2011 by */ +/* Copyright 1996-2003, 2005-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -52,13 +52,13 @@ FT_BEGIN_HEADER /* */ /* <Order> */ /* FT_Outline */ - /* FT_OUTLINE_FLAGS */ /* FT_Outline_New */ /* FT_Outline_Done */ /* FT_Outline_Copy */ /* FT_Outline_Translate */ /* FT_Outline_Transform */ /* FT_Outline_Embolden */ + /* FT_Outline_EmboldenXY */ /* FT_Outline_Reverse */ /* FT_Outline_Check */ /* */ @@ -67,13 +67,17 @@ FT_BEGIN_HEADER /* */ /* FT_Outline_Get_Bitmap */ /* FT_Outline_Render */ - /* */ /* FT_Outline_Decompose */ /* FT_Outline_Funcs */ - /* FT_Outline_MoveTo_Func */ - /* FT_Outline_LineTo_Func */ - /* FT_Outline_ConicTo_Func */ - /* FT_Outline_CubicTo_Func */ + /* FT_Outline_MoveToFunc */ + /* FT_Outline_LineToFunc */ + /* FT_Outline_ConicToFunc */ + /* FT_Outline_CubicToFunc */ + /* */ + /* FT_Orientation */ + /* FT_Outline_Get_Orientation */ + /* */ + /* FT_OUTLINE_XXX */ /* */ /*************************************************************************/ @@ -96,7 +100,7 @@ FT_BEGIN_HEADER /* operations. */ /* */ /* <InOut> */ - /* user :: A typeless pointer which is passed to each */ + /* user :: A typeless pointer that is passed to each */ /* emitter during the decomposition. It can be */ /* used to store the state during the */ /* decomposition. */ @@ -104,6 +108,13 @@ FT_BEGIN_HEADER /* <Return> */ /* FreeType error code. 0~means success. */ /* */ + /* <Note> */ + /* A contour that contains a single point only is represented by a */ + /* `move to' operation followed by `line to' to the same point. In */ + /* most cases, it is best to filter this out before using the */ + /* outline for stroking purposes (otherwise it would result in a */ + /* visible dot when round caps are used). */ + /* */ FT_EXPORT( FT_Error ) FT_Outline_Decompose( FT_Outline* outline, const FT_Outline_Funcs* func_interface, @@ -124,9 +135,11 @@ FT_BEGIN_HEADER /* outline will *not* necessarily be *freed*, when */ /* destroying the library, by @FT_Done_FreeType. */ /* */ - /* numPoints :: The maximal number of points within the outline. */ + /* numPoints :: The maximum number of points within the outline. */ + /* Must be smaller than or equal to 0xFFFF (65535). */ /* */ - /* numContours :: The maximal number of contours within the outline. */ + /* numContours :: The maximum number of contours within the outline. */ + /* This value must be in the range 0 to `numPoints'. */ /* */ /* <Output> */ /* anoutline :: A handle to the new outline. */ @@ -214,12 +227,12 @@ FT_BEGIN_HEADER /* the outline's points, including Bézier control points. Though it */ /* coincides with the exact bounding box for most glyphs, it can be */ /* slightly larger in some situations (like when rotating an outline */ - /* which contains Bézier outside arcs). */ + /* that contains Bézier outside arcs). */ /* */ /* Computing the control box is very fast, while getting the bounding */ /* box can take much more time as it needs to walk over all segments */ /* and arcs in the outline. To get the latter, you can use the */ - /* `ftbbox' component which is dedicated to this single task. */ + /* `ftbbox' component, which is dedicated to this single task. */ /* */ /* <Input> */ /* outline :: A pointer to the source outline descriptor. */ @@ -345,6 +358,9 @@ FT_BEGIN_HEADER /* FT_Outline_Embolden( &face->slot->outline, strength ); */ /* } */ /* */ + /* To get meaningful results, font scaling values must be set with */ + /* functions like @FT_Set_Char_Size before calling FT_Render_Glyph. */ + /* */ FT_EXPORT( FT_Error ) FT_Outline_Embolden( FT_Outline* outline, FT_Pos strength ); @@ -353,6 +369,23 @@ FT_BEGIN_HEADER /*************************************************************************/ /* */ /* <Function> */ + /* FT_Outline_EmboldenXY */ + /* */ + /* <Description> */ + /* Embolden an outline. The new outline will be `xstrength' pixels */ + /* wider and `ystrength' pixels higher. Otherwise, it is similar to */ + /* @FT_Outline_Embolden, which uses the same strength in both */ + /* directions. */ + /* */ + FT_EXPORT( FT_Error ) + FT_Outline_EmboldenXY( FT_Outline* outline, + FT_Pos xstrength, + FT_Pos ystrength ); + + + /*************************************************************************/ + /* */ + /* <Function> */ /* FT_Outline_Reverse */ /* */ /* <Description> */ @@ -505,9 +538,11 @@ FT_BEGIN_HEADER * * @description: * This function analyzes a glyph outline and tries to compute its - * fill orientation (see @FT_Orientation). This is done by computing - * the direction of each global horizontal and/or vertical extrema - * within the outline. + * fill orientation (see @FT_Orientation). This is done by integrating + * the total area covered by the outline. The positive integral + * corresponds to the clockwise orientation and @FT_ORIENTATION_POSTSCRIPT + * is returned. The negative integral corresponds to the counter-clockwise + * orientation and @FT_ORIENTATION_TRUETYPE is returned. * * Note that this will return @FT_ORIENTATION_TRUETYPE for empty * outlines. @@ -523,7 +558,6 @@ FT_BEGIN_HEADER FT_EXPORT( FT_Orientation ) FT_Outline_Get_Orientation( FT_Outline* outline ); - /* */ diff --git a/include/freetype/ftpfr.h b/include/ftpfr.h similarity index 99% rename from include/freetype/ftpfr.h rename to include/ftpfr.h index 0b7b7d4..7d50353 100644 --- a/include/freetype/ftpfr.h +++ b/include/ftpfr.h @@ -161,7 +161,7 @@ FT_BEGIN_HEADER FT_UInt gindex, FT_Pos *aadvance ); - /* */ + /* */ FT_END_HEADER diff --git a/include/freetype/ftrender.h b/include/ftrender.h similarity index 99% rename from include/freetype/ftrender.h rename to include/ftrender.h index dd0229b..e8d3636 100644 --- a/include/freetype/ftrender.h +++ b/include/ftrender.h @@ -226,7 +226,6 @@ FT_BEGIN_HEADER FT_UInt num_params, FT_Parameter* parameters ); - /* */ diff --git a/include/freetype/ftsizes.h b/include/ftsizes.h similarity index 98% rename from include/freetype/ftsizes.h rename to include/ftsizes.h index 3e548cc..4167045 100644 --- a/include/freetype/ftsizes.h +++ b/include/ftsizes.h @@ -4,7 +4,7 @@ /* */ /* FreeType size objects management (specification). */ /* */ -/* Copyright 1996-2001, 2003, 2004, 2006, 2009 by */ +/* Copyright 1996-2001, 2003, 2004, 2006, 2009, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -129,7 +129,7 @@ FT_BEGIN_HEADER /* <Description> */ /* Even though it is possible to create several size objects for a */ /* given face (see @FT_New_Size for details), functions like */ - /* @FT_Load_Glyph or @FT_Load_Char only use the one which has been */ + /* @FT_Load_Glyph or @FT_Load_Char only use the one that has been */ /* activated last to determine the `current character pixel size'. */ /* */ /* This function can be used to `activate' a previously created size */ diff --git a/include/freetype/ftsnames.h b/include/ftsnames.h similarity index 98% rename from include/freetype/ftsnames.h rename to include/ftsnames.h index 485e4e1..88af440 100644 --- a/include/freetype/ftsnames.h +++ b/include/ftsnames.h @@ -7,7 +7,7 @@ /* */ /* This is _not_ used to retrieve glyph names! */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2006, 2009, 2010 by */ +/* Copyright 1996-2003, 2006, 2009, 2010, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -169,7 +169,7 @@ FT_BEGIN_HEADER * A constant used as the tag of @FT_Parameter structures to make * FT_Open_Face() ignore preferred family subfamily names in `name' * table since OpenType version 1.4. For backwards compatibility with - * legacy systems which has 4-face-per-family restriction. + * legacy systems that have a 4-face-per-family restriction. * */ #define FT_PARAM_TAG_IGNORE_PREFERRED_FAMILY FT_MAKE_TAG( 'i', 'g', 'p', 'f' ) @@ -184,7 +184,7 @@ FT_BEGIN_HEADER * A constant used as the tag of @FT_Parameter structures to make * FT_Open_Face() ignore preferred subfamily names in `name' table since * OpenType version 1.4. For backwards compatibility with legacy - * systems which has 4-face-per-family restriction. + * systems that have a 4-face-per-family restriction. * */ #define FT_PARAM_TAG_IGNORE_PREFERRED_SUBFAMILY FT_MAKE_TAG( 'i', 'g', 'p', 's' ) diff --git a/include/freetype/ftstroke.h b/include/ftstroke.h similarity index 93% rename from include/freetype/ftstroke.h rename to include/ftstroke.h index 49ae2bc..bd31170 100644 --- a/include/freetype/ftstroke.h +++ b/include/ftstroke.h @@ -4,7 +4,7 @@ /* */ /* FreeType path stroker (specification). */ /* */ -/* Copyright 2002-2006, 2008, 2009, 2011 by */ +/* Copyright 2002-2006, 2008, 2009, 2011-2012, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -46,6 +46,38 @@ FT_BEGIN_HEADER * This can be useful to generate `bordered' glyph, i.e., glyphs * displayed with a coloured (and anti-aliased) border around their * shape. + * + * @order: + * FT_Stroker + * + * FT_Stroker_LineJoin + * FT_Stroker_LineCap + * FT_StrokerBorder + * + * FT_Outline_GetInsideBorder + * FT_Outline_GetOutsideBorder + * + * FT_Glyph_Stroke + * FT_Glyph_StrokeBorder + * + * FT_Stroker_New + * FT_Stroker_Set + * FT_Stroker_Rewind + * FT_Stroker_ParseOutline + * FT_Stroker_Done + * + * FT_Stroker_BeginSubPath + * FT_Stroker_EndSubPath + * + * FT_Stroker_LineTo + * FT_Stroker_ConicTo + * FT_Stroker_CubicTo + * + * FT_Stroker_GetBorderCounts + * FT_Stroker_ExportBorder + * FT_Stroker_GetCounts + * FT_Stroker_Export + * */ @@ -55,7 +87,7 @@ FT_BEGIN_HEADER * FT_Stroker * * @description: - * Opaque handler to a path stroker object. + * Opaque handle to a path stroker object. */ typedef struct FT_StrokerRec_* FT_Stroker; @@ -271,11 +303,13 @@ FT_BEGIN_HEADER * miter_limit :: * The miter limit for the FT_STROKER_LINEJOIN_MITER_FIXED and * FT_STROKER_LINEJOIN_MITER_VARIABLE line join styles, - * expressed as 16.16 fixed point value. + * expressed as 16.16 fixed-point value. * * @note: * The radius is expressed in the same units as the outline * coordinates. + * + * This function calls @FT_Stroker_Rewind automatically. */ FT_EXPORT( void ) FT_Stroker_Set( FT_Stroker stroker, @@ -570,10 +604,10 @@ FT_BEGIN_HEADER * receive all new data. * * When an outline, or a sub-path, is `closed', the stroker generates - * two independent `border' outlines, named `left' and `right' + * two independent `border' outlines, named `left' and `right'. * * When the outline, or a sub-path, is `opened', the stroker merges - * the `border' outlines with caps. The `left' border receives all + * the `border' outlines with caps. The `left' border receives all * points, while the `right' border becomes empty. * * Use the function @FT_Stroker_Export instead if you want to @@ -682,6 +716,11 @@ FT_BEGIN_HEADER * * @note: * The source glyph is untouched in case of error. + * + * Adding stroke may yield a significantly wider and taller glyph + * depending on how large of a radius was used to stroke the glyph. You + * may need to manually adjust horizontal and vertical advance amounts + * to account for this added size. */ FT_EXPORT( FT_Error ) FT_Glyph_Stroke( FT_Glyph *pglyph, @@ -719,6 +758,11 @@ FT_BEGIN_HEADER * * @note: * The source glyph is untouched in case of error. + * + * Adding stroke may yield a significantly wider and taller glyph + * depending on how large of a radius was used to stroke the glyph. You + * may need to manually adjust horizontal and vertical advance amounts + * to account for this added size. */ FT_EXPORT( FT_Error ) FT_Glyph_StrokeBorder( FT_Glyph *pglyph, @@ -726,7 +770,7 @@ FT_BEGIN_HEADER FT_Bool inside, FT_Bool destroy ); - /* */ + /* */ FT_END_HEADER diff --git a/include/freetype/ftsynth.h b/include/ftsynth.h similarity index 91% rename from include/freetype/ftsynth.h rename to include/ftsynth.h index a068b79..d0ea730 100644 --- a/include/freetype/ftsynth.h +++ b/include/ftsynth.h @@ -5,7 +5,7 @@ /* FreeType synthesizing code for emboldening and slanting */ /* (specification). */ /* */ -/* Copyright 2000-2001, 2003, 2006, 2008 by */ +/* Copyright 2000-2001, 2003, 2006, 2008, 2012, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -37,7 +37,7 @@ /* Main reason for not lifting the functions in this module to a */ /* `standard' API is that the used parameters for emboldening and */ /* slanting are not configurable. Consider the functions as a */ - /* code resource which should be copied into the application and */ + /* code resource that should be copied into the application and */ /* adapted to the particular needs. */ @@ -61,8 +61,9 @@ FT_BEGIN_HEADER /* taste). This function is actually a convenience function, providing */ /* a wrapper for @FT_Outline_Embolden and @FT_Bitmap_Embolden. */ /* */ - /* For emboldened outlines the metrics are estimates only; if you need */ - /* precise values you should call @FT_Outline_Get_CBox. */ + /* For emboldened outlines the height, width, and advance metrics are */ + /* increased by the strength of the emboldening. You can also call */ + /* @FT_Outline_Get_CBox to get precise values. */ FT_EXPORT( void ) FT_GlyphSlot_Embolden( FT_GlyphSlot slot ); @@ -72,6 +73,7 @@ FT_BEGIN_HEADER /* */ + FT_END_HEADER #endif /* __FTSYNTH_H__ */ diff --git a/include/freetype/ftsystem.h b/include/ftsystem.h similarity index 95% rename from include/freetype/ftsystem.h rename to include/ftsystem.h index e07460c..7436ed2 100644 --- a/include/freetype/ftsystem.h +++ b/include/ftsystem.h @@ -4,7 +4,7 @@ /* */ /* FreeType low-level system interface definition (specification). */ /* */ -/* Copyright 1996-2001, 2002, 2005, 2010 by */ +/* Copyright 1996-2001, 2002, 2005, 2010, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -192,6 +192,10 @@ FT_BEGIN_HEADER * @description: * A handle to an input stream. * + * @also: + * See @FT_StreamRec for the publicly accessible fields of a given + * stream object. + * */ typedef struct FT_StreamRec_* FT_Stream; @@ -285,6 +289,11 @@ FT_BEGIN_HEADER * size :: * The stream size in bytes. * + * In case of compressed streams where the size is unknown before + * actually doing the decompression, the value is set to 0x7FFFFFFF. + * (Note that this size value can occur for normal streams also; it is + * thus just a hint.) + * * pos :: * The current position within the stream. * @@ -335,7 +344,6 @@ FT_BEGIN_HEADER } FT_StreamRec; - /* */ diff --git a/include/freetype/fttrigon.h b/include/fttrigon.h similarity index 95% rename from include/freetype/fttrigon.h rename to include/fttrigon.h index 6b77d2e..9c7b543 100644 --- a/include/freetype/fttrigon.h +++ b/include/fttrigon.h @@ -4,7 +4,7 @@ /* */ /* FreeType trigonometric functions (specification). */ /* */ -/* Copyright 2001, 2003, 2005, 2007 by */ +/* Copyright 2001, 2003, 2005, 2007, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -46,7 +46,7 @@ FT_BEGIN_HEADER * * @description: * This type is used to model angle values in FreeType. Note that the - * angle is a 16.16 fixed float value expressed in degrees. + * angle is a 16.16 fixed-point value expressed in degrees. * */ typedef FT_Fixed FT_Angle; @@ -106,7 +106,7 @@ FT_BEGIN_HEADER * FT_Sin * * @description: - * Return the sinus of a given angle in fixed point format. + * Return the sinus of a given angle in fixed-point format. * * @input: * angle :: @@ -130,7 +130,7 @@ FT_BEGIN_HEADER * FT_Cos * * @description: - * Return the cosinus of a given angle in fixed point format. + * Return the cosinus of a given angle in fixed-point format. * * @input: * angle :: @@ -154,7 +154,7 @@ FT_BEGIN_HEADER * FT_Tan * * @description: - * Return the tangent of a given angle in fixed point format. + * Return the tangent of a given angle in fixed-point format. * * @input: * angle :: @@ -237,7 +237,7 @@ FT_BEGIN_HEADER * * @input: * angle :: - * The address of angle. + * The input angle. * */ FT_EXPORT( void ) @@ -259,7 +259,7 @@ FT_BEGIN_HEADER * * @input: * angle :: - * The address of angle. + * The input angle. * */ FT_EXPORT( void ) diff --git a/include/ftttdrv.h b/include/ftttdrv.h new file mode 100644 index 0000000..3588413 --- /dev/null +++ b/include/ftttdrv.h @@ -0,0 +1,170 @@ +/***************************************************************************/ +/* */ +/* ftttdrv.h */ +/* */ +/* FreeType API for controlling the TrueType driver */ +/* (specification only). */ +/* */ +/* Copyright 2013 by */ +/* David Turner, Robert Wilhelm, and Werner Lemberg. */ +/* */ +/* This file is part of the FreeType project, and may only be used, */ +/* modified, and distributed under the terms of the FreeType project */ +/* license, LICENSE.TXT. By continuing to use, modify, or distribute */ +/* this file you indicate that you have read the license and */ +/* understand and accept it fully. */ +/* */ +/***************************************************************************/ + + +#ifndef __FTTTDRV_H__ +#define __FTTTDRV_H__ + +#include <ft2build.h> +#include FT_FREETYPE_H + +#ifdef FREETYPE_H +#error "freetype.h of FreeType 1 has been loaded!" +#error "Please fix the directory search order for header files" +#error "so that freetype.h of FreeType 2 is found first." +#endif + + +FT_BEGIN_HEADER + + + /************************************************************************** + * + * @section: + * tt_driver + * + * @title: + * The TrueType driver + * + * @abstract: + * Controlling the TrueType driver module. + * + * @description: + * While FreeType's TrueType driver doesn't expose API functions by + * itself, it is possible to control its behaviour with @FT_Property_Set + * and @FT_Property_Get. The following lists the available properties + * together with the necessary macros and structures. + * + * The TrueType driver's module name is `truetype'. + * + */ + + + /************************************************************************** + * + * @property: + * interpreter-version + * + * @description: + * Currently, two versions are available, representing the bytecode + * interpreter with and without subpixel hinting support, + * respectively. The default is subpixel support if + * TT_CONFIG_OPTION_SUBPIXEL_HINTING is defined, and no subpixel + * support otherwise (since it isn't available then). + * + * If subpixel hinting is on, many TrueType bytecode instructions + * behave differently compared to B/W or grayscale rendering. The + * main idea is to render at a much increased horizontal resolution, + * then sampling down the created output to subpixel precision. + * However, many older fonts are not suited to this and must be + * specially taken care of by applying (hardcoded) font-specific + * tweaks. + * + * Details on subpixel hinting and some of the necessary tweaks can be + * found in Greg Hitchcock's whitepaper at + * `http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx'. + * + * The following example code demonstrates how to activate subpixel + * hinting (omitting the error handling). + * + * { + * FT_Library library; + * FT_Face face; + * FT_UInt interpreter_version = TT_INTERPRETER_VERSION_38; + * + * + * FT_Init_FreeType( &library ); + * + * FT_Property_Set( library, "truetype", + * "interpreter-version", + * &interpreter_version ); + * } + * + * @note: + * This property can be used with @FT_Property_Get also. + * + */ + + + /************************************************************************** + * + * @enum: + * TT_INTERPRETER_VERSION_XXX + * + * @description: + * A list of constants used for the @interpreter-version property to + * select the hinting engine for Truetype fonts. + * + * The numeric value in the constant names represents the version + * number as returned by the `GETINFO' bytecode instruction. + * + * @values: + * TT_INTERPRETER_VERSION_35 :: + * Version~35 corresponds to MS rasterizer v.1.7 as used e.g. in + * Windows~98; only grayscale and B/W rasterizing is supported. + * + * TT_INTERPRETER_VERSION_38 :: + * Version~38 corresponds to MS rasterizer v.1.9; it is roughly + * equivalent to the hinting provided by DirectWrite ClearType (as + * can be found, for example, in the Internet Explorer~9 running on + * Windows~7). + * + * @note: + * This property controls the behaviour of the bytecode interpreter + * and thus how outlines get hinted. It does *not* control how glyph + * get rasterized! In particular, it does not control subpixel color + * filtering. + * + * If FreeType has not been compiled with configuration option + * FT_CONFIG_OPTION_SUBPIXEL_HINTING, selecting version~38 causes an + * `FT_Err_Unimplemented_Feature' error. + * + * Depending on the graphics framework, Microsoft uses different + * bytecode engines. As a consequence, the version numbers returned by + * a call to the `GETINFO[1]' bytecode instruction are more convoluted + * than desired. + * + * { + * framework Windows version result of GETINFO[1] + * ---------------------------------------------------- + * GDI before XP 35 + * GDI XP and later 37 + * GDI+ old before Vista 37 + * GDI+ old Vista, 7 38 + * GDI+ after 7 40 + * DWrite before 8 39 + * DWrite 8 and later 40 + * } + * + * Since FreeType doesn't provide all capabilities of DWrite ClearType, + * using version~38 seems justified. + * + */ +#define TT_INTERPRETER_VERSION_35 35 +#define TT_INTERPRETER_VERSION_38 38 + + /* */ + + +FT_END_HEADER + + +#endif /* __FTTTDRV_H__ */ + + +/* END */ diff --git a/include/freetype/fttypes.h b/include/fttypes.h similarity index 96% rename from include/freetype/fttypes.h rename to include/fttypes.h index 3255527..2c01e87 100644 --- a/include/freetype/fttypes.h +++ b/include/fttypes.h @@ -4,7 +4,7 @@ /* */ /* FreeType simple types definitions (specification only). */ /* */ -/* Copyright 1996-2002, 2004, 2006-2009, 2012 by */ +/* Copyright 1996-2002, 2004, 2006-2009, 2012-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -57,6 +57,8 @@ FT_BEGIN_HEADER /* FT_UInt16 */ /* FT_Int32 */ /* FT_UInt32 */ + /* FT_Int64 */ + /* FT_UInt64 */ /* FT_Short */ /* FT_UShort */ /* FT_Long */ @@ -78,7 +80,9 @@ FT_BEGIN_HEADER /* FT_F2Dot14 */ /* FT_UnitVector */ /* FT_F26Dot6 */ + /* FT_Data */ /* */ + /* FT_MAKE_TAG */ /* */ /* FT_Generic */ /* FT_Generic_Finalizer */ @@ -255,7 +259,7 @@ FT_BEGIN_HEADER /* FT_F2Dot14 */ /* */ /* <Description> */ - /* A signed 2.14 fixed float type used for unit vectors. */ + /* A signed 2.14 fixed-point type used for unit vectors. */ /* */ typedef signed short FT_F2Dot14; @@ -266,7 +270,7 @@ FT_BEGIN_HEADER /* FT_F26Dot6 */ /* */ /* <Description> */ - /* A signed 26.6 fixed float type used for vectorial pixel */ + /* A signed 26.6 fixed-point type used for vectorial pixel */ /* coordinates. */ /* */ typedef signed long FT_F26Dot6; @@ -278,7 +282,7 @@ FT_BEGIN_HEADER /* FT_Fixed */ /* */ /* <Description> */ - /* This type is used to store 16.16 fixed float values, like scaling */ + /* This type is used to store 16.16 fixed-point values, like scaling */ /* values or matrix coefficients. */ /* */ typedef signed long FT_Fixed; @@ -362,7 +366,7 @@ FT_BEGIN_HEADER /* */ /* <Description> */ /* A simple structure used to store a 2x2 matrix. Coefficients are */ - /* in 16.16 fixed float format. The computation performed is: */ + /* in 16.16 fixed-point format. The computation performed is: */ /* */ /* { */ /* x' = x*xx + y*xy */ @@ -418,7 +422,7 @@ FT_BEGIN_HEADER /* details of usage. */ /* */ /* <Input> */ - /* The address of the FreeType object which is under finalization. */ + /* The address of the FreeType object that is under finalization. */ /* Its client data is accessed through its `generic' field. */ /* */ typedef void (*FT_Generic_Finalizer)(void* object); @@ -466,8 +470,8 @@ FT_BEGIN_HEADER /* FT_MAKE_TAG */ /* */ /* <Description> */ - /* This macro converts four-letter tags which are used to label */ - /* TrueType tables into an unsigned long to be used within FreeType. */ + /* This macro converts four-letter tags that are used to label */ + /* TrueType tables into an unsigned long, to be used within FreeType. */ /* */ /* <Note> */ /* The produced values *must* be 32-bit integers. Don't redefine */ @@ -567,18 +571,28 @@ FT_BEGIN_HEADER } FT_ListRec; - /* */ + #define FT_IS_EMPTY( list ) ( (list).head == 0 ) +#define FT_BOOL( x ) ( (FT_Bool)( x ) ) - /* return base error code (without module-specific prefix) */ -#define FT_ERROR_BASE( x ) ( (x) & 0xFF ) + /* concatenate C tokens */ +#define FT_ERR_XCAT( x, y ) x ## y +#define FT_ERR_CAT( x, y ) FT_ERR_XCAT( x, y ) - /* return module error code */ + /* see `ftmoderr.h' for descriptions of the following macros */ + +#define FT_ERR( e ) FT_ERR_CAT( FT_ERR_PREFIX, e ) + +#define FT_ERROR_BASE( x ) ( (x) & 0xFF ) #define FT_ERROR_MODULE( x ) ( (x) & 0xFF00U ) -#define FT_BOOL( x ) ( (FT_Bool)( x ) ) +#define FT_ERR_EQ( x, e ) \ + ( FT_ERROR_BASE( x ) == FT_ERROR_BASE( FT_ERR( e ) ) ) +#define FT_ERR_NEQ( x, e ) \ + ( FT_ERROR_BASE( x ) != FT_ERROR_BASE( FT_ERR( e ) ) ) + FT_END_HEADER diff --git a/include/freetype/ftwinfnt.h b/include/ftwinfnt.h similarity index 97% rename from include/freetype/ftwinfnt.h rename to include/ftwinfnt.h index ea33353..5026158 100644 --- a/include/freetype/ftwinfnt.h +++ b/include/ftwinfnt.h @@ -58,9 +58,10 @@ FT_BEGIN_HEADER * @description: * A list of valid values for the `charset' byte in * @FT_WinFNT_HeaderRec. Exact mapping tables for the various cpXXXX - * encodings (except for cp1361) can be found at ftp://ftp.unicode.org - * in the MAPPINGS/VENDORS/MICSFT/WINDOWS subdirectory. cp1361 is - * roughly a superset of MAPPINGS/OBSOLETE/EASTASIA/KSC/JOHAB.TXT. + * encodings (except for cp1361) can be found at + * ftp://ftp.unicode.org/public in the MAPPINGS/VENDORS/MICSFT/WINDOWS + * subdirectory. cp1361 is roughly a superset of + * MAPPINGS/OBSOLETE/EASTASIA/KSC/JOHAB.TXT. * * @values: * FT_WinFNT_ID_DEFAULT :: @@ -258,9 +259,9 @@ FT_BEGIN_HEADER FT_Get_WinFNT_Header( FT_Face face, FT_WinFNT_HeaderRec *aheader ); - /* */ + FT_END_HEADER #endif /* __FTWINFNT_H__ */ diff --git a/include/freetype/ftxf86.h b/include/ftxf86.h similarity index 96% rename from include/freetype/ftxf86.h rename to include/ftxf86.h index 8c68afd..89d1993 100644 --- a/include/freetype/ftxf86.h +++ b/include/ftxf86.h @@ -4,7 +4,7 @@ /* */ /* Support functions for X11. */ /* */ -/* Copyright 2002, 2003, 2004, 2006, 2007 by */ +/* Copyright 2002-2004, 2006, 2007, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -62,7 +62,7 @@ FT_BEGIN_HEADER /* */ /* <Description> */ /* Return a string describing the format of a given face, using values */ - /* which can be used as an X11 FONT_PROPERTY. Possible values are */ + /* that can be used as an X11 FONT_PROPERTY. Possible values are */ /* `TrueType', `Type~1', `BDF', `PCF', `Type~42', `CID~Type~1', `CFF', */ /* `PFR', and `Windows~FNT'. */ /* */ @@ -76,7 +76,8 @@ FT_BEGIN_HEADER FT_EXPORT( const char* ) FT_Get_X11_Font_Format( FT_Face face ); - /* */ + /* */ + FT_END_HEADER diff --git a/include/freetype/internal/autohint.h b/include/internal/autohint.h similarity index 84% rename from include/freetype/internal/autohint.h rename to include/internal/autohint.h index 231bdd4..545de93 100644 --- a/include/freetype/internal/autohint.h +++ b/include/internal/autohint.h @@ -4,7 +4,7 @@ /* */ /* High-level `autohint' module-specific interface (specification). */ /* */ -/* Copyright 1996-2001, 2002, 2007 by */ +/* Copyright 1996-2002, 2007, 2009, 2012 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -86,20 +86,20 @@ FT_BEGIN_HEADER /* FT_AutoHinter_GlobalGetFunc */ /* */ /* <Description> */ - /* Retrieves the global hints computed for a given face object the */ + /* Retrieve the global hints computed for a given face object. The */ /* resulting data is dissociated from the face and will survive a */ /* call to FT_Done_Face(). It must be discarded through the API */ /* FT_AutoHinter_GlobalDoneFunc(). */ /* */ /* <Input> */ - /* hinter :: A handle to the source auto-hinter. */ + /* hinter :: A handle to the source auto-hinter. */ /* */ - /* face :: A handle to the source face object. */ + /* face :: A handle to the source face object. */ /* */ /* <Output> */ - /* global_hints :: A typeless pointer to the global hints. */ + /* global_hints :: A typeless pointer to the global hints. */ /* */ - /* global_len :: The size in bytes of the global hints. */ + /* global_len :: The size in bytes of the global hints. */ /* */ typedef void (*FT_AutoHinter_GlobalGetFunc)( FT_AutoHinter hinter, @@ -114,7 +114,7 @@ FT_BEGIN_HEADER /* FT_AutoHinter_GlobalDoneFunc */ /* */ /* <Description> */ - /* Discards the global hints retrieved through */ + /* Discard the global hints retrieved through */ /* FT_AutoHinter_GlobalGetFunc(). This is the only way these hints */ /* are freed from memory. */ /* */ @@ -168,8 +168,8 @@ FT_BEGIN_HEADER /* This function is capable of loading composite glyphs by hinting */ /* each sub-glyph independently (which improves quality). */ /* */ - /* It will call the font driver with FT_Load_Glyph(), with */ - /* FT_LOAD_NO_SCALE set. */ + /* It will call the font driver with @FT_Load_Glyph, with */ + /* @FT_LOAD_NO_SCALE set. */ /* */ typedef FT_Error (*FT_AutoHinter_GlyphLoadFunc)( FT_AutoHinter hinter, @@ -182,43 +182,56 @@ FT_BEGIN_HEADER /*************************************************************************/ /* */ /* <Struct> */ - /* FT_AutoHinter_ServiceRec */ + /* FT_AutoHinter_InterfaceRec */ /* */ /* <Description> */ /* The auto-hinter module's interface. */ /* */ - typedef struct FT_AutoHinter_ServiceRec_ + typedef struct FT_AutoHinter_InterfaceRec_ { FT_AutoHinter_GlobalResetFunc reset_face; FT_AutoHinter_GlobalGetFunc get_global_hints; FT_AutoHinter_GlobalDoneFunc done_global_hints; FT_AutoHinter_GlyphLoadFunc load_glyph; - } FT_AutoHinter_ServiceRec, *FT_AutoHinter_Service; + } FT_AutoHinter_InterfaceRec, *FT_AutoHinter_Interface; + #ifndef FT_CONFIG_OPTION_PIC -#define FT_DEFINE_AUTOHINTER_SERVICE(class_, reset_face_, get_global_hints_, \ - done_global_hints_, load_glyph_) \ - FT_CALLBACK_TABLE_DEF \ - const FT_AutoHinter_ServiceRec class_ = \ - { \ - reset_face_, get_global_hints_, done_global_hints_, load_glyph_ \ +#define FT_DEFINE_AUTOHINTER_INTERFACE( \ + class_, \ + reset_face_, \ + get_global_hints_, \ + done_global_hints_, \ + load_glyph_ ) \ + FT_CALLBACK_TABLE_DEF \ + const FT_AutoHinter_InterfaceRec class_ = \ + { \ + reset_face_, \ + get_global_hints_, \ + done_global_hints_, \ + load_glyph_ \ }; #else /* FT_CONFIG_OPTION_PIC */ -#define FT_DEFINE_AUTOHINTER_SERVICE(class_, reset_face_, get_global_hints_, \ - done_global_hints_, load_glyph_) \ - void \ - FT_Init_Class_##class_( FT_Library library, \ - FT_AutoHinter_ServiceRec* clazz) \ - { \ - FT_UNUSED(library); \ - clazz->reset_face = reset_face_; \ - clazz->get_global_hints = get_global_hints_; \ - clazz->done_global_hints = done_global_hints_; \ - clazz->load_glyph = load_glyph_; \ +#define FT_DEFINE_AUTOHINTER_INTERFACE( \ + class_, \ + reset_face_, \ + get_global_hints_, \ + done_global_hints_, \ + load_glyph_ ) \ + void \ + FT_Init_Class_ ## class_( FT_Library library, \ + FT_AutoHinter_InterfaceRec* clazz ) \ + { \ + FT_UNUSED( library ); \ + \ + clazz->reset_face = reset_face_; \ + clazz->get_global_hints = get_global_hints_; \ + clazz->done_global_hints = done_global_hints_; \ + clazz->load_glyph = load_glyph_; \ } #endif /* FT_CONFIG_OPTION_PIC */ diff --git a/include/freetype/internal/ftcalc.h b/include/internal/ftcalc.h similarity index 51% rename from include/freetype/internal/ftcalc.h rename to include/internal/ftcalc.h index f8b4324..14ec37b 100644 --- a/include/freetype/internal/ftcalc.h +++ b/include/internal/ftcalc.h @@ -4,7 +4,7 @@ /* */ /* Arithmetic computations (specification). */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009 by */ +/* Copyright 1996-2006, 2008, 2009, 2012-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -29,56 +29,222 @@ FT_BEGIN_HEADER /*************************************************************************/ /* */ - /* <Function> */ - /* FT_FixedSqrt */ - /* */ - /* <Description> */ - /* Computes the square root of a 16.16 fixed point value. */ - /* */ - /* <Input> */ - /* x :: The value to compute the root for. */ - /* */ - /* <Return> */ - /* The result of `sqrt(x)'. */ - /* */ - /* <Note> */ - /* This function is not very fast. */ + /* FT_MulDiv() and FT_MulFix() are declared in freetype.h. */ /* */ - FT_BASE( FT_Int32 ) - FT_SqrtFixed( FT_Int32 x ); + /*************************************************************************/ +#ifndef FT_CONFIG_OPTION_NO_ASSEMBLER + /* Provide assembler fragments for performance-critical functions. */ + /* These must be defined `static __inline__' with GCC. */ -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS +#if defined( __CC_ARM ) || defined( __ARMCC__ ) /* RVCT */ - /*************************************************************************/ - /* */ - /* <Function> */ - /* FT_Sqrt32 */ - /* */ - /* <Description> */ - /* Computes the square root of an Int32 integer (which will be */ - /* handled as an unsigned long value). */ - /* */ - /* <Input> */ - /* x :: The value to compute the root for. */ - /* */ - /* <Return> */ - /* The result of `sqrt(x)'. */ - /* */ - FT_EXPORT( FT_Int32 ) - FT_Sqrt32( FT_Int32 x ); +#define FT_MULFIX_ASSEMBLER FT_MulFix_arm -#endif /* FT_CONFIG_OPTION_OLD_INTERNALS */ + /* documentation is in freetype.h */ + static __inline FT_Int32 + FT_MulFix_arm( FT_Int32 a, + FT_Int32 b ) + { + register FT_Int32 t, t2; + + + __asm + { + smull t2, t, b, a /* (lo=t2,hi=t) = a*b */ + mov a, t, asr #31 /* a = (hi >> 31) */ + add a, a, #0x8000 /* a += 0x8000 */ + adds t2, t2, a /* t2 += a */ + adc t, t, #0 /* t += carry */ + mov a, t2, lsr #16 /* a = t2 >> 16 */ + orr a, a, t, lsl #16 /* a |= t << 16 */ + } + return a; + } + +#endif /* __CC_ARM || __ARMCC__ */ + + +#ifdef __GNUC__ + +#if defined( __arm__ ) && \ + ( !defined( __thumb__ ) || defined( __thumb2__ ) ) && \ + !( defined( __CC_ARM ) || defined( __ARMCC__ ) ) + +#define FT_MULFIX_ASSEMBLER FT_MulFix_arm + + /* documentation is in freetype.h */ + + static __inline__ FT_Int32 + FT_MulFix_arm( FT_Int32 a, + FT_Int32 b ) + { + register FT_Int32 t, t2; + + + __asm__ __volatile__ ( + "smull %1, %2, %4, %3\n\t" /* (lo=%1,hi=%2) = a*b */ + "mov %0, %2, asr #31\n\t" /* %0 = (hi >> 31) */ +#if defined( __clang__ ) && defined( __thumb2__ ) + "add.w %0, %0, #0x8000\n\t" /* %0 += 0x8000 */ +#else + "add %0, %0, #0x8000\n\t" /* %0 += 0x8000 */ +#endif + "adds %1, %1, %0\n\t" /* %1 += %0 */ + "adc %2, %2, #0\n\t" /* %2 += carry */ + "mov %0, %1, lsr #16\n\t" /* %0 = %1 >> 16 */ + "orr %0, %0, %2, lsl #16\n\t" /* %0 |= %2 << 16 */ + : "=r"(a), "=&r"(t2), "=&r"(t) + : "r"(a), "r"(b) + : "cc" ); + return a; + } + +#endif /* __arm__ && */ + /* ( __thumb2__ || !__thumb__ ) && */ + /* !( __CC_ARM || __ARMCC__ ) */ + + +#if defined( __i386__ ) + +#define FT_MULFIX_ASSEMBLER FT_MulFix_i386 + + /* documentation is in freetype.h */ + + static __inline__ FT_Int32 + FT_MulFix_i386( FT_Int32 a, + FT_Int32 b ) + { + register FT_Int32 result; + + + __asm__ __volatile__ ( + "imul %%edx\n" + "movl %%edx, %%ecx\n" + "sarl $31, %%ecx\n" + "addl $0x8000, %%ecx\n" + "addl %%ecx, %%eax\n" + "adcl $0, %%edx\n" + "shrl $16, %%eax\n" + "shll $16, %%edx\n" + "addl %%edx, %%eax\n" + : "=a"(result), "=d"(b) + : "a"(a), "d"(b) + : "%ecx", "cc" ); + return result; + } + +#endif /* i386 */ + +#endif /* __GNUC__ */ + + +#ifdef _MSC_VER /* Visual C++ */ + +#ifdef _M_IX86 + +#define FT_MULFIX_ASSEMBLER FT_MulFix_i386 + + /* documentation is in freetype.h */ + + static __inline FT_Int32 + FT_MulFix_i386( FT_Int32 a, + FT_Int32 b ) + { + register FT_Int32 result; + + __asm + { + mov eax, a + mov edx, b + imul edx + mov ecx, edx + sar ecx, 31 + add ecx, 8000h + add eax, ecx + adc edx, 0 + shr eax, 16 + shl edx, 16 + add eax, edx + mov result, eax + } + return result; + } + +#endif /* _M_IX86 */ + +#endif /* _MSC_VER */ + + +#if defined( __GNUC__ ) && defined( __x86_64__ ) + +#define FT_MULFIX_ASSEMBLER FT_MulFix_x86_64 + + static __inline__ FT_Int32 + FT_MulFix_x86_64( FT_Int32 a, + FT_Int32 b ) + { + /* Temporarily disable the warning that C90 doesn't support */ + /* `long long'. */ +#if __GNUC__ > 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ >= 6 ) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wlong-long" +#endif + +#if 1 + /* Technically not an assembly fragment, but GCC does a really good */ + /* job at inlining it and generating good machine code for it. */ + long long ret, tmp; - /*************************************************************************/ - /* */ - /* FT_MulDiv() and FT_MulFix() are declared in freetype.h. */ - /* */ - /*************************************************************************/ + ret = (long long)a * b; + tmp = ret >> 63; + ret += 0x8000 + tmp; + + return (FT_Int32)( ret >> 16 ); +#else + + /* For some reason, GCC 4.6 on Ubuntu 12.04 generates invalid machine */ + /* code from the lines below. The main issue is that `wide_a' is not */ + /* properly initialized by sign-extending `a'. Instead, the generated */ + /* machine code assumes that the register that contains `a' on input */ + /* can be used directly as a 64-bit value, which is wrong most of the */ + /* time. */ + long long wide_a = (long long)a; + long long wide_b = (long long)b; + long long result; + + + __asm__ __volatile__ ( + "imul %2, %1\n" + "mov %1, %0\n" + "sar $63, %0\n" + "lea 0x8000(%1, %0), %0\n" + "sar $16, %0\n" + : "=&r"(result), "=&r"(wide_a) + : "r"(wide_b) + : "cc" ); + + return (FT_Int32)result; +#endif + +#if __GNUC__ > 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ >= 6 ) +#pragma GCC diagnostic pop +#endif + } + +#endif /* __GNUC__ && __x86_64__ */ + +#endif /* !FT_CONFIG_OPTION_NO_ASSEMBLER */ + + +#ifdef FT_CONFIG_OPTION_INLINE_MULFIX +#ifdef FT_MULFIX_ASSEMBLER +#define FT_MulFix( a, b ) FT_MULFIX_ASSEMBLER( (FT_Int32)(a), (FT_Int32)(b) ) +#endif +#endif -#ifdef TT_USE_BYTECODE_INTERPRETER /*************************************************************************/ /* */ @@ -87,7 +253,7 @@ FT_BEGIN_HEADER /* */ /* <Description> */ /* A very simple function used to perform the computation `(a*b)/c' */ - /* (without rounding) with maximal accuracy (it uses a 64-bit */ + /* (without rounding) with maximum accuracy (it uses a 64-bit */ /* intermediate integer whenever necessary). */ /* */ /* This function isn't necessarily as fast as some processor specific */ @@ -108,8 +274,6 @@ FT_BEGIN_HEADER FT_Long b, FT_Long c ); -#endif /* TT_USE_BYTECODE_INTERPRETER */ - /* * A variant of FT_Matrix_Multiply which scales its result afterwards. @@ -129,7 +293,6 @@ FT_BEGIN_HEADER * A variant of FT_Vector_Transform. See comments for * FT_Matrix_Multiply_Scaled. */ - FT_BASE( void ) FT_Vector_Transform_Scaled( FT_Vector* vector, const FT_Matrix* matrix, @@ -148,10 +311,11 @@ FT_BEGIN_HEADER FT_Pos out_x, FT_Pos out_y ); + /* * Return TRUE if a corner is flat or nearly flat. This is equivalent to - * saying that the angle difference between the `in' and `out' vectors is - * very small. + * saying that the corner point is close to its neighbors, or inside an + * ellipse defined by the neighbor focal points to be more precise. */ FT_BASE( FT_Int ) ft_corner_is_flat( FT_Pos in_x, @@ -160,6 +324,69 @@ FT_BEGIN_HEADER FT_Pos out_y ); + /* + * Return the most significant bit index. + */ + +#ifndef FT_CONFIG_OPTION_NO_ASSEMBLER +#if defined( __GNUC__ ) && \ + ( __GNUC__ > 3 || ( __GNUC__ == 3 && __GNUC_MINOR__ >= 4 ) ) + +#if FT_SIZEOF_INT == 4 + +#define FT_MSB( x ) ( 31 - __builtin_clz( x ) ) + +#elif FT_SIZEOF_LONG == 4 + +#define FT_MSB( x ) ( 31 - __builtin_clzl( x ) ) + +#endif + +#endif /* __GNUC__ */ +#endif /* !FT_CONFIG_OPTION_NO_ASSEMBLER */ + +#ifndef FT_MSB + + FT_BASE( FT_Int ) + FT_MSB( FT_UInt32 z ); + +#endif + + + /* + * Return sqrt(x*x+y*y), which is the same as `FT_Vector_Length' but uses + * two fixed-point arguments instead. + */ + FT_BASE( FT_Fixed ) + FT_Hypot( FT_Fixed x, + FT_Fixed y ); + + +#if 0 + + /*************************************************************************/ + /* */ + /* <Function> */ + /* FT_SqrtFixed */ + /* */ + /* <Description> */ + /* Computes the square root of a 16.16 fixed-point value. */ + /* */ + /* <Input> */ + /* x :: The value to compute the root for. */ + /* */ + /* <Return> */ + /* The result of `sqrt(x)'. */ + /* */ + /* <Note> */ + /* This function is not very fast. */ + /* */ + FT_BASE( FT_Int32 ) + FT_SqrtFixed( FT_Int32 x ); + +#endif /* 0 */ + + #define INT_TO_F26DOT6( x ) ( (FT_Long)(x) << 6 ) #define INT_TO_F2DOT14( x ) ( (FT_Long)(x) << 14 ) #define INT_TO_FIXED( x ) ( (FT_Long)(x) << 16 ) diff --git a/include/freetype/internal/ftdebug.h b/include/internal/ftdebug.h similarity index 93% rename from include/freetype/internal/ftdebug.h rename to include/internal/ftdebug.h index 7baae35..58a3916 100644 --- a/include/freetype/internal/ftdebug.h +++ b/include/internal/ftdebug.h @@ -4,7 +4,7 @@ /* */ /* Debugging and logging component (specification). */ /* */ -/* Copyright 1996-2001, 2002, 2004, 2006, 2007, 2008, 2009 by */ +/* Copyright 1996-2002, 2004, 2006-2009, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -185,7 +185,8 @@ FT_BEGIN_HEADER /*************************************************************************/ /* */ - /* Define the FT_ASSERT macro. */ + /* Define the FT_ASSERT and FT_THROW macros. The call to `FT_Throw' */ + /* makes it possible to easily set a breakpoint at this function. */ /* */ /*************************************************************************/ @@ -199,10 +200,18 @@ FT_BEGIN_HEADER __LINE__, __FILE__ ); \ } while ( 0 ) +#define FT_THROW( e ) \ + ( FT_Throw( FT_ERR_CAT( FT_ERR_PREFIX, e ), \ + __LINE__, \ + __FILE__ ) | \ + FT_ERR_CAT( FT_ERR_PREFIX, e ) ) + #else /* !FT_DEBUG_LEVEL_ERROR */ #define FT_ASSERT( condition ) do { } while ( 0 ) +#define FT_THROW( e ) FT_ERR_CAT( FT_ERR_PREFIX, e ) + #endif /* !FT_DEBUG_LEVEL_ERROR */ @@ -226,22 +235,18 @@ FT_BEGIN_HEADER FT_Panic( const char* fmt, ... ); + /* report file name and line number of an error */ + FT_BASE( int ) + FT_Throw( FT_Error error, + int line, + const char* file ); + #endif /* FT_DEBUG_LEVEL_ERROR */ FT_BASE( void ) ft_debug_init( void ); - -#if defined( _MSC_VER ) /* Visual C++ (and Intel C++) */ - - /* We disable the warning `conditional expression is constant' here */ - /* in order to compile cleanly with the maximum level of warnings. */ -#pragma warning( disable : 4127 ) - -#endif /* _MSC_VER */ - - FT_END_HEADER #endif /* __FTDEBUG_H__ */ diff --git a/include/freetype/internal/ftdriver.h b/include/internal/ftdriver.h similarity index 54% rename from include/freetype/internal/ftdriver.h rename to include/internal/ftdriver.h index 6f6b206..940218e 100644 --- a/include/freetype/internal/ftdriver.h +++ b/include/internal/ftdriver.h @@ -4,7 +4,7 @@ /* */ /* FreeType font driver interface (specification). */ /* */ -/* Copyright 1996-2003, 2006, 2008, 2011 by */ +/* Copyright 1996-2003, 2006, 2008, 2011-2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -60,22 +60,6 @@ FT_BEGIN_HEADER (*FT_Size_SelectFunc)( FT_Size size, FT_ULong size_index ); -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS - - typedef FT_Error - (*FT_Size_ResetPointsFunc)( FT_Size size, - FT_F26Dot6 char_width, - FT_F26Dot6 char_height, - FT_UInt horz_resolution, - FT_UInt vert_resolution ); - - typedef FT_Error - (*FT_Size_ResetPixelsFunc)( FT_Size size, - FT_UInt pixel_width, - FT_UInt pixel_height ); - -#endif /* FT_CONFIG_OPTION_OLD_INTERNALS */ - typedef FT_Error (*FT_Slot_LoadFunc)( FT_GlyphSlot slot, FT_Size size, @@ -181,72 +165,42 @@ FT_BEGIN_HEADER /* */ typedef struct FT_Driver_ClassRec_ { - FT_Module_Class root; - - FT_Long face_object_size; - FT_Long size_object_size; - FT_Long slot_object_size; - - FT_Face_InitFunc init_face; - FT_Face_DoneFunc done_face; + FT_Module_Class root; - FT_Size_InitFunc init_size; - FT_Size_DoneFunc done_size; + FT_Long face_object_size; + FT_Long size_object_size; + FT_Long slot_object_size; - FT_Slot_InitFunc init_slot; - FT_Slot_DoneFunc done_slot; + FT_Face_InitFunc init_face; + FT_Face_DoneFunc done_face; -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS + FT_Size_InitFunc init_size; + FT_Size_DoneFunc done_size; - FT_Size_ResetPointsFunc set_char_sizes; - FT_Size_ResetPixelsFunc set_pixel_sizes; + FT_Slot_InitFunc init_slot; + FT_Slot_DoneFunc done_slot; -#endif /* FT_CONFIG_OPTION_OLD_INTERNALS */ + FT_Slot_LoadFunc load_glyph; - FT_Slot_LoadFunc load_glyph; - - FT_Face_GetKerningFunc get_kerning; - FT_Face_AttachFunc attach_file; - FT_Face_GetAdvancesFunc get_advances; + FT_Face_GetKerningFunc get_kerning; + FT_Face_AttachFunc attach_file; + FT_Face_GetAdvancesFunc get_advances; /* since version 2.2 */ - FT_Size_RequestFunc request_size; - FT_Size_SelectFunc select_size; + FT_Size_RequestFunc request_size; + FT_Size_SelectFunc select_size; } FT_Driver_ClassRec, *FT_Driver_Class; - /* - * The following functions are used as stubs for `set_char_sizes' and - * `set_pixel_sizes'; the code uses `request_size' and `select_size' - * functions instead. - * - * Implementation is in `src/base/ftobjs.c'. - */ -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS - - FT_BASE( FT_Error ) - ft_stub_set_char_sizes( FT_Size size, - FT_F26Dot6 width, - FT_F26Dot6 height, - FT_UInt horz_res, - FT_UInt vert_res ); - - FT_BASE( FT_Error ) - ft_stub_set_pixel_sizes( FT_Size size, - FT_UInt width, - FT_UInt height ); - -#endif /* FT_CONFIG_OPTION_OLD_INTERNALS */ - /*************************************************************************/ /* */ /* <Macro> */ /* FT_DECLARE_DRIVER */ /* */ /* <Description> */ - /* Used to create a forward declaration of a */ - /* FT_Driver_ClassRec stract instance. */ + /* Used to create a forward declaration of an FT_Driver_ClassRec */ + /* struct instance. */ /* */ /* <Macro> */ /* FT_DEFINE_DRIVER */ @@ -254,160 +208,194 @@ FT_BEGIN_HEADER /* <Description> */ /* Used to initialize an instance of FT_Driver_ClassRec struct. */ /* */ - /* When FT_CONFIG_OPTION_PIC is defined a Create funtion will need */ - /* to called with a pointer where the allocated stracture is returned.*/ - /* And when it is no longer needed a Destroy function needs */ - /* to be called to release that allocation. */ - /* fcinit.c (ft_create_default_module_classes) already contains */ - /* a mechanism to call these functions for the default modules */ - /* described in ftmodule.h */ + /* When FT_CONFIG_OPTION_PIC is defined a `create' function has to be */ + /* called with a pointer where the allocated structure is returned. */ + /* And when it is no longer needed a `destroy' function needs to be */ + /* called to release that allocation. */ + /* */ + /* `fcinit.c' (ft_create_default_module_classes) already contains a */ + /* mechanism to call these functions for the default modules */ + /* described in `ftmodule.h'. */ /* */ - /* Notice that the created Create and Destroy functions call */ - /* pic_init and pic_free function to allow you to manually allocate */ - /* and initialize any additional global data, like module specific */ + /* Notice that the created `create' and `destroy' functions call */ + /* `pic_init' and `pic_free' to allow you to manually allocate and */ + /* initialize any additional global data, like a module specific */ /* interface, and put them in the global pic container defined in */ - /* ftpic.h. if you don't need them just implement the functions as */ - /* empty to resolve the link error. Also the pic_init and pic_free */ - /* functions should be declared in pic.h, to be referred by driver */ - /* definition calling FT_DEFINE_DRIVER() in following. */ + /* `ftpic.h'. If you don't need them just implement the functions as */ + /* empty to resolve the link error. Also the `pic_init' and */ + /* `pic_free' functions should be declared in `pic.h', to be referred */ + /* by driver definition calling `FT_DEFINE_DRIVER' in following. */ /* */ /* When FT_CONFIG_OPTION_PIC is not defined the struct will be */ - /* allocated in the global scope (or the scope where the macro */ - /* is used). */ + /* allocated in the global scope (or the scope where the macro is */ + /* used). */ /* */ #ifndef FT_CONFIG_OPTION_PIC -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS -#define FT_DEFINE_DRIVERS_OLD_INTERNALS(a_,b_) \ - a_, b_, -#else - #define FT_DEFINE_DRIVERS_OLD_INTERNALS(a_,b_) -#endif - -#define FT_DECLARE_DRIVER(class_) \ +#define FT_DECLARE_DRIVER( class_ ) \ FT_CALLBACK_TABLE \ const FT_Driver_ClassRec class_; -#define FT_DEFINE_DRIVER(class_, \ - flags_, size_, name_, version_, requires_, \ - interface_, init_, done_, get_interface_, \ - face_object_size_, size_object_size_, \ - slot_object_size_, init_face_, done_face_, \ - init_size_, done_size_, init_slot_, done_slot_, \ - old_set_char_sizes_, old_set_pixel_sizes_, \ - load_glyph_, get_kerning_, attach_file_, \ - get_advances_, request_size_, select_size_ ) \ - FT_CALLBACK_TABLE_DEF \ - const FT_Driver_ClassRec class_ = \ - { \ - FT_DEFINE_ROOT_MODULE(flags_,size_,name_,version_,requires_,interface_, \ - init_,done_,get_interface_) \ - \ - face_object_size_, \ - size_object_size_, \ - slot_object_size_, \ - \ - init_face_, \ - done_face_, \ - \ - init_size_, \ - done_size_, \ - \ - init_slot_, \ - done_slot_, \ - \ - FT_DEFINE_DRIVERS_OLD_INTERNALS(old_set_char_sizes_, old_set_pixel_sizes_) \ - \ - load_glyph_, \ - \ - get_kerning_, \ - attach_file_, \ - get_advances_, \ - \ - request_size_, \ - select_size_ \ +#define FT_DEFINE_DRIVER( \ + class_, \ + flags_, \ + size_, \ + name_, \ + version_, \ + requires_, \ + interface_, \ + init_, \ + done_, \ + get_interface_, \ + face_object_size_, \ + size_object_size_, \ + slot_object_size_, \ + init_face_, \ + done_face_, \ + init_size_, \ + done_size_, \ + init_slot_, \ + done_slot_, \ + load_glyph_, \ + get_kerning_, \ + attach_file_, \ + get_advances_, \ + request_size_, \ + select_size_ ) \ + FT_CALLBACK_TABLE_DEF \ + const FT_Driver_ClassRec class_ = \ + { \ + FT_DEFINE_ROOT_MODULE( flags_, \ + size_, \ + name_, \ + version_, \ + requires_, \ + interface_, \ + init_, \ + done_, \ + get_interface_ ) \ + \ + face_object_size_, \ + size_object_size_, \ + slot_object_size_, \ + \ + init_face_, \ + done_face_, \ + \ + init_size_, \ + done_size_, \ + \ + init_slot_, \ + done_slot_, \ + \ + load_glyph_, \ + \ + get_kerning_, \ + attach_file_, \ + get_advances_, \ + \ + request_size_, \ + select_size_ \ }; #else /* FT_CONFIG_OPTION_PIC */ -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS -#define FT_DEFINE_DRIVERS_OLD_INTERNALS(a_,b_) \ - clazz->set_char_sizes = a_; \ - clazz->set_pixel_sizes = b_; -#else - #define FT_DEFINE_DRIVERS_OLD_INTERNALS(a_,b_) -#endif - -#define FT_DECLARE_DRIVER(class_) FT_DECLARE_MODULE(class_) - -#define FT_DEFINE_DRIVER(class_, \ - flags_, size_, name_, version_, requires_, \ - interface_, init_, done_, get_interface_, \ - face_object_size_, size_object_size_, \ - slot_object_size_, init_face_, done_face_, \ - init_size_, done_size_, init_slot_, done_slot_, \ - old_set_char_sizes_, old_set_pixel_sizes_, \ - load_glyph_, get_kerning_, attach_file_, \ - get_advances_, request_size_, select_size_ ) \ - \ - void \ - FT_Destroy_Class_##class_( FT_Library library, \ - FT_Module_Class* clazz ) \ - { \ - FT_Memory memory = library->memory; \ - FT_Driver_Class dclazz = (FT_Driver_Class)clazz; \ - class_##_pic_free( library ); \ - if ( dclazz ) \ - FT_FREE( dclazz ); \ - } \ - \ - FT_Error \ - FT_Create_Class_##class_( FT_Library library, \ - FT_Module_Class** output_class ) \ - { \ - FT_Driver_Class clazz; \ - FT_Error error; \ - FT_Memory memory = library->memory; \ - \ - if ( FT_ALLOC( clazz, sizeof(*clazz) ) ) \ - return error; \ - \ - error = class_##_pic_init( library ); \ - if(error) \ - { \ - FT_FREE( clazz ); \ - return error; \ - } \ - \ - FT_DEFINE_ROOT_MODULE(flags_,size_,name_,version_,requires_,interface_, \ - init_,done_,get_interface_) \ - \ - clazz->face_object_size = face_object_size_; \ - clazz->size_object_size = size_object_size_; \ - clazz->slot_object_size = slot_object_size_; \ - \ - clazz->init_face = init_face_; \ - clazz->done_face = done_face_; \ - \ - clazz->init_size = init_size_; \ - clazz->done_size = done_size_; \ - \ - clazz->init_slot = init_slot_; \ - clazz->done_slot = done_slot_; \ - \ - FT_DEFINE_DRIVERS_OLD_INTERNALS(old_set_char_sizes_, old_set_pixel_sizes_) \ - \ - clazz->load_glyph = load_glyph_; \ - \ - clazz->get_kerning = get_kerning_; \ - clazz->attach_file = attach_file_; \ - clazz->get_advances = get_advances_; \ - \ - clazz->request_size = request_size_; \ - clazz->select_size = select_size_; \ - \ - *output_class = (FT_Module_Class*)clazz; \ - return FT_Err_Ok; \ +#define FT_DECLARE_DRIVER( class_ ) FT_DECLARE_MODULE( class_ ) + +#define FT_DEFINE_DRIVER( \ + class_, \ + flags_, \ + size_, \ + name_, \ + version_, \ + requires_, \ + interface_, \ + init_, \ + done_, \ + get_interface_, \ + face_object_size_, \ + size_object_size_, \ + slot_object_size_, \ + init_face_, \ + done_face_, \ + init_size_, \ + done_size_, \ + init_slot_, \ + done_slot_, \ + load_glyph_, \ + get_kerning_, \ + attach_file_, \ + get_advances_, \ + request_size_, \ + select_size_ ) \ + void \ + FT_Destroy_Class_ ## class_( FT_Library library, \ + FT_Module_Class* clazz ) \ + { \ + FT_Memory memory = library->memory; \ + FT_Driver_Class dclazz = (FT_Driver_Class)clazz; \ + \ + \ + class_ ## _pic_free( library ); \ + if ( dclazz ) \ + FT_FREE( dclazz ); \ + } \ + \ + \ + FT_Error \ + FT_Create_Class_ ## class_( FT_Library library, \ + FT_Module_Class** output_class ) \ + { \ + FT_Driver_Class clazz = NULL; \ + FT_Error error; \ + FT_Memory memory = library->memory; \ + \ + \ + if ( FT_ALLOC( clazz, sizeof ( *clazz ) ) ) \ + return error; \ + \ + error = class_ ## _pic_init( library ); \ + if ( error ) \ + { \ + FT_FREE( clazz ); \ + return error; \ + } \ + \ + FT_DEFINE_ROOT_MODULE( flags_, \ + size_, \ + name_, \ + version_, \ + requires_, \ + interface_, \ + init_, \ + done_, \ + get_interface_ ) \ + \ + clazz->face_object_size = face_object_size_; \ + clazz->size_object_size = size_object_size_; \ + clazz->slot_object_size = slot_object_size_; \ + \ + clazz->init_face = init_face_; \ + clazz->done_face = done_face_; \ + \ + clazz->init_size = init_size_; \ + clazz->done_size = done_size_; \ + \ + clazz->init_slot = init_slot_; \ + clazz->done_slot = done_slot_; \ + \ + clazz->load_glyph = load_glyph_; \ + \ + clazz->get_kerning = get_kerning_; \ + clazz->attach_file = attach_file_; \ + clazz->get_advances = get_advances_; \ + \ + clazz->request_size = request_size_; \ + clazz->select_size = select_size_; \ + \ + *output_class = (FT_Module_Class*)clazz; \ + \ + return FT_Err_Ok; \ } diff --git a/include/freetype/internal/ftgloadr.h b/include/internal/ftgloadr.h similarity index 88% rename from include/freetype/internal/ftgloadr.h rename to include/internal/ftgloadr.h index ce4dc6c..f70774f 100644 --- a/include/freetype/internal/ftgloadr.h +++ b/include/internal/ftgloadr.h @@ -121,20 +121,22 @@ FT_BEGIN_HEADER FT_UInt n_contours ); -#define FT_GLYPHLOADER_CHECK_P( _loader, _count ) \ - ( (_count) == 0 || ((_loader)->base.outline.n_points + \ - (_loader)->current.outline.n_points + \ - (unsigned long)(_count)) <= (_loader)->max_points ) - -#define FT_GLYPHLOADER_CHECK_C( _loader, _count ) \ - ( (_count) == 0 || ((_loader)->base.outline.n_contours + \ - (_loader)->current.outline.n_contours + \ - (unsigned long)(_count)) <= (_loader)->max_contours ) - -#define FT_GLYPHLOADER_CHECK_POINTS( _loader, _points,_contours ) \ - ( ( FT_GLYPHLOADER_CHECK_P( _loader, _points ) && \ - FT_GLYPHLOADER_CHECK_C( _loader, _contours ) ) \ - ? 0 \ +#define FT_GLYPHLOADER_CHECK_P( _loader, _count ) \ + ( (_count) == 0 || \ + ( (_loader)->base.outline.n_points + \ + (_loader)->current.outline.n_points + \ + (unsigned long)(_count) ) <= (_loader)->max_points ) + +#define FT_GLYPHLOADER_CHECK_C( _loader, _count ) \ + ( (_count) == 0 || \ + ( (_loader)->base.outline.n_contours + \ + (_loader)->current.outline.n_contours + \ + (unsigned long)(_count)) <= (_loader)->max_contours ) + +#define FT_GLYPHLOADER_CHECK_POINTS( _loader, _points, _contours ) \ + ( ( FT_GLYPHLOADER_CHECK_P( _loader, _points ) && \ + FT_GLYPHLOADER_CHECK_C( _loader, _contours ) ) \ + ? 0 \ : FT_GlyphLoader_CheckPoints( (_loader), (_points), (_contours) ) ) diff --git a/include/freetype/internal/ftmemory.h b/include/internal/ftmemory.h similarity index 71% rename from include/freetype/internal/ftmemory.h rename to include/internal/ftmemory.h index 026aa63..3d51aee 100644 --- a/include/freetype/internal/ftmemory.h +++ b/include/internal/ftmemory.h @@ -4,7 +4,7 @@ /* */ /* The FreeType memory management macros (specification). */ /* */ -/* Copyright 1996-2001, 2002, 2004, 2005, 2006, 2007, 2010 by */ +/* Copyright 1996-2002, 2004-2007, 2010, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -141,8 +141,10 @@ FT_BEGIN_HEADER const void* P ); -#define FT_MEM_ALLOC( ptr, size ) \ - FT_ASSIGNP_INNER( ptr, ft_mem_alloc( memory, (size), &error ) ) +#define FT_MEM_ALLOC( ptr, size ) \ + FT_ASSIGNP_INNER( ptr, ft_mem_alloc( memory, \ + (FT_Long)(size), \ + &error ) ) #define FT_MEM_FREE( ptr ) \ FT_BEGIN_STMNT \ @@ -154,45 +156,60 @@ FT_BEGIN_HEADER FT_MEM_ALLOC( ptr, sizeof ( *(ptr) ) ) #define FT_MEM_REALLOC( ptr, cursz, newsz ) \ - FT_ASSIGNP_INNER( ptr, ft_mem_realloc( memory, 1, \ - (cursz), (newsz), \ - (ptr), &error ) ) - -#define FT_MEM_QALLOC( ptr, size ) \ - FT_ASSIGNP_INNER( ptr, ft_mem_qalloc( memory, (size), &error ) ) + FT_ASSIGNP_INNER( ptr, ft_mem_realloc( memory, \ + 1, \ + (FT_Long)(cursz), \ + (FT_Long)(newsz), \ + (ptr), \ + &error ) ) + +#define FT_MEM_QALLOC( ptr, size ) \ + FT_ASSIGNP_INNER( ptr, ft_mem_qalloc( memory, \ + (FT_Long)(size), \ + &error ) ) #define FT_MEM_QNEW( ptr ) \ FT_MEM_QALLOC( ptr, sizeof ( *(ptr) ) ) -#define FT_MEM_QREALLOC( ptr, cursz, newsz ) \ - FT_ASSIGNP_INNER( ptr, ft_mem_qrealloc( memory, 1, \ - (cursz), (newsz), \ - (ptr), &error ) ) - -#define FT_MEM_QRENEW_ARRAY( ptr, cursz, newsz ) \ - FT_ASSIGNP_INNER( ptr, ft_mem_qrealloc( memory, sizeof ( *(ptr) ), \ - (cursz), (newsz), \ - (ptr), &error ) ) - -#define FT_MEM_ALLOC_MULT( ptr, count, item_size ) \ - FT_ASSIGNP_INNER( ptr, ft_mem_realloc( memory, (item_size), \ - 0, (count), \ - NULL, &error ) ) - -#define FT_MEM_REALLOC_MULT( ptr, oldcnt, newcnt, itmsz ) \ - FT_ASSIGNP_INNER( ptr, ft_mem_realloc( memory, (itmsz), \ - (oldcnt), (newcnt), \ - (ptr), &error ) ) - -#define FT_MEM_QALLOC_MULT( ptr, count, item_size ) \ - FT_ASSIGNP_INNER( ptr, ft_mem_qrealloc( memory, (item_size), \ - 0, (count), \ - NULL, &error ) ) - -#define FT_MEM_QREALLOC_MULT( ptr, oldcnt, newcnt, itmsz) \ - FT_ASSIGNP_INNER( ptr, ft_mem_qrealloc( memory, (itmsz), \ - (oldcnt), (newcnt), \ - (ptr), &error ) ) +#define FT_MEM_QREALLOC( ptr, cursz, newsz ) \ + FT_ASSIGNP_INNER( ptr, ft_mem_qrealloc( memory, \ + 1, \ + (FT_Long)(cursz), \ + (FT_Long)(newsz), \ + (ptr), \ + &error ) ) + +#define FT_MEM_ALLOC_MULT( ptr, count, item_size ) \ + FT_ASSIGNP_INNER( ptr, ft_mem_realloc( memory, \ + (FT_Long)(item_size), \ + 0, \ + (FT_Long)(count), \ + NULL, \ + &error ) ) + +#define FT_MEM_REALLOC_MULT( ptr, oldcnt, newcnt, itmsz ) \ + FT_ASSIGNP_INNER( ptr, ft_mem_realloc( memory, \ + (FT_Long)(itmsz), \ + (FT_Long)(oldcnt), \ + (FT_Long)(newcnt), \ + (ptr), \ + &error ) ) + +#define FT_MEM_QALLOC_MULT( ptr, count, item_size ) \ + FT_ASSIGNP_INNER( ptr, ft_mem_qrealloc( memory, \ + (FT_Long)(item_size), \ + 0, \ + (FT_Long)(count), \ + NULL, \ + &error ) ) + +#define FT_MEM_QREALLOC_MULT( ptr, oldcnt, newcnt, itmsz) \ + FT_ASSIGNP_INNER( ptr, ft_mem_qrealloc( memory, \ + (FT_Long)(itmsz), \ + (FT_Long)(oldcnt), \ + (FT_Long)(newcnt), \ + (ptr), \ + &error ) ) #define FT_MEM_SET_ERROR( cond ) ( (cond), error != 0 ) @@ -236,26 +253,37 @@ FT_BEGIN_HEADER /* _typed_ in order to automatically compute array element sizes. */ /* */ -#define FT_MEM_NEW_ARRAY( ptr, count ) \ - FT_ASSIGNP_INNER( ptr, ft_mem_realloc( memory, sizeof ( *(ptr) ), \ - 0, (count), \ - NULL, &error ) ) - -#define FT_MEM_RENEW_ARRAY( ptr, cursz, newsz ) \ - FT_ASSIGNP_INNER( ptr, ft_mem_realloc( memory, sizeof ( *(ptr) ), \ - (cursz), (newsz), \ - (ptr), &error ) ) - -#define FT_MEM_QNEW_ARRAY( ptr, count ) \ - FT_ASSIGNP_INNER( ptr, ft_mem_qrealloc( memory, sizeof ( *(ptr) ), \ - 0, (count), \ - NULL, &error ) ) - -#define FT_MEM_QRENEW_ARRAY( ptr, cursz, newsz ) \ - FT_ASSIGNP_INNER( ptr, ft_mem_qrealloc( memory, sizeof ( *(ptr) ), \ - (cursz), (newsz), \ - (ptr), &error ) ) - +#define FT_MEM_NEW_ARRAY( ptr, count ) \ + FT_ASSIGNP_INNER( ptr, ft_mem_realloc( memory, \ + sizeof ( *(ptr) ), \ + 0, \ + (FT_Long)(count), \ + NULL, \ + &error ) ) + +#define FT_MEM_RENEW_ARRAY( ptr, cursz, newsz ) \ + FT_ASSIGNP_INNER( ptr, ft_mem_realloc( memory, \ + sizeof ( *(ptr) ), \ + (FT_Long)(cursz), \ + (FT_Long)(newsz), \ + (ptr), \ + &error ) ) + +#define FT_MEM_QNEW_ARRAY( ptr, count ) \ + FT_ASSIGNP_INNER( ptr, ft_mem_qrealloc( memory, \ + sizeof ( *(ptr) ), \ + 0, \ + (FT_Long)(count), \ + NULL, \ + &error ) ) + +#define FT_MEM_QRENEW_ARRAY( ptr, cursz, newsz ) \ + FT_ASSIGNP_INNER( ptr, ft_mem_qrealloc( memory, \ + sizeof ( *(ptr) ), \ + (FT_Long)(cursz), \ + (FT_Long)(newsz), \ + (ptr), \ + &error ) ) #define FT_ALLOC( ptr, size ) \ FT_MEM_SET_ERROR( FT_MEM_ALLOC( ptr, size ) ) @@ -303,37 +331,6 @@ FT_BEGIN_HEADER FT_MEM_SET_ERROR( FT_MEM_RENEW_ARRAY( ptr, curcnt, newcnt ) ) -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS - - FT_BASE( FT_Error ) - FT_Alloc( FT_Memory memory, - FT_Long size, - void* *P ); - - FT_BASE( FT_Error ) - FT_QAlloc( FT_Memory memory, - FT_Long size, - void* *p ); - - FT_BASE( FT_Error ) - FT_Realloc( FT_Memory memory, - FT_Long current, - FT_Long size, - void* *P ); - - FT_BASE( FT_Error ) - FT_QRealloc( FT_Memory memory, - FT_Long current, - FT_Long size, - void* *p ); - - FT_BASE( void ) - FT_Free( FT_Memory memory, - void* *P ); - -#endif /* FT_CONFIG_OPTION_OLD_INTERNALS */ - - FT_BASE( FT_Pointer ) ft_mem_strdup( FT_Memory memory, const char* str, @@ -345,6 +342,7 @@ FT_BEGIN_HEADER FT_ULong size, FT_Error *p_error ); + #define FT_MEM_STRDUP( dst, str ) \ (dst) = (char*)ft_mem_strdup( memory, (const char*)(str), &error ) diff --git a/include/freetype/internal/ftobjs.h b/include/internal/ftobjs.h similarity index 72% rename from include/freetype/internal/ftobjs.h rename to include/internal/ftobjs.h index fc18275..b45a5ed 100644 --- a/include/freetype/internal/ftobjs.h +++ b/include/internal/ftobjs.h @@ -4,7 +4,7 @@ /* */ /* The FreeType private base classes (specification). */ /* */ -/* Copyright 1996-2006, 2008, 2010, 2012 by */ +/* Copyright 1996-2006, 2008, 2010, 2012-2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -72,6 +72,16 @@ FT_BEGIN_HEADER #define FT_ABS( a ) ( (a) < 0 ? -(a) : (a) ) + /* + * Approximate sqrt(x*x+y*y) using the `alpha max plus beta min' + * algorithm. We use alpha = 1, beta = 3/8, giving us results with a + * largest error less than 7% compared to the exact value. + */ +#define FT_HYPOT( x, y ) \ + ( x = FT_ABS( x ), \ + y = FT_ABS( y ), \ + x > y ? x + ( 3 * y >> 3 ) \ + : y + ( 3 * x >> 3 ) ) #define FT_PAD_FLOOR( x, n ) ( (x) & ~((n)-1) ) #define FT_PAD_ROUND( x, n ) FT_PAD_FLOOR( (x) + ((n)/2), n ) @@ -83,14 +93,6 @@ FT_BEGIN_HEADER /* - * Return the highest power of 2 that is <= value; this correspond to - * the highest bit in a given 32-bit value. - */ - FT_BASE( FT_UInt32 ) - ft_highpow2( FT_UInt32 value ); - - - /* * character classification functions -- since these are used to parse * font files, we must not use those in <ctypes.h> which are * locale-dependent @@ -206,46 +208,79 @@ FT_BEGIN_HEADER } FT_CMap_ClassRec; + #ifndef FT_CONFIG_OPTION_PIC -#define FT_DECLARE_CMAP_CLASS(class_) \ - FT_CALLBACK_TABLE const FT_CMap_ClassRec class_; - -#define FT_DEFINE_CMAP_CLASS(class_, size_, init_, done_, char_index_, \ - char_next_, char_var_index_, char_var_default_, variant_list_, \ - charvariant_list_, variantchar_list_) \ - FT_CALLBACK_TABLE_DEF \ - const FT_CMap_ClassRec class_ = \ - { \ - size_, init_, done_, char_index_, char_next_, char_var_index_, \ - char_var_default_, variant_list_, charvariant_list_, variantchar_list_ \ +#define FT_DECLARE_CMAP_CLASS( class_ ) \ + FT_CALLBACK_TABLE const FT_CMap_ClassRec class_; + +#define FT_DEFINE_CMAP_CLASS( \ + class_, \ + size_, \ + init_, \ + done_, \ + char_index_, \ + char_next_, \ + char_var_index_, \ + char_var_default_, \ + variant_list_, \ + charvariant_list_, \ + variantchar_list_ ) \ + FT_CALLBACK_TABLE_DEF \ + const FT_CMap_ClassRec class_ = \ + { \ + size_, \ + init_, \ + done_, \ + char_index_, \ + char_next_, \ + char_var_index_, \ + char_var_default_, \ + variant_list_, \ + charvariant_list_, \ + variantchar_list_ \ }; + #else /* FT_CONFIG_OPTION_PIC */ -#define FT_DECLARE_CMAP_CLASS(class_) \ - void FT_Init_Class_##class_( FT_Library library, FT_CMap_ClassRec* clazz); - -#define FT_DEFINE_CMAP_CLASS(class_, size_, init_, done_, char_index_, \ - char_next_, char_var_index_, char_var_default_, variant_list_, \ - charvariant_list_, variantchar_list_) \ - void \ - FT_Init_Class_##class_( FT_Library library, \ - FT_CMap_ClassRec* clazz) \ - { \ - FT_UNUSED(library); \ - clazz->size = size_; \ - clazz->init = init_; \ - clazz->done = done_; \ - clazz->char_index = char_index_; \ - clazz->char_next = char_next_; \ - clazz->char_var_index = char_var_index_; \ - clazz->char_var_default = char_var_default_; \ - clazz->variant_list = variant_list_; \ - clazz->charvariant_list = charvariant_list_; \ - clazz->variantchar_list = variantchar_list_; \ +#define FT_DECLARE_CMAP_CLASS( class_ ) \ + void \ + FT_Init_Class_ ## class_( FT_Library library, \ + FT_CMap_ClassRec* clazz ); + +#define FT_DEFINE_CMAP_CLASS( \ + class_, \ + size_, \ + init_, \ + done_, \ + char_index_, \ + char_next_, \ + char_var_index_, \ + char_var_default_, \ + variant_list_, \ + charvariant_list_, \ + variantchar_list_ ) \ + void \ + FT_Init_Class_ ## class_( FT_Library library, \ + FT_CMap_ClassRec* clazz ) \ + { \ + FT_UNUSED( library ); \ + \ + clazz->size = size_; \ + clazz->init = init_; \ + clazz->done = done_; \ + clazz->char_index = char_index_; \ + clazz->char_next = char_next_; \ + clazz->char_var_index = char_var_index_; \ + clazz->char_var_default = char_var_default_; \ + clazz->variant_list = variant_list_; \ + clazz->charvariant_list = charvariant_list_; \ + clazz->variantchar_list = variantchar_list_; \ } + #endif /* FT_CONFIG_OPTION_PIC */ + /* create a new charmap and add it to charmap->face */ FT_BASE( FT_Error ) FT_CMap_New( FT_CMap_Class clazz, @@ -270,13 +305,13 @@ FT_BEGIN_HEADER /* */ /* <Fields> */ /* max_points :: */ - /* The maximal number of points used to store the vectorial outline */ + /* The maximum number of points used to store the vectorial outline */ /* of any glyph in this face. If this value cannot be known in */ /* advance, or if the face isn't scalable, this should be set to 0. */ /* Only relevant for scalable formats. */ /* */ /* max_contours :: */ - /* The maximal number of contours used to store the vectorial */ + /* The maximum number of contours used to store the vectorial */ /* outline of any glyph in this face. If this value cannot be */ /* known in advance, or if the face isn't scalable, this should be */ /* set to 0. Only relevant for scalable formats. */ @@ -319,10 +354,6 @@ FT_BEGIN_HEADER /* */ typedef struct FT_Face_InternalRec_ { -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS - FT_UShort reserved1; - FT_Short reserved2; -#endif FT_Matrix transform_matrix; FT_Vector transform_delta; FT_Int transform_flags; @@ -334,7 +365,7 @@ FT_BEGIN_HEADER #endif FT_Bool ignore_unpatented_hinter; - FT_UInt refcount; + FT_Int refcount; } FT_Face_InternalRec; @@ -411,6 +442,7 @@ FT_BEGIN_HEADER /*************************************************************************/ /*************************************************************************/ + /*************************************************************************/ /**** ****/ /**** ****/ /**** M O D U L E S ****/ @@ -503,7 +535,7 @@ FT_BEGIN_HEADER ft_module_get_service( FT_Module module, const char* service_id ); - /* */ + /* */ /*************************************************************************/ @@ -511,7 +543,7 @@ FT_BEGIN_HEADER /*************************************************************************/ /**** ****/ /**** ****/ - /**** FACE, SIZE & GLYPH SLOT OBJECTS ****/ + /**** F A C E, S I Z E & G L Y P H S L O T O B J E C T S ****/ /**** ****/ /**** ****/ /*************************************************************************/ @@ -853,7 +885,7 @@ FT_BEGIN_HEADER FT_PIC_Container pic_container; #endif - FT_UInt refcount; + FT_Int refcount; } FT_LibraryRec; @@ -926,12 +958,13 @@ FT_BEGIN_HEADER FT_EXPORT_VAR( FT_Raster_Funcs ) ft_default_raster; #endif + /*************************************************************************/ /*************************************************************************/ /*************************************************************************/ /**** ****/ /**** ****/ - /**** PIC-Support Macros for ftimage.h ****/ + /**** P I C S U P P O R T ****/ /**** ****/ /**** ****/ /*************************************************************************/ @@ -939,6 +972,9 @@ FT_BEGIN_HEADER /*************************************************************************/ + /* PIC support macros for ftimage.h */ + + /*************************************************************************/ /* */ /* <Macro> */ @@ -947,38 +983,57 @@ FT_BEGIN_HEADER /* <Description> */ /* Used to initialize an instance of FT_Outline_Funcs struct. */ /* When FT_CONFIG_OPTION_PIC is defined an init funtion will need to */ - /* called with a pre-allocated stracture to be filled. */ + /* be called with a pre-allocated structure to be filled. */ /* When FT_CONFIG_OPTION_PIC is not defined the struct will be */ /* allocated in the global scope (or the scope where the macro */ /* is used). */ /* */ #ifndef FT_CONFIG_OPTION_PIC -#define FT_DEFINE_OUTLINE_FUNCS(class_, move_to_, line_to_, conic_to_, \ - cubic_to_, shift_, delta_) \ - static const FT_Outline_Funcs class_ = \ - { \ - move_to_, line_to_, conic_to_, cubic_to_, shift_, delta_ \ +#define FT_DEFINE_OUTLINE_FUNCS( \ + class_, \ + move_to_, \ + line_to_, \ + conic_to_, \ + cubic_to_, \ + shift_, \ + delta_ ) \ + static const FT_Outline_Funcs class_ = \ + { \ + move_to_, \ + line_to_, \ + conic_to_, \ + cubic_to_, \ + shift_, \ + delta_ \ }; #else /* FT_CONFIG_OPTION_PIC */ -#define FT_DEFINE_OUTLINE_FUNCS(class_, move_to_, line_to_, conic_to_, \ - cubic_to_, shift_, delta_) \ - static FT_Error \ - Init_Class_##class_( FT_Outline_Funcs* clazz ) \ - { \ - clazz->move_to = move_to_; \ - clazz->line_to = line_to_; \ - clazz->conic_to = conic_to_; \ - clazz->cubic_to = cubic_to_; \ - clazz->shift = shift_; \ - clazz->delta = delta_; \ - return FT_Err_Ok; \ +#define FT_DEFINE_OUTLINE_FUNCS( \ + class_, \ + move_to_, \ + line_to_, \ + conic_to_, \ + cubic_to_, \ + shift_, \ + delta_ ) \ + static FT_Error \ + Init_Class_ ## class_( FT_Outline_Funcs* clazz ) \ + { \ + clazz->move_to = move_to_; \ + clazz->line_to = line_to_; \ + clazz->conic_to = conic_to_; \ + clazz->cubic_to = cubic_to_; \ + clazz->shift = shift_; \ + clazz->delta = delta_; \ + \ + return FT_Err_Ok; \ } #endif /* FT_CONFIG_OPTION_PIC */ + /*************************************************************************/ /* */ /* <Macro> */ @@ -987,51 +1042,56 @@ FT_BEGIN_HEADER /* <Description> */ /* Used to initialize an instance of FT_Raster_Funcs struct. */ /* When FT_CONFIG_OPTION_PIC is defined an init funtion will need to */ - /* called with a pre-allocated stracture to be filled. */ + /* be called with a pre-allocated structure to be filled. */ /* When FT_CONFIG_OPTION_PIC is not defined the struct will be */ /* allocated in the global scope (or the scope where the macro */ /* is used). */ /* */ #ifndef FT_CONFIG_OPTION_PIC -#define FT_DEFINE_RASTER_FUNCS(class_, glyph_format_, raster_new_, \ - raster_reset_, raster_set_mode_, \ - raster_render_, raster_done_) \ - const FT_Raster_Funcs class_ = \ - { \ - glyph_format_, raster_new_, raster_reset_, \ - raster_set_mode_, raster_render_, raster_done_ \ +#define FT_DEFINE_RASTER_FUNCS( \ + class_, \ + glyph_format_, \ + raster_new_, \ + raster_reset_, \ + raster_set_mode_, \ + raster_render_, \ + raster_done_ ) \ + const FT_Raster_Funcs class_ = \ + { \ + glyph_format_, \ + raster_new_, \ + raster_reset_, \ + raster_set_mode_, \ + raster_render_, \ + raster_done_ \ }; #else /* FT_CONFIG_OPTION_PIC */ -#define FT_DEFINE_RASTER_FUNCS(class_, glyph_format_, raster_new_, \ - raster_reset_, raster_set_mode_, raster_render_, raster_done_) \ - void \ - FT_Init_Class_##class_( FT_Raster_Funcs* clazz ) \ - { \ - clazz->glyph_format = glyph_format_; \ - clazz->raster_new = raster_new_; \ - clazz->raster_reset = raster_reset_; \ - clazz->raster_set_mode = raster_set_mode_; \ - clazz->raster_render = raster_render_; \ - clazz->raster_done = raster_done_; \ +#define FT_DEFINE_RASTER_FUNCS( \ + class_, \ + glyph_format_, \ + raster_new_, \ + raster_reset_, \ + raster_set_mode_, \ + raster_render_, \ + raster_done_ ) \ + void \ + FT_Init_Class_ ## class_( FT_Raster_Funcs* clazz ) \ + { \ + clazz->glyph_format = glyph_format_; \ + clazz->raster_new = raster_new_; \ + clazz->raster_reset = raster_reset_; \ + clazz->raster_set_mode = raster_set_mode_; \ + clazz->raster_render = raster_render_; \ + clazz->raster_done = raster_done_; \ } #endif /* FT_CONFIG_OPTION_PIC */ - /*************************************************************************/ - /*************************************************************************/ - /*************************************************************************/ - /**** ****/ - /**** ****/ - /**** PIC-Support Macros for ftrender.h ****/ - /**** ****/ - /**** ****/ - /*************************************************************************/ - /*************************************************************************/ - /*************************************************************************/ + /* PIC support macros for ftrender.h */ /*************************************************************************/ @@ -1042,40 +1102,64 @@ FT_BEGIN_HEADER /* <Description> */ /* Used to initialize an instance of FT_Glyph_Class struct. */ /* When FT_CONFIG_OPTION_PIC is defined an init funtion will need to */ - /* called with a pre-allocated stracture to be filled. */ + /* be called with a pre-allocated stcture to be filled. */ /* When FT_CONFIG_OPTION_PIC is not defined the struct will be */ /* allocated in the global scope (or the scope where the macro */ /* is used). */ /* */ #ifndef FT_CONFIG_OPTION_PIC -#define FT_DEFINE_GLYPH(class_, size_, format_, init_, done_, copy_, \ - transform_, bbox_, prepare_) \ - FT_CALLBACK_TABLE_DEF \ - const FT_Glyph_Class class_ = \ - { \ - size_, format_, init_, done_, copy_, transform_, bbox_, prepare_ \ +#define FT_DEFINE_GLYPH( \ + class_, \ + size_, \ + format_, \ + init_, \ + done_, \ + copy_, \ + transform_, \ + bbox_, \ + prepare_ ) \ + FT_CALLBACK_TABLE_DEF \ + const FT_Glyph_Class class_ = \ + { \ + size_, \ + format_, \ + init_, \ + done_, \ + copy_, \ + transform_, \ + bbox_, \ + prepare_ \ }; #else /* FT_CONFIG_OPTION_PIC */ -#define FT_DEFINE_GLYPH(class_, size_, format_, init_, done_, copy_, \ - transform_, bbox_, prepare_) \ - void \ - FT_Init_Class_##class_( FT_Glyph_Class* clazz ) \ - { \ - clazz->glyph_size = size_; \ - clazz->glyph_format = format_; \ - clazz->glyph_init = init_; \ - clazz->glyph_done = done_; \ - clazz->glyph_copy = copy_; \ - clazz->glyph_transform = transform_; \ - clazz->glyph_bbox = bbox_; \ - clazz->glyph_prepare = prepare_; \ +#define FT_DEFINE_GLYPH( \ + class_, \ + size_, \ + format_, \ + init_, \ + done_, \ + copy_, \ + transform_, \ + bbox_, \ + prepare_ ) \ + void \ + FT_Init_Class_ ## class_( FT_Glyph_Class* clazz ) \ + { \ + clazz->glyph_size = size_; \ + clazz->glyph_format = format_; \ + clazz->glyph_init = init_; \ + clazz->glyph_done = done_; \ + clazz->glyph_copy = copy_; \ + clazz->glyph_transform = transform_; \ + clazz->glyph_bbox = bbox_; \ + clazz->glyph_prepare = prepare_; \ } #endif /* FT_CONFIG_OPTION_PIC */ + /*************************************************************************/ /* */ /* <Macro> */ @@ -1083,7 +1167,7 @@ FT_BEGIN_HEADER /* */ /* <Description> */ /* Used to create a forward declaration of a */ - /* FT_Renderer_Class stract instance. */ + /* FT_Renderer_Class struct instance. */ /* */ /* <Macro> */ /* FT_DEFINE_RENDERER */ @@ -1091,22 +1175,23 @@ FT_BEGIN_HEADER /* <Description> */ /* Used to initialize an instance of FT_Renderer_Class struct. */ /* */ - /* When FT_CONFIG_OPTION_PIC is defined a Create funtion will need */ - /* to called with a pointer where the allocated stracture is returned.*/ - /* And when it is no longer needed a Destroy function needs */ - /* to be called to release that allocation. */ - /* fcinit.c (ft_create_default_module_classes) already contains */ + /* When FT_CONFIG_OPTION_PIC is defined a `create' funtion will need */ + /* to be called with a pointer where the allocated structure is */ + /* returned. And when it is no longer needed a `destroy' function */ + /* needs to be called to release that allocation. */ + /* `fcinit.c' (ft_create_default_module_classes) already contains */ /* a mechanism to call these functions for the default modules */ - /* described in ftmodule.h */ + /* described in `ftmodule.h'. */ /* */ - /* Notice that the created Create and Destroy functions call */ - /* pic_init and pic_free function to allow you to manually allocate */ - /* and initialize any additional global data, like module specific */ + /* Notice that the created `create' and `destroy' functions call */ + /* `pic_init' and `pic_free' to allow you to manually allocate and */ + /* initialize any additional global data, like a module specific */ /* interface, and put them in the global pic container defined in */ - /* ftpic.h. if you don't need them just implement the functions as */ - /* empty to resolve the link error. Also the pic_init and pic_free */ - /* functions should be declared in pic.h, to be referred by renderer */ - /* definition calling FT_DEFINE_RENDERER() in following. */ + /* `ftpic.h'. If you don't need them just implement the functions as */ + /* empty to resolve the link error. Also the `pic_init' and */ + /* `pic_free' functions should be declared in `pic.h', to be referred */ + /* by the renderer definition calling `FT_DEFINE_RENDERER' in the */ + /* following. */ /* */ /* When FT_CONFIG_OPTION_PIC is not defined the struct will be */ /* allocated in the global scope (or the scope where the macro */ @@ -1114,99 +1199,130 @@ FT_BEGIN_HEADER /* */ #ifndef FT_CONFIG_OPTION_PIC -#define FT_DECLARE_RENDERER(class_) \ - FT_EXPORT_VAR( const FT_Renderer_Class ) class_; - -#define FT_DEFINE_RENDERER(class_, \ - flags_, size_, name_, version_, requires_, \ - interface_, init_, done_, get_interface_, \ - glyph_format_, render_glyph_, transform_glyph_, \ - get_glyph_cbox_, set_mode_, raster_class_ ) \ - FT_CALLBACK_TABLE_DEF \ - const FT_Renderer_Class class_ = \ - { \ - FT_DEFINE_ROOT_MODULE(flags_,size_,name_,version_,requires_, \ - interface_,init_,done_,get_interface_) \ - glyph_format_, \ - \ - render_glyph_, \ - transform_glyph_, \ - get_glyph_cbox_, \ - set_mode_, \ - \ - raster_class_ \ +#define FT_DECLARE_RENDERER( class_ ) \ + FT_EXPORT_VAR( const FT_Renderer_Class ) class_; + +#define FT_DEFINE_RENDERER( \ + class_, \ + flags_, \ + size_, \ + name_, \ + version_, \ + requires_, \ + interface_, \ + init_, \ + done_, \ + get_interface_, \ + glyph_format_, \ + render_glyph_, \ + transform_glyph_, \ + get_glyph_cbox_, \ + set_mode_, \ + raster_class_ ) \ + FT_CALLBACK_TABLE_DEF \ + const FT_Renderer_Class class_ = \ + { \ + FT_DEFINE_ROOT_MODULE( flags_, \ + size_, \ + name_, \ + version_, \ + requires_, \ + interface_, \ + init_, \ + done_, \ + get_interface_ ) \ + glyph_format_, \ + \ + render_glyph_, \ + transform_glyph_, \ + get_glyph_cbox_, \ + set_mode_, \ + \ + raster_class_ \ }; #else /* FT_CONFIG_OPTION_PIC */ -#define FT_DECLARE_RENDERER(class_) FT_DECLARE_MODULE(class_) - -#define FT_DEFINE_RENDERER(class_, \ - flags_, size_, name_, version_, requires_, \ - interface_, init_, done_, get_interface_, \ - glyph_format_, render_glyph_, transform_glyph_, \ - get_glyph_cbox_, set_mode_, raster_class_ ) \ - \ - void \ - FT_Destroy_Class_##class_( FT_Library library, \ - FT_Module_Class* clazz ) \ - { \ - FT_Renderer_Class* rclazz = (FT_Renderer_Class*)clazz; \ - FT_Memory memory = library->memory; \ - class_##_pic_free( library ); \ - if ( rclazz ) \ - FT_FREE( rclazz ); \ - } \ - \ - FT_Error \ - FT_Create_Class_##class_( FT_Library library, \ - FT_Module_Class** output_class ) \ - { \ - FT_Renderer_Class* clazz; \ - FT_Error error; \ - FT_Memory memory = library->memory; \ - \ - if ( FT_ALLOC( clazz, sizeof(*clazz) ) ) \ - return error; \ - \ - error = class_##_pic_init( library ); \ - if(error) \ - { \ - FT_FREE( clazz ); \ - return error; \ - } \ - \ - FT_DEFINE_ROOT_MODULE(flags_,size_,name_,version_,requires_, \ - interface_,init_,done_,get_interface_) \ - \ - clazz->glyph_format = glyph_format_; \ - \ - clazz->render_glyph = render_glyph_; \ - clazz->transform_glyph = transform_glyph_; \ - clazz->get_glyph_cbox = get_glyph_cbox_; \ - clazz->set_mode = set_mode_; \ - \ - clazz->raster_class = raster_class_; \ - \ - *output_class = (FT_Module_Class*)clazz; \ - return FT_Err_Ok; \ +#define FT_DECLARE_RENDERER( class_ ) FT_DECLARE_MODULE( class_ ) + +#define FT_DEFINE_RENDERER( \ + class_, \ + flags_, \ + size_, \ + name_, \ + version_, \ + requires_, \ + interface_, \ + init_, \ + done_, \ + get_interface_, \ + glyph_format_, \ + render_glyph_, \ + transform_glyph_, \ + get_glyph_cbox_, \ + set_mode_, \ + raster_class_ ) \ + void \ + FT_Destroy_Class_ ## class_( FT_Library library, \ + FT_Module_Class* clazz ) \ + { \ + FT_Renderer_Class* rclazz = (FT_Renderer_Class*)clazz; \ + FT_Memory memory = library->memory; \ + \ + \ + class_ ## _pic_free( library ); \ + if ( rclazz ) \ + FT_FREE( rclazz ); \ + } \ + \ + \ + FT_Error \ + FT_Create_Class_ ## class_( FT_Library library, \ + FT_Module_Class** output_class ) \ + { \ + FT_Renderer_Class* clazz = NULL; \ + FT_Error error; \ + FT_Memory memory = library->memory; \ + \ + \ + if ( FT_ALLOC( clazz, sizeof ( *clazz ) ) ) \ + return error; \ + \ + error = class_ ## _pic_init( library ); \ + if ( error ) \ + { \ + FT_FREE( clazz ); \ + return error; \ + } \ + \ + FT_DEFINE_ROOT_MODULE( flags_, \ + size_, \ + name_, \ + version_, \ + requires_, \ + interface_, \ + init_, \ + done_, \ + get_interface_ ) \ + \ + clazz->glyph_format = glyph_format_; \ + \ + clazz->render_glyph = render_glyph_; \ + clazz->transform_glyph = transform_glyph_; \ + clazz->get_glyph_cbox = get_glyph_cbox_; \ + clazz->set_mode = set_mode_; \ + \ + clazz->raster_class = raster_class_; \ + \ + *output_class = (FT_Module_Class*)clazz; \ + \ + return FT_Err_Ok; \ } - - #endif /* FT_CONFIG_OPTION_PIC */ - /*************************************************************************/ - /*************************************************************************/ - /*************************************************************************/ - /**** ****/ - /**** ****/ - /**** PIC-Support Macros for ftmodapi.h ****/ - /**** ****/ - /**** ****/ - /*************************************************************************/ - /*************************************************************************/ - /*************************************************************************/ + + /* PIC support macros for ftmodapi.h **/ #ifdef FT_CONFIG_OPTION_PIC @@ -1247,6 +1363,7 @@ FT_BEGIN_HEADER #endif + /*************************************************************************/ /* */ /* <Macro> */ @@ -1254,30 +1371,31 @@ FT_BEGIN_HEADER /* */ /* <Description> */ /* Used to create a forward declaration of a */ - /* FT_Module_Class stract instance. */ + /* FT_Module_Class struct instance. */ /* */ /* <Macro> */ /* FT_DEFINE_MODULE */ /* */ /* <Description> */ - /* Used to initialize an instance of FT_Module_Class struct. */ + /* Used to initialize an instance of an FT_Module_Class struct. */ /* */ - /* When FT_CONFIG_OPTION_PIC is defined a Create funtion will need */ - /* to called with a pointer where the allocated stracture is returned.*/ - /* And when it is no longer needed a Destroy function needs */ - /* to be called to release that allocation. */ - /* fcinit.c (ft_create_default_module_classes) already contains */ + /* When FT_CONFIG_OPTION_PIC is defined a `create' funtion needs to */ + /* be called with a pointer where the allocated structure is */ + /* returned. And when it is no longer needed a `destroy' function */ + /* needs to be called to release that allocation. */ + /* `fcinit.c' (ft_create_default_module_classes) already contains */ /* a mechanism to call these functions for the default modules */ - /* described in ftmodule.h */ + /* described in `ftmodule.h'. */ /* */ - /* Notice that the created Create and Destroy functions call */ - /* pic_init and pic_free function to allow you to manually allocate */ - /* and initialize any additional global data, like module specific */ + /* Notice that the created `create' and `destroy' functions call */ + /* `pic_init' and `pic_free' to allow you to manually allocate and */ + /* initialize any additional global data, like a module specific */ /* interface, and put them in the global pic container defined in */ - /* ftpic.h. if you don't need them just implement the functions as */ - /* empty to resolve the link error. Also the pic_init and pic_free */ - /* functions should be declared in pic.h, to be referred by module */ - /* definition calling FT_DEFINE_MODULE() in following. */ + /* `ftpic.h'. If you don't need them just implement the functions as */ + /* empty to resolve the link error. Also the `pic_init' and */ + /* `pic_free' functions should be declared in `pic.h', to be referred */ + /* by the module definition calling `FT_DEFINE_MODULE' in the */ + /* following. */ /* */ /* When FT_CONFIG_OPTION_PIC is not defined the struct will be */ /* allocated in the global scope (or the scope where the macro */ @@ -1287,119 +1405,159 @@ FT_BEGIN_HEADER /* FT_DEFINE_ROOT_MODULE */ /* */ /* <Description> */ - /* Used to initialize an instance of FT_Module_Class struct inside */ - /* another stract that contains it or in a function that initializes */ - /* that containing stract */ + /* Used to initialize an instance of an FT_Module_Class struct inside */ + /* another struct that contains it or in a function that initializes */ + /* that containing struct. */ /* */ #ifndef FT_CONFIG_OPTION_PIC -#define FT_DECLARE_MODULE(class_) \ - FT_CALLBACK_TABLE \ - const FT_Module_Class class_; \ - -#define FT_DEFINE_ROOT_MODULE(flags_, size_, name_, version_, requires_, \ - interface_, init_, done_, get_interface_) \ - { \ - flags_, \ - size_, \ - \ - name_, \ - version_, \ - requires_, \ - \ - interface_, \ - \ - init_, \ - done_, \ - get_interface_, \ +#define FT_DECLARE_MODULE( class_ ) \ + FT_CALLBACK_TABLE \ + const FT_Module_Class class_; + +#define FT_DEFINE_ROOT_MODULE( \ + flags_, \ + size_, \ + name_, \ + version_, \ + requires_, \ + interface_, \ + init_, \ + done_, \ + get_interface_ ) \ + { \ + flags_, \ + size_, \ + \ + name_, \ + version_, \ + requires_, \ + \ + interface_, \ + \ + init_, \ + done_, \ + get_interface_, \ }, -#define FT_DEFINE_MODULE(class_, flags_, size_, name_, version_, requires_, \ - interface_, init_, done_, get_interface_) \ - FT_CALLBACK_TABLE_DEF \ - const FT_Module_Class class_ = \ - { \ - flags_, \ - size_, \ - \ - name_, \ - version_, \ - requires_, \ - \ - interface_, \ - \ - init_, \ - done_, \ - get_interface_, \ +#define FT_DEFINE_MODULE( \ + class_, \ + flags_, \ + size_, \ + name_, \ + version_, \ + requires_, \ + interface_, \ + init_, \ + done_, \ + get_interface_ ) \ + FT_CALLBACK_TABLE_DEF \ + const FT_Module_Class class_ = \ + { \ + flags_, \ + size_, \ + \ + name_, \ + version_, \ + requires_, \ + \ + interface_, \ + \ + init_, \ + done_, \ + get_interface_, \ }; #else /* FT_CONFIG_OPTION_PIC */ -#define FT_DECLARE_MODULE(class_) \ - FT_Error FT_Create_Class_##class_( FT_Library library, \ - FT_Module_Class** output_class ); \ - void FT_Destroy_Class_##class_( FT_Library library, \ - FT_Module_Class* clazz ); - -#define FT_DEFINE_ROOT_MODULE(flags_, size_, name_, version_, requires_, \ - interface_, init_, done_, get_interface_) \ - clazz->root.module_flags = flags_; \ - clazz->root.module_size = size_; \ - clazz->root.module_name = name_; \ - clazz->root.module_version = version_; \ - clazz->root.module_requires = requires_; \ - \ - clazz->root.module_interface = interface_; \ - \ - clazz->root.module_init = init_; \ - clazz->root.module_done = done_; \ - clazz->root.get_interface = get_interface_; - -#define FT_DEFINE_MODULE(class_, flags_, size_, name_, version_, requires_, \ - interface_, init_, done_, get_interface_) \ - \ - void \ - FT_Destroy_Class_##class_( FT_Library library, \ - FT_Module_Class* clazz ) \ - { \ - FT_Memory memory = library->memory; \ - class_##_pic_free( library ); \ - if ( clazz ) \ - FT_FREE( clazz ); \ - } \ - \ - FT_Error \ - FT_Create_Class_##class_( FT_Library library, \ - FT_Module_Class** output_class ) \ - { \ - FT_Memory memory = library->memory; \ - FT_Module_Class* clazz; \ - FT_Error error; \ - \ - if ( FT_ALLOC( clazz, sizeof(*clazz) ) ) \ - return error; \ - error = class_##_pic_init( library ); \ - if(error) \ - { \ - FT_FREE( clazz ); \ - return error; \ - } \ - \ - clazz->module_flags = flags_; \ - clazz->module_size = size_; \ - clazz->module_name = name_; \ - clazz->module_version = version_; \ - clazz->module_requires = requires_; \ - \ - clazz->module_interface = interface_; \ - \ - clazz->module_init = init_; \ - clazz->module_done = done_; \ - clazz->get_interface = get_interface_; \ - \ - *output_class = clazz; \ - return FT_Err_Ok; \ +#define FT_DECLARE_MODULE( class_ ) \ + FT_Error \ + FT_Create_Class_ ## class_( FT_Library library, \ + FT_Module_Class** output_class ); \ + void \ + FT_Destroy_Class_ ## class_( FT_Library library, \ + FT_Module_Class* clazz ); + +#define FT_DEFINE_ROOT_MODULE( \ + flags_, \ + size_, \ + name_, \ + version_, \ + requires_, \ + interface_, \ + init_, \ + done_, \ + get_interface_ ) \ + clazz->root.module_flags = flags_; \ + clazz->root.module_size = size_; \ + clazz->root.module_name = name_; \ + clazz->root.module_version = version_; \ + clazz->root.module_requires = requires_; \ + \ + clazz->root.module_interface = interface_; \ + \ + clazz->root.module_init = init_; \ + clazz->root.module_done = done_; \ + clazz->root.get_interface = get_interface_; + +#define FT_DEFINE_MODULE( \ + class_, \ + flags_, \ + size_, \ + name_, \ + version_, \ + requires_, \ + interface_, \ + init_, \ + done_, \ + get_interface_ ) \ + void \ + FT_Destroy_Class_ ## class_( FT_Library library, \ + FT_Module_Class* clazz ) \ + { \ + FT_Memory memory = library->memory; \ + \ + \ + class_ ## _pic_free( library ); \ + if ( clazz ) \ + FT_FREE( clazz ); \ + } \ + \ + \ + FT_Error \ + FT_Create_Class_ ## class_( FT_Library library, \ + FT_Module_Class** output_class ) \ + { \ + FT_Memory memory = library->memory; \ + FT_Module_Class* clazz = NULL; \ + FT_Error error; \ + \ + \ + if ( FT_ALLOC( clazz, sizeof ( *clazz ) ) ) \ + return error; \ + error = class_ ## _pic_init( library ); \ + if ( error ) \ + { \ + FT_FREE( clazz ); \ + return error; \ + } \ + \ + clazz->module_flags = flags_; \ + clazz->module_size = size_; \ + clazz->module_name = name_; \ + clazz->module_version = version_; \ + clazz->module_requires = requires_; \ + \ + clazz->module_interface = interface_; \ + \ + clazz->module_init = init_; \ + clazz->module_done = done_; \ + clazz->get_interface = get_interface_; \ + \ + *output_class = clazz; \ + \ + return FT_Err_Ok; \ } #endif /* FT_CONFIG_OPTION_PIC */ diff --git a/include/freetype/internal/ftpic.h b/include/internal/ftpic.h similarity index 80% rename from include/freetype/internal/ftpic.h rename to include/internal/ftpic.h index 5b674e6..485ce7a 100644 --- a/include/freetype/internal/ftpic.h +++ b/include/internal/ftpic.h @@ -4,7 +4,7 @@ /* */ /* The FreeType position independent code services (declaration). */ /* */ -/* Copyright 2009 by */ +/* Copyright 2009, 2012 by */ /* Oran Agra and Mickey Gabel. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -31,29 +31,33 @@ FT_BEGIN_HEADER #ifdef FT_CONFIG_OPTION_PIC - typedef struct FT_PIC_Container_ + typedef struct FT_PIC_Container_ { /* pic containers for base */ - void* base; + void* base; + /* pic containers for modules */ - void* autofit; - void* cff; - void* pshinter; - void* psnames; - void* raster; - void* sfnt; - void* smooth; - void* truetype; + void* autofit; + void* cff; + void* pshinter; + void* psnames; + void* raster; + void* sfnt; + void* smooth; + void* truetype; + } FT_PIC_Container; - /* Initialize the various function tables, structs, etc. stored in the container. */ + + /* Initialize the various function tables, structs, etc. */ + /* stored in the container. */ FT_BASE( FT_Error ) - ft_pic_container_init( FT_Library library ); + ft_pic_container_init( FT_Library library ); /* Destroy the contents of the container. */ FT_BASE( void ) - ft_pic_container_destroy( FT_Library library ); + ft_pic_container_destroy( FT_Library library ); #endif /* FT_CONFIG_OPTION_PIC */ diff --git a/include/freetype/internal/ftrfork.h b/include/internal/ftrfork.h similarity index 89% rename from include/freetype/internal/ftrfork.h rename to include/internal/ftrfork.h index 77e1020..d750cbe 100644 --- a/include/freetype/internal/ftrfork.h +++ b/include/internal/ftrfork.h @@ -4,7 +4,7 @@ /* */ /* Embedded resource forks accessor (specification). */ /* */ -/* Copyright 2004, 2006, 2007 by */ +/* Copyright 2004, 2006, 2007, 2012, 2013 by */ /* Masatake YAMATO and Redhat K.K. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -80,26 +80,37 @@ FT_BEGIN_HEADER } ft_raccess_guess_rec; #ifndef FT_CONFIG_OPTION_PIC + /* this array is a storage in non-PIC mode, so ; is needed in END */ -#define CONST_FT_RFORK_RULE_ARRAY_BEGIN( name, type ) \ - const type name[] = { -#define CONST_FT_RFORK_RULE_ARRAY_ENTRY( func_suffix, type_suffix ) \ - { raccess_guess_##func_suffix, FT_RFork_Rule_##type_suffix }, -#define CONST_FT_RFORK_RULE_ARRAY_END }; +#define CONST_FT_RFORK_RULE_ARRAY_BEGIN( name, type ) \ + const type name[] = { +#define CONST_FT_RFORK_RULE_ARRAY_ENTRY( func_suffix, type_suffix ) \ + { raccess_guess_ ## func_suffix, \ + FT_RFork_Rule_ ## type_suffix }, +#define CONST_FT_RFORK_RULE_ARRAY_END }; + #else /* FT_CONFIG_OPTION_PIC */ + /* this array is a function in PIC mode, so no ; is needed in END */ -#define CONST_FT_RFORK_RULE_ARRAY_BEGIN( name, type ) \ - void FT_Init_##name ( type* storage ) { \ - type *local = storage; \ - int i = 0; -#define CONST_FT_RFORK_RULE_ARRAY_ENTRY( func_suffix, type_suffix ) \ - local[i].func = raccess_guess_##func_suffix; \ - local[i].type = FT_RFork_Rule_##type_suffix; \ - i++; -#define CONST_FT_RFORK_RULE_ARRAY_END } +#define CONST_FT_RFORK_RULE_ARRAY_BEGIN( name, type ) \ + void \ + FT_Init_Table_ ## name( type* storage ) \ + { \ + type* local = storage; \ + \ + \ + int i = 0; +#define CONST_FT_RFORK_RULE_ARRAY_ENTRY( func_suffix, type_suffix ) \ + local[i].func = raccess_guess_ ## func_suffix; \ + local[i].type = FT_RFork_Rule_ ## type_suffix; \ + i++; +#define CONST_FT_RFORK_RULE_ARRAY_END } + #endif /* FT_CONFIG_OPTION_PIC */ + #endif /* FT_CONFIG_OPTION_GUESSING_EMBEDDED_RFORK */ + /*************************************************************************/ /* */ /* <Function> */ @@ -213,6 +224,13 @@ FT_BEGIN_HEADER /* tag :: */ /* The resource tag. */ /* */ + /* sort_by_res_id :: */ + /* A Boolean to sort the fragmented resource by their ids. */ + /* The fragmented resources for `POST' resource should be sorted */ + /* to restore Type1 font properly. For `snft' resources, sorting */ + /* may induce a different order of the faces in comparison to that */ + /* by QuickDraw API. */ + /* */ /* <Output> */ /* offsets :: */ /* The stream offsets for the resource data specified by `tag'. */ @@ -235,6 +253,7 @@ FT_BEGIN_HEADER FT_Long map_offset, FT_Long rdata_pos, FT_Long tag, + FT_Bool sort_by_res_id, FT_Long **offsets, FT_Long *count ); diff --git a/include/freetype/internal/ftserv.h b/include/internal/ftserv.h similarity index 82% rename from include/freetype/internal/ftserv.h rename to include/internal/ftserv.h index 4f481db..1203ec8 100644 --- a/include/freetype/internal/ftserv.h +++ b/include/internal/ftserv.h @@ -4,7 +4,7 @@ /* */ /* The FreeType services (specification only). */ /* */ -/* Copyright 2003-2007, 2009, 2012 by */ +/* Copyright 2003-2007, 2009, 2012, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -34,14 +34,6 @@ FT_BEGIN_HEADER -#if defined( _MSC_VER ) /* Visual C++ (and Intel C++) */ - - /* we disable the warning `conditional expression is constant' here */ - /* in order to compile cleanly with the maximum level of warnings */ -#pragma warning( disable : 4127 ) - -#endif /* _MSC_VER */ - /* * @macro: * FT_FACE_FIND_SERVICE @@ -92,6 +84,7 @@ FT_BEGIN_HEADER #endif /* !C++ */ + /* * @macro: * FT_FACE_FIND_GLOBAL_SERVICE @@ -167,7 +160,13 @@ FT_BEGIN_HEADER /*************************************************************************/ /* */ /* <Macro> */ - /* FT_DEFINE_SERVICEDESCREC1 .. FT_DEFINE_SERVICEDESCREC6 */ + /* FT_DEFINE_SERVICEDESCREC1 */ + /* FT_DEFINE_SERVICEDESCREC2 */ + /* FT_DEFINE_SERVICEDESCREC3 */ + /* FT_DEFINE_SERVICEDESCREC4 */ + /* FT_DEFINE_SERVICEDESCREC5 */ + /* FT_DEFINE_SERVICEDESCREC6 */ + /* FT_DEFINE_SERVICEDESCREC7 */ /* */ /* <Description> */ /* Used to initialize an array of FT_ServiceDescRec structures. */ @@ -264,6 +263,26 @@ FT_BEGIN_HEADER { NULL, NULL } \ }; +#define FT_DEFINE_SERVICEDESCREC7( class_, \ + serv_id_1, serv_data_1, \ + serv_id_2, serv_data_2, \ + serv_id_3, serv_data_3, \ + serv_id_4, serv_data_4, \ + serv_id_5, serv_data_5, \ + serv_id_6, serv_data_6, \ + serv_id_7, serv_data_7 ) \ + static const FT_ServiceDescRec class_[] = \ + { \ + { serv_id_1, serv_data_1 }, \ + { serv_id_2, serv_data_2 }, \ + { serv_id_3, serv_data_3 }, \ + { serv_id_4, serv_data_4 }, \ + { serv_id_5, serv_data_5 }, \ + { serv_id_6, serv_data_6 }, \ + { serv_id_7, serv_data_7 }, \ + { NULL, NULL } \ + }; + #else /* FT_CONFIG_OPTION_PIC */ #define FT_DEFINE_SERVICEDESCREC1( class_, \ @@ -283,7 +302,7 @@ FT_BEGIN_HEADER FT_Create_Class_ ## class_( FT_Library library, \ FT_ServiceDescRec** output_class ) \ { \ - FT_ServiceDescRec* clazz; \ + FT_ServiceDescRec* clazz = NULL; \ FT_Error error; \ FT_Memory memory = library->memory; \ \ @@ -319,7 +338,7 @@ FT_BEGIN_HEADER FT_Create_Class_ ## class_( FT_Library library, \ FT_ServiceDescRec** output_class ) \ { \ - FT_ServiceDescRec* clazz; \ + FT_ServiceDescRec* clazz = NULL; \ FT_Error error; \ FT_Memory memory = library->memory; \ \ @@ -358,7 +377,7 @@ FT_BEGIN_HEADER FT_Create_Class_ ## class_( FT_Library library, \ FT_ServiceDescRec** output_class ) \ { \ - FT_ServiceDescRec* clazz; \ + FT_ServiceDescRec* clazz = NULL; \ FT_Error error; \ FT_Memory memory = library->memory; \ \ @@ -400,7 +419,7 @@ FT_BEGIN_HEADER FT_Create_Class_ ## class_( FT_Library library, \ FT_ServiceDescRec** output_class ) \ { \ - FT_ServiceDescRec* clazz; \ + FT_ServiceDescRec* clazz = NULL; \ FT_Error error; \ FT_Memory memory = library->memory; \ \ @@ -445,7 +464,7 @@ FT_BEGIN_HEADER FT_Create_Class_ ## class_( FT_Library library, \ FT_ServiceDescRec** output_class ) \ { \ - FT_ServiceDescRec* clazz; \ + FT_ServiceDescRec* clazz = NULL; \ FT_Error error; \ FT_Memory memory = library->memory; \ \ @@ -493,7 +512,7 @@ FT_BEGIN_HEADER FT_Create_Class_ ## class_( FT_Library library, \ FT_ServiceDescRec** output_class) \ { \ - FT_ServiceDescRec* clazz; \ + FT_ServiceDescRec* clazz = NULL; \ FT_Error error; \ FT_Memory memory = library->memory; \ \ @@ -521,6 +540,59 @@ FT_BEGIN_HEADER return FT_Err_Ok; \ } +#define FT_DEFINE_SERVICEDESCREC7( class_, \ + serv_id_1, serv_data_1, \ + serv_id_2, serv_data_2, \ + serv_id_3, serv_data_3, \ + serv_id_4, serv_data_4, \ + serv_id_5, serv_data_5, \ + serv_id_6, serv_data_6, \ + serv_id_7, serv_data_7 ) \ + void \ + FT_Destroy_Class_ ## class_( FT_Library library, \ + FT_ServiceDescRec* clazz ) \ + { \ + FT_Memory memory = library->memory; \ + \ + \ + if ( clazz ) \ + FT_FREE( clazz ); \ + } \ + \ + FT_Error \ + FT_Create_Class_ ## class_( FT_Library library, \ + FT_ServiceDescRec** output_class) \ + { \ + FT_ServiceDescRec* clazz = NULL; \ + FT_Error error; \ + FT_Memory memory = library->memory; \ + \ + \ + if ( FT_ALLOC( clazz, sizeof ( *clazz ) * 8 ) ) \ + return error; \ + \ + clazz[0].serv_id = serv_id_1; \ + clazz[0].serv_data = serv_data_1; \ + clazz[1].serv_id = serv_id_2; \ + clazz[1].serv_data = serv_data_2; \ + clazz[2].serv_id = serv_id_3; \ + clazz[2].serv_data = serv_data_3; \ + clazz[3].serv_id = serv_id_4; \ + clazz[3].serv_data = serv_data_4; \ + clazz[4].serv_id = serv_id_5; \ + clazz[4].serv_data = serv_data_5; \ + clazz[5].serv_id = serv_id_6; \ + clazz[5].serv_data = serv_data_6; \ + clazz[6].serv_id = serv_id_7; \ + clazz[6].serv_data = serv_data_7; \ + clazz[7].serv_id = NULL; \ + clazz[7].serv_data = NULL; \ + \ + *output_class = clazz; \ + \ + return FT_Err_Ok; \ + } + #endif /* FT_CONFIG_OPTION_PIC */ @@ -573,7 +645,9 @@ FT_BEGIN_HEADER /* * A magic number used within the services cache. */ -#define FT_SERVICE_UNAVAILABLE ((FT_Pointer)-2) /* magic number */ + + /* ensure that value `1' has the same width as a pointer */ +#define FT_SERVICE_UNAVAILABLE ((FT_Pointer)~(FT_PtrDist)1) /* @@ -660,23 +734,24 @@ FT_BEGIN_HEADER * The header files containing the services. */ -#define FT_SERVICE_BDF_H <freetype/internal/services/svbdf.h> -#define FT_SERVICE_CID_H <freetype/internal/services/svcid.h> -#define FT_SERVICE_GLYPH_DICT_H <freetype/internal/services/svgldict.h> -#define FT_SERVICE_GX_VALIDATE_H <freetype/internal/services/svgxval.h> -#define FT_SERVICE_KERNING_H <freetype/internal/services/svkern.h> -#define FT_SERVICE_MULTIPLE_MASTERS_H <freetype/internal/services/svmm.h> -#define FT_SERVICE_OPENTYPE_VALIDATE_H <freetype/internal/services/svotval.h> -#define FT_SERVICE_PFR_H <freetype/internal/services/svpfr.h> -#define FT_SERVICE_POSTSCRIPT_CMAPS_H <freetype/internal/services/svpscmap.h> -#define FT_SERVICE_POSTSCRIPT_INFO_H <freetype/internal/services/svpsinfo.h> -#define FT_SERVICE_POSTSCRIPT_NAME_H <freetype/internal/services/svpostnm.h> -#define FT_SERVICE_SFNT_H <freetype/internal/services/svsfnt.h> -#define FT_SERVICE_TRUETYPE_ENGINE_H <freetype/internal/services/svtteng.h> -#define FT_SERVICE_TT_CMAP_H <freetype/internal/services/svttcmap.h> -#define FT_SERVICE_WINFNT_H <freetype/internal/services/svwinfnt.h> -#define FT_SERVICE_XFREE86_NAME_H <freetype/internal/services/svxf86nm.h> -#define FT_SERVICE_TRUETYPE_GLYF_H <freetype/internal/services/svttglyf.h> +#define FT_SERVICE_BDF_H <internal/services/svbdf.h> +#define FT_SERVICE_CID_H <internal/services/svcid.h> +#define FT_SERVICE_GLYPH_DICT_H <internal/services/svgldict.h> +#define FT_SERVICE_GX_VALIDATE_H <internal/services/svgxval.h> +#define FT_SERVICE_KERNING_H <internal/services/svkern.h> +#define FT_SERVICE_MULTIPLE_MASTERS_H <internal/services/svmm.h> +#define FT_SERVICE_OPENTYPE_VALIDATE_H <internal/services/svotval.h> +#define FT_SERVICE_PFR_H <internal/services/svpfr.h> +#define FT_SERVICE_POSTSCRIPT_CMAPS_H <internal/services/svpscmap.h> +#define FT_SERVICE_POSTSCRIPT_INFO_H <internal/services/svpsinfo.h> +#define FT_SERVICE_POSTSCRIPT_NAME_H <internal/services/svpostnm.h> +#define FT_SERVICE_PROPERTIES_H <internal/services/svprop.h> +#define FT_SERVICE_SFNT_H <internal/services/svsfnt.h> +#define FT_SERVICE_TRUETYPE_ENGINE_H <internal/services/svtteng.h> +#define FT_SERVICE_TT_CMAP_H <internal/services/svttcmap.h> +#define FT_SERVICE_WINFNT_H <internal/services/svwinfnt.h> +#define FT_SERVICE_XFREE86_NAME_H <internal/services/svxf86nm.h> +#define FT_SERVICE_TRUETYPE_GLYF_H <internal/services/svttglyf.h> /* */ diff --git a/include/freetype/internal/ftstream.h b/include/internal/ftstream.h similarity index 88% rename from include/freetype/internal/ftstream.h rename to include/internal/ftstream.h index 8b18500..2661858 100644 --- a/include/freetype/internal/ftstream.h +++ b/include/internal/ftstream.h @@ -4,7 +4,7 @@ /* */ /* Stream handling (specification). */ /* */ -/* Copyright 1996-2002, 2004-2006, 2011 by */ +/* Copyright 1996-2002, 2004-2006, 2011, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -154,67 +154,60 @@ FT_BEGIN_HEADER /* */ #define FT_BYTE_( p, i ) ( ((const FT_Byte*)(p))[(i)] ) -#define FT_INT8_( p, i ) ( ((const FT_Char*)(p))[(i)] ) #define FT_INT16( x ) ( (FT_Int16)(x) ) #define FT_UINT16( x ) ( (FT_UInt16)(x) ) #define FT_INT32( x ) ( (FT_Int32)(x) ) #define FT_UINT32( x ) ( (FT_UInt32)(x) ) -#define FT_BYTE_I16( p, i, s ) ( FT_INT16( FT_BYTE_( p, i ) ) << (s) ) + #define FT_BYTE_U16( p, i, s ) ( FT_UINT16( FT_BYTE_( p, i ) ) << (s) ) -#define FT_BYTE_I32( p, i, s ) ( FT_INT32( FT_BYTE_( p, i ) ) << (s) ) #define FT_BYTE_U32( p, i, s ) ( FT_UINT32( FT_BYTE_( p, i ) ) << (s) ) -#define FT_INT8_I16( p, i, s ) ( FT_INT16( FT_INT8_( p, i ) ) << (s) ) -#define FT_INT8_U16( p, i, s ) ( FT_UINT16( FT_INT8_( p, i ) ) << (s) ) -#define FT_INT8_I32( p, i, s ) ( FT_INT32( FT_INT8_( p, i ) ) << (s) ) -#define FT_INT8_U32( p, i, s ) ( FT_UINT32( FT_INT8_( p, i ) ) << (s) ) - -#define FT_PEEK_SHORT( p ) FT_INT16( FT_INT8_I16( p, 0, 8) | \ - FT_BYTE_I16( p, 1, 0) ) +#define FT_PEEK_SHORT( p ) FT_INT16( FT_BYTE_U16( p, 0, 8) | \ + FT_BYTE_U16( p, 1, 0) ) #define FT_PEEK_USHORT( p ) FT_UINT16( FT_BYTE_U16( p, 0, 8 ) | \ FT_BYTE_U16( p, 1, 0 ) ) -#define FT_PEEK_LONG( p ) FT_INT32( FT_INT8_I32( p, 0, 24 ) | \ - FT_BYTE_I32( p, 1, 16 ) | \ - FT_BYTE_I32( p, 2, 8 ) | \ - FT_BYTE_I32( p, 3, 0 ) ) +#define FT_PEEK_LONG( p ) FT_INT32( FT_BYTE_U32( p, 0, 24 ) | \ + FT_BYTE_U32( p, 1, 16 ) | \ + FT_BYTE_U32( p, 2, 8 ) | \ + FT_BYTE_U32( p, 3, 0 ) ) #define FT_PEEK_ULONG( p ) FT_UINT32( FT_BYTE_U32( p, 0, 24 ) | \ FT_BYTE_U32( p, 1, 16 ) | \ FT_BYTE_U32( p, 2, 8 ) | \ FT_BYTE_U32( p, 3, 0 ) ) -#define FT_PEEK_OFF3( p ) FT_INT32( FT_INT8_I32( p, 0, 16 ) | \ - FT_BYTE_I32( p, 1, 8 ) | \ - FT_BYTE_I32( p, 2, 0 ) ) +#define FT_PEEK_OFF3( p ) FT_INT32( FT_BYTE_U32( p, 0, 16 ) | \ + FT_BYTE_U32( p, 1, 8 ) | \ + FT_BYTE_U32( p, 2, 0 ) ) #define FT_PEEK_UOFF3( p ) FT_UINT32( FT_BYTE_U32( p, 0, 16 ) | \ FT_BYTE_U32( p, 1, 8 ) | \ FT_BYTE_U32( p, 2, 0 ) ) -#define FT_PEEK_SHORT_LE( p ) FT_INT16( FT_INT8_I16( p, 1, 8 ) | \ - FT_BYTE_I16( p, 0, 0 ) ) +#define FT_PEEK_SHORT_LE( p ) FT_INT16( FT_BYTE_U16( p, 1, 8 ) | \ + FT_BYTE_U16( p, 0, 0 ) ) #define FT_PEEK_USHORT_LE( p ) FT_UINT16( FT_BYTE_U16( p, 1, 8 ) | \ FT_BYTE_U16( p, 0, 0 ) ) -#define FT_PEEK_LONG_LE( p ) FT_INT32( FT_INT8_I32( p, 3, 24 ) | \ - FT_BYTE_I32( p, 2, 16 ) | \ - FT_BYTE_I32( p, 1, 8 ) | \ - FT_BYTE_I32( p, 0, 0 ) ) +#define FT_PEEK_LONG_LE( p ) FT_INT32( FT_BYTE_U32( p, 3, 24 ) | \ + FT_BYTE_U32( p, 2, 16 ) | \ + FT_BYTE_U32( p, 1, 8 ) | \ + FT_BYTE_U32( p, 0, 0 ) ) #define FT_PEEK_ULONG_LE( p ) FT_UINT32( FT_BYTE_U32( p, 3, 24 ) | \ FT_BYTE_U32( p, 2, 16 ) | \ FT_BYTE_U32( p, 1, 8 ) | \ FT_BYTE_U32( p, 0, 0 ) ) -#define FT_PEEK_OFF3_LE( p ) FT_INT32( FT_INT8_I32( p, 2, 16 ) | \ - FT_BYTE_I32( p, 1, 8 ) | \ - FT_BYTE_I32( p, 0, 0 ) ) +#define FT_PEEK_OFF3_LE( p ) FT_INT32( FT_BYTE_U32( p, 2, 16 ) | \ + FT_BYTE_U32( p, 1, 8 ) | \ + FT_BYTE_U32( p, 0, 0 ) ) #define FT_PEEK_UOFF3_LE( p ) FT_UINT32( FT_BYTE_U32( p, 2, 16 ) | \ FT_BYTE_U32( p, 1, 8 ) | \ @@ -493,37 +486,41 @@ FT_BEGIN_HEADER #define FT_STREAM_POS() \ FT_Stream_Pos( stream ) -#define FT_STREAM_SEEK( position ) \ - FT_SET_ERROR( FT_Stream_Seek( stream, position ) ) +#define FT_STREAM_SEEK( position ) \ + FT_SET_ERROR( FT_Stream_Seek( stream, \ + (FT_ULong)(position) ) ) -#define FT_STREAM_SKIP( distance ) \ - FT_SET_ERROR( FT_Stream_Skip( stream, distance ) ) +#define FT_STREAM_SKIP( distance ) \ + FT_SET_ERROR( FT_Stream_Skip( stream, \ + (FT_Long)(distance) ) ) -#define FT_STREAM_READ( buffer, count ) \ - FT_SET_ERROR( FT_Stream_Read( stream, \ - (FT_Byte*)buffer, \ - count ) ) +#define FT_STREAM_READ( buffer, count ) \ + FT_SET_ERROR( FT_Stream_Read( stream, \ + (FT_Byte*)(buffer), \ + (FT_ULong)(count) ) ) -#define FT_STREAM_READ_AT( position, buffer, count ) \ - FT_SET_ERROR( FT_Stream_ReadAt( stream, \ - position, \ - (FT_Byte*)buffer, \ - count ) ) +#define FT_STREAM_READ_AT( position, buffer, count ) \ + FT_SET_ERROR( FT_Stream_ReadAt( stream, \ + (FT_ULong)(position), \ + (FT_Byte*)buffer, \ + (FT_ULong)(count) ) ) #define FT_STREAM_READ_FIELDS( fields, object ) \ FT_SET_ERROR( FT_Stream_ReadFields( stream, fields, object ) ) -#define FT_FRAME_ENTER( size ) \ - FT_SET_ERROR( \ - FT_DEBUG_INNER( FT_Stream_EnterFrame( stream, size ) ) ) +#define FT_FRAME_ENTER( size ) \ + FT_SET_ERROR( \ + FT_DEBUG_INNER( FT_Stream_EnterFrame( stream, \ + (FT_ULong)(size) ) ) ) -#define FT_FRAME_EXIT() \ +#define FT_FRAME_EXIT() \ FT_DEBUG_INNER( FT_Stream_ExitFrame( stream ) ) #define FT_FRAME_EXTRACT( size, bytes ) \ FT_SET_ERROR( \ - FT_DEBUG_INNER( FT_Stream_ExtractFrame( stream, size, \ + FT_DEBUG_INNER( FT_Stream_ExtractFrame( stream, \ + (FT_ULong)(size), \ (FT_Byte**)&(bytes) ) ) ) #define FT_FRAME_RELEASE( bytes ) \ diff --git a/include/freetype/internal/fttrace.h b/include/internal/fttrace.h similarity index 94% rename from include/freetype/internal/fttrace.h rename to include/internal/fttrace.h index fbefdbd..d5253db 100644 --- a/include/freetype/internal/fttrace.h +++ b/include/internal/fttrace.h @@ -4,7 +4,7 @@ /* */ /* Tracing handling (specification only). */ /* */ -/* Copyright 2002, 2004-2007, 2009, 2011 by */ +/* Copyright 2002, 2004-2007, 2009, 2011-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -38,6 +38,7 @@ FT_TRACE_DEF( smooth ) /* anti-aliasing raster (ftgrays.c) */ FT_TRACE_DEF( mm ) /* MM interface (ftmm.c) */ FT_TRACE_DEF( raccess ) /* resource fork accessor (ftrfork.c) */ FT_TRACE_DEF( synth ) /* bold/slant synthesizer (ftsynth.c) */ +FT_TRACE_DEF( bitmap ) /* bitmap checksum (ftobjs.c) */ /* Cache sub-system */ FT_TRACE_DEF( cache ) /* cache sub-system (ftcache.c, etc.) */ @@ -73,6 +74,7 @@ FT_TRACE_DEF( t1parse ) /* PostScript helper module `psaux' */ FT_TRACE_DEF( t1decode ) FT_TRACE_DEF( psobjs ) +FT_TRACE_DEF( psconv ) /* PostScript hinting module `pshinter' */ FT_TRACE_DEF( pshrec ) @@ -86,6 +88,10 @@ FT_TRACE_DEF( cffload ) FT_TRACE_DEF( cffobjs ) FT_TRACE_DEF( cffparse ) +FT_TRACE_DEF( cf2blues ) +FT_TRACE_DEF( cf2hints ) +FT_TRACE_DEF( cf2interp ) + /* Type 42 driver component */ FT_TRACE_DEF( t42 ) @@ -136,9 +142,13 @@ FT_TRACE_DEF( gxvprop ) FT_TRACE_DEF( gxvlcar ) /* autofit components */ +FT_TRACE_DEF( afmodule ) +FT_TRACE_DEF( afhints ) FT_TRACE_DEF( afcjk ) FT_TRACE_DEF( aflatin ) FT_TRACE_DEF( aflatin2 ) FT_TRACE_DEF( afwarp ) +FT_TRACE_DEF( afharfbuzz ) +FT_TRACE_DEF( afglobal ) /* END */ diff --git a/include/freetype/internal/ftvalid.h b/include/internal/ftvalid.h similarity index 88% rename from include/freetype/internal/ftvalid.h rename to include/internal/ftvalid.h index 00cd85e..c281b14 100644 --- a/include/freetype/internal/ftvalid.h +++ b/include/internal/ftvalid.h @@ -4,7 +4,7 @@ /* */ /* FreeType validation support (specification). */ /* */ -/* Copyright 2004 by */ +/* Copyright 2004, 2013, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -76,20 +76,31 @@ FT_BEGIN_HEADER } FT_ValidationLevel; +#if defined( _MSC_VER ) /* Visual C++ (and Intel C++) */ + /* We disable the warning `structure was padded due to */ + /* __declspec(align())' in order to compile cleanly with */ + /* the maximum level of warnings. */ +#pragma warning( push ) +#pragma warning( disable : 4324 ) +#endif /* _MSC_VER */ + /* validator structure */ typedef struct FT_ValidatorRec_ { + ft_jmp_buf jump_buffer; /* used for exception handling */ + const FT_Byte* base; /* address of table in memory */ const FT_Byte* limit; /* `base' + sizeof(table) in memory */ FT_ValidationLevel level; /* validation level */ FT_Error error; /* error returned. 0 means success */ - ft_jmp_buf jump_buffer; /* used for exception handling */ - } FT_ValidatorRec; +#if defined( _MSC_VER ) +#pragma warning( pop ) +#endif -#define FT_VALIDATOR( x ) ((FT_Validator)( x )) +#define FT_VALIDATOR( x ) ( (FT_Validator)( x ) ) FT_BASE( void ) @@ -115,31 +126,29 @@ FT_BEGIN_HEADER /* Calls ft_validate_error. Assumes that the `valid' local variable */ /* holds a pointer to the current validator object. */ /* */ - /* Use preprocessor prescan to pass FT_ERR_PREFIX. */ - /* */ -#define FT_INVALID( _prefix, _error ) FT_INVALID_( _prefix, _error ) -#define FT_INVALID_( _prefix, _error ) \ - ft_validator_error( valid, _prefix ## _error ) +#define FT_INVALID( _error ) FT_INVALID_( _error ) +#define FT_INVALID_( _error ) \ + ft_validator_error( valid, FT_THROW( _error ) ) /* called when a broken table is detected */ #define FT_INVALID_TOO_SHORT \ - FT_INVALID( FT_ERR_PREFIX, Invalid_Table ) + FT_INVALID( Invalid_Table ) /* called when an invalid offset is detected */ #define FT_INVALID_OFFSET \ - FT_INVALID( FT_ERR_PREFIX, Invalid_Offset ) + FT_INVALID( Invalid_Offset ) /* called when an invalid format/value is detected */ #define FT_INVALID_FORMAT \ - FT_INVALID( FT_ERR_PREFIX, Invalid_Table ) + FT_INVALID( Invalid_Table ) /* called when an invalid glyph index is detected */ #define FT_INVALID_GLYPH_ID \ - FT_INVALID( FT_ERR_PREFIX, Invalid_Glyph_Index ) + FT_INVALID( Invalid_Glyph_Index ) /* called when an invalid field value is detected */ #define FT_INVALID_DATA \ - FT_INVALID( FT_ERR_PREFIX, Invalid_Table ) + FT_INVALID( Invalid_Table ) FT_END_HEADER diff --git a/include/internal/internal.h b/include/internal/internal.h new file mode 100644 index 0000000..e0ddb06 --- /dev/null +++ b/include/internal/internal.h @@ -0,0 +1,63 @@ +/***************************************************************************/ +/* */ +/* internal.h */ +/* */ +/* Internal header files (specification only). */ +/* */ +/* Copyright 1996-2004, 2013 by */ +/* David Turner, Robert Wilhelm, and Werner Lemberg. */ +/* */ +/* This file is part of the FreeType project, and may only be used, */ +/* modified, and distributed under the terms of the FreeType project */ +/* license, LICENSE.TXT. By continuing to use, modify, or distribute */ +/* this file you indicate that you have read the license and */ +/* understand and accept it fully. */ +/* */ +/***************************************************************************/ + + + /*************************************************************************/ + /* */ + /* This file is automatically included by `ft2build.h'. */ + /* Do not include it manually! */ + /* */ + /*************************************************************************/ + + +#define FT_INTERNAL_OBJECTS_H <internal/ftobjs.h> +#define FT_INTERNAL_PIC_H <internal/ftpic.h> +#define FT_INTERNAL_STREAM_H <internal/ftstream.h> +#define FT_INTERNAL_MEMORY_H <internal/ftmemory.h> +#define FT_INTERNAL_DEBUG_H <internal/ftdebug.h> +#define FT_INTERNAL_CALC_H <internal/ftcalc.h> +#define FT_INTERNAL_DRIVER_H <internal/ftdriver.h> +#define FT_INTERNAL_TRACE_H <internal/fttrace.h> +#define FT_INTERNAL_GLYPH_LOADER_H <internal/ftgloadr.h> +#define FT_INTERNAL_SFNT_H <internal/sfnt.h> +#define FT_INTERNAL_SERVICE_H <internal/ftserv.h> +#define FT_INTERNAL_RFORK_H <internal/ftrfork.h> +#define FT_INTERNAL_VALIDATE_H <internal/ftvalid.h> + +#define FT_INTERNAL_TRUETYPE_TYPES_H <internal/tttypes.h> +#define FT_INTERNAL_TYPE1_TYPES_H <internal/t1types.h> + +#define FT_INTERNAL_POSTSCRIPT_AUX_H <internal/psaux.h> +#define FT_INTERNAL_POSTSCRIPT_HINTS_H <internal/pshints.h> +#define FT_INTERNAL_POSTSCRIPT_GLOBALS_H <internal/psglobal.h> + +#define FT_INTERNAL_AUTOHINT_H <internal/autohint.h> + + +#if defined( _MSC_VER ) /* Visual C++ (and Intel C++) */ + + /* We disable the warning `conditional expression is constant' here */ + /* in order to compile cleanly with the maximum level of warnings. */ + /* In particular, the warning complains about stuff like `while(0)' */ + /* which is very useful in macro definitions. There is no benefit */ + /* in having it enabled. */ +#pragma warning( disable : 4127 ) + +#endif /* _MSC_VER */ + + +/* END */ diff --git a/include/freetype/internal/psaux.h b/include/internal/psaux.h similarity index 98% rename from include/freetype/internal/psaux.h rename to include/internal/psaux.h index a96e0df..e903114 100644 --- a/include/freetype/internal/psaux.h +++ b/include/internal/psaux.h @@ -5,7 +5,7 @@ /* Auxiliary functions and data structures related to PostScript fonts */ /* (specification). */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2004, 2006, 2008, 2009 by */ +/* Copyright 1996-2004, 2006, 2008, 2009, 2012 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -101,6 +101,9 @@ FT_BEGIN_HEADER /* capacity :: The current size of the heap block. Increments by */ /* 1kByte chunks. */ /* */ + /* init :: Set to 0xDEADBEEF if `elements' and `lengths' have */ + /* been allocated. */ + /* */ /* max_elems :: The maximum number of elements in table. */ /* */ /* num_elems :: The current number of elements in table. */ @@ -183,6 +186,7 @@ FT_BEGIN_HEADER T1_FIELD_TYPE_STRING, T1_FIELD_TYPE_KEY, T1_FIELD_TYPE_BBOX, + T1_FIELD_TYPE_MM_BBOX, T1_FIELD_TYPE_INTEGER_ARRAY, T1_FIELD_TYPE_FIXED_ARRAY, T1_FIELD_TYPE_CALLBACK, @@ -225,7 +229,7 @@ FT_BEGIN_HEADER T1_Field_ParseFunc reader; FT_UInt offset; /* offset of field in object */ FT_Byte size; /* size of field in bytes */ - FT_UInt array_max; /* maximal number of elements for */ + FT_UInt array_max; /* maximum number of elements for */ /* array */ FT_UInt count_offset; /* offset of element count for */ /* arrays; must not be zero if in */ @@ -531,7 +535,7 @@ FT_BEGIN_HEADER /* */ /* max_points :: maximum points in builder outline */ /* */ - /* max_contours :: Maximal number of contours in builder outline. */ + /* max_contours :: Maximum number of contours in builder outline. */ /* */ /* pos_x :: The horizontal translation (if composite glyph). */ /* */ diff --git a/include/freetype/internal/pshints.h b/include/internal/pshints.h similarity index 93% rename from include/freetype/internal/pshints.h rename to include/internal/pshints.h index 5b7b698..f05ea68 100644 --- a/include/freetype/internal/pshints.h +++ b/include/internal/pshints.h @@ -6,7 +6,7 @@ /* recorders (specification only). These are used to support native */ /* T1/T2 hints in the `type1', `cid', and `cff' font drivers. */ /* */ -/* Copyright 2001, 2002, 2003, 2005, 2006, 2007, 2009 by */ +/* Copyright 2001-2003, 2005-2007, 2009, 2012, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -45,7 +45,7 @@ FT_BEGIN_HEADER T1_Private* private_dict, PSH_Globals* aglobals ); - typedef FT_Error + typedef void (*PSH_Globals_SetScaleFunc)( PSH_Globals globals, FT_Fixed x_scale, FT_Fixed y_scale, @@ -679,27 +679,37 @@ FT_BEGIN_HEADER typedef PSHinter_Interface* PSHinter_Service; + #ifndef FT_CONFIG_OPTION_PIC -#define FT_DEFINE_PSHINTER_INTERFACE(class_, get_globals_funcs_, \ - get_t1_funcs_, get_t2_funcs_) \ - static const PSHinter_Interface class_ = \ - { \ - get_globals_funcs_, get_t1_funcs_, get_t2_funcs_ \ +#define FT_DEFINE_PSHINTER_INTERFACE( \ + class_, \ + get_globals_funcs_, \ + get_t1_funcs_, \ + get_t2_funcs_ ) \ + static const PSHinter_Interface class_ = \ + { \ + get_globals_funcs_, \ + get_t1_funcs_, \ + get_t2_funcs_ \ }; #else /* FT_CONFIG_OPTION_PIC */ -#define FT_DEFINE_PSHINTER_INTERFACE(class_, get_globals_funcs_, \ - get_t1_funcs_, get_t2_funcs_) \ - void \ - FT_Init_Class_##class_( FT_Library library, \ - PSHinter_Interface* clazz) \ - { \ - FT_UNUSED(library); \ - clazz->get_globals_funcs = get_globals_funcs_; \ - clazz->get_t1_funcs = get_t1_funcs_; \ - clazz->get_t2_funcs = get_t2_funcs_; \ +#define FT_DEFINE_PSHINTER_INTERFACE( \ + class_, \ + get_globals_funcs_, \ + get_t1_funcs_, \ + get_t2_funcs_ ) \ + void \ + FT_Init_Class_ ## class_( FT_Library library, \ + PSHinter_Interface* clazz ) \ + { \ + FT_UNUSED( library ); \ + \ + clazz->get_globals_funcs = get_globals_funcs_; \ + clazz->get_t1_funcs = get_t1_funcs_; \ + clazz->get_t2_funcs = get_t2_funcs_; \ } #endif /* FT_CONFIG_OPTION_PIC */ diff --git a/include/freetype/internal/services/svbdf.h b/include/internal/services/svbdf.h similarity index 100% rename from include/freetype/internal/services/svbdf.h rename to include/internal/services/svbdf.h diff --git a/include/freetype/internal/services/svcid.h b/include/internal/services/svcid.h similarity index 100% rename from include/freetype/internal/services/svcid.h rename to include/internal/services/svcid.h diff --git a/include/freetype/internal/services/svgldict.h b/include/internal/services/svgldict.h similarity index 100% rename from include/freetype/internal/services/svgldict.h rename to include/internal/services/svgldict.h diff --git a/include/freetype/internal/services/svgxval.h b/include/internal/services/svgxval.h similarity index 100% rename from include/freetype/internal/services/svgxval.h rename to include/internal/services/svgxval.h diff --git a/include/freetype/internal/services/svkern.h b/include/internal/services/svkern.h similarity index 100% rename from include/freetype/internal/services/svkern.h rename to include/internal/services/svkern.h diff --git a/include/freetype/internal/services/svmm.h b/include/internal/services/svmm.h similarity index 100% rename from include/freetype/internal/services/svmm.h rename to include/internal/services/svmm.h diff --git a/include/freetype/internal/services/svotval.h b/include/internal/services/svotval.h similarity index 100% rename from include/freetype/internal/services/svotval.h rename to include/internal/services/svotval.h diff --git a/include/freetype/internal/services/svpfr.h b/include/internal/services/svpfr.h similarity index 100% rename from include/freetype/internal/services/svpfr.h rename to include/internal/services/svpfr.h diff --git a/include/freetype/internal/services/svpostnm.h b/include/internal/services/svpostnm.h similarity index 100% rename from include/freetype/internal/services/svpostnm.h rename to include/internal/services/svpostnm.h diff --git a/include/internal/services/svprop.h b/include/internal/services/svprop.h new file mode 100644 index 0000000..22da0bb --- /dev/null +++ b/include/internal/services/svprop.h @@ -0,0 +1,81 @@ +/***************************************************************************/ +/* */ +/* svprop.h */ +/* */ +/* The FreeType property service (specification). */ +/* */ +/* Copyright 2012 by */ +/* David Turner, Robert Wilhelm, and Werner Lemberg. */ +/* */ +/* This file is part of the FreeType project, and may only be used, */ +/* modified, and distributed under the terms of the FreeType project */ +/* license, LICENSE.TXT. By continuing to use, modify, or distribute */ +/* this file you indicate that you have read the license and */ +/* understand and accept it fully. */ +/* */ +/***************************************************************************/ + + +#ifndef __SVPROP_H__ +#define __SVPROP_H__ + + +FT_BEGIN_HEADER + + +#define FT_SERVICE_ID_PROPERTIES "properties" + + + typedef FT_Error + (*FT_Properties_SetFunc)( FT_Module module, + const char* property_name, + const void* value ); + + typedef FT_Error + (*FT_Properties_GetFunc)( FT_Module module, + const char* property_name, + void* value ); + + + FT_DEFINE_SERVICE( Properties ) + { + FT_Properties_SetFunc set_property; + FT_Properties_GetFunc get_property; + }; + + +#ifndef FT_CONFIG_OPTION_PIC + +#define FT_DEFINE_SERVICE_PROPERTIESREC( class_, \ + set_property_, \ + get_property_ ) \ + static const FT_Service_PropertiesRec class_ = \ + { \ + set_property_, \ + get_property_ \ + }; + +#else /* FT_CONFIG_OPTION_PIC */ + +#define FT_DEFINE_SERVICE_PROPERTIESREC( class_, \ + set_property_, \ + get_property_ ) \ + void \ + FT_Init_Class_ ## class_( FT_Service_PropertiesRec* clazz ) \ + { \ + clazz->set_property = set_property_; \ + clazz->get_property = get_property_; \ + } + +#endif /* FT_CONFIG_OPTION_PIC */ + + /* */ + + +FT_END_HEADER + + +#endif /* __SVPROP_H__ */ + + +/* END */ diff --git a/include/freetype/internal/services/svpscmap.h b/include/internal/services/svpscmap.h similarity index 100% rename from include/freetype/internal/services/svpscmap.h rename to include/internal/services/svpscmap.h diff --git a/include/freetype/internal/services/svpsinfo.h b/include/internal/services/svpsinfo.h similarity index 100% rename from include/freetype/internal/services/svpsinfo.h rename to include/internal/services/svpsinfo.h diff --git a/include/freetype/internal/services/svsfnt.h b/include/internal/services/svsfnt.h similarity index 100% rename from include/freetype/internal/services/svsfnt.h rename to include/internal/services/svsfnt.h diff --git a/include/freetype/internal/services/svttcmap.h b/include/internal/services/svttcmap.h similarity index 97% rename from include/freetype/internal/services/svttcmap.h rename to include/internal/services/svttcmap.h index 83994aa..4370f4c 100644 --- a/include/freetype/internal/services/svttcmap.h +++ b/include/internal/services/svttcmap.h @@ -7,7 +7,7 @@ /* Copyright 2003 by */ /* Masatake YAMATO, Redhat K.K. */ /* */ -/* Copyright 2003, 2008, 2009, 2012 by */ +/* Copyright 2003, 2008, 2009, 2012, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -47,7 +47,7 @@ FT_BEGIN_HEADER /* <Fields> */ /* language :: */ /* The language ID used in Mac fonts. Definitions of values are in */ - /* freetype/ttnameid.h. */ + /* `ttnameid.h'. */ /* */ /* format :: */ /* The cmap format. OpenType 1.5 defines the formats 0 (byte */ diff --git a/include/freetype/internal/services/svtteng.h b/include/internal/services/svtteng.h similarity index 100% rename from include/freetype/internal/services/svtteng.h rename to include/internal/services/svtteng.h diff --git a/include/freetype/internal/services/svttglyf.h b/include/internal/services/svttglyf.h similarity index 100% rename from include/freetype/internal/services/svttglyf.h rename to include/internal/services/svttglyf.h diff --git a/include/freetype/internal/services/svwinfnt.h b/include/internal/services/svwinfnt.h similarity index 100% rename from include/freetype/internal/services/svwinfnt.h rename to include/internal/services/svwinfnt.h diff --git a/include/freetype/internal/services/svxf86nm.h b/include/internal/services/svxf86nm.h similarity index 100% rename from include/freetype/internal/services/svxf86nm.h rename to include/internal/services/svxf86nm.h diff --git a/include/freetype/internal/sfnt.h b/include/internal/sfnt.h similarity index 66% rename from include/freetype/internal/sfnt.h rename to include/internal/sfnt.h index 905ca8c..d558e86 100644 --- a/include/freetype/internal/sfnt.h +++ b/include/internal/sfnt.h @@ -4,7 +4,7 @@ /* */ /* High-level `sfnt' driver interface (specification). */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006 by */ +/* Copyright 1996-2006, 2009, 2012-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -125,77 +125,6 @@ FT_BEGIN_HEADER (*TT_Done_Face_Func)( TT_Face face ); -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS - - /*************************************************************************/ - /* */ - /* <FuncType> */ - /* TT_Load_SFNT_HeaderRec_Func */ - /* */ - /* <Description> */ - /* Loads the header of a SFNT font file. Supports collections. */ - /* */ - /* <Input> */ - /* face :: A handle to the target face object. */ - /* */ - /* stream :: The input stream. */ - /* */ - /* face_index :: The index of the TrueType font, if we are opening a */ - /* collection. */ - /* */ - /* <Output> */ - /* sfnt :: The SFNT header. */ - /* */ - /* <Return> */ - /* FreeType error code. 0 means success. */ - /* */ - /* <Note> */ - /* The stream cursor must be at the font file's origin. */ - /* */ - /* This function recognizes fonts embedded in a `TrueType */ - /* collection'. */ - /* */ - /* This function checks that the header is valid by looking at the */ - /* values of `search_range', `entry_selector', and `range_shift'. */ - /* */ - typedef FT_Error - (*TT_Load_SFNT_HeaderRec_Func)( TT_Face face, - FT_Stream stream, - FT_Long face_index, - SFNT_Header sfnt ); - - - /*************************************************************************/ - /* */ - /* <FuncType> */ - /* TT_Load_Directory_Func */ - /* */ - /* <Description> */ - /* Loads the table directory into a face object. */ - /* */ - /* <Input> */ - /* face :: A handle to the target face object. */ - /* */ - /* stream :: The input stream. */ - /* */ - /* sfnt :: The SFNT header. */ - /* */ - /* <Return> */ - /* FreeType error code. 0 means success. */ - /* */ - /* <Note> */ - /* The stream cursor must be on the first byte after the 4-byte font */ - /* format tag. This is the case just after a call to */ - /* TT_Load_Format_Tag(). */ - /* */ - typedef FT_Error - (*TT_Load_Directory_Func)( TT_Face face, - FT_Stream stream, - SFNT_Header sfnt ); - -#endif /* FT_CONFIG_OPTION_OLD_INTERNALS */ - - /*************************************************************************/ /* */ /* <FuncType> */ @@ -363,88 +292,6 @@ FT_BEGIN_HEADER TT_SBit_MetricsRec *ametrics ); -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS - - /*************************************************************************/ - /* */ - /* <FuncType> */ - /* TT_Set_SBit_Strike_OldFunc */ - /* */ - /* <Description> */ - /* Select an sbit strike for a given size request. */ - /* */ - /* <Input> */ - /* face :: The target face object. */ - /* */ - /* req :: The size request. */ - /* */ - /* <Output> */ - /* astrike_index :: The index of the sbit strike. */ - /* */ - /* <Return> */ - /* FreeType error code. 0 means success. Returns an error if no */ - /* sbit strike exists for the selected ppem values. */ - /* */ - typedef FT_Error - (*TT_Set_SBit_Strike_OldFunc)( TT_Face face, - FT_UInt x_ppem, - FT_UInt y_ppem, - FT_ULong* astrike_index ); - - - /*************************************************************************/ - /* */ - /* <FuncType> */ - /* TT_CharMap_Load_Func */ - /* */ - /* <Description> */ - /* Loads a given TrueType character map into memory. */ - /* */ - /* <Input> */ - /* face :: A handle to the parent face object. */ - /* */ - /* stream :: A handle to the current stream object. */ - /* */ - /* <InOut> */ - /* cmap :: A pointer to a cmap object. */ - /* */ - /* <Return> */ - /* FreeType error code. 0 means success. */ - /* */ - /* <Note> */ - /* The function assumes that the stream is already in use (i.e., */ - /* opened). In case of error, all partially allocated tables are */ - /* released. */ - /* */ - typedef FT_Error - (*TT_CharMap_Load_Func)( TT_Face face, - void* cmap, - FT_Stream input ); - - - /*************************************************************************/ - /* */ - /* <FuncType> */ - /* TT_CharMap_Free_Func */ - /* */ - /* <Description> */ - /* Destroys a character mapping table. */ - /* */ - /* <Input> */ - /* face :: A handle to the parent face object. */ - /* */ - /* cmap :: A handle to a cmap object. */ - /* */ - /* <Return> */ - /* FreeType error code. 0 means success. */ - /* */ - typedef FT_Error - (*TT_CharMap_Free_Func)( TT_Face face, - void* cmap ); - -#endif /* FT_CONFIG_OPTION_OLD_INTERNALS */ - - /*************************************************************************/ /* */ /* <FuncType> */ @@ -558,14 +405,18 @@ FT_BEGIN_HEADER /* <Input> */ /* face :: A handle to the target face object. */ /* */ - /* stream :: The input stream. */ - /* */ /* vertical :: A boolean flag. If set, load vertical metrics. */ /* */ - /* <Return> */ - /* FreeType error code. 0 means success. */ + /* gindex :: The glyph index. */ /* */ - typedef FT_Error + /* <Output> */ + /* abearing :: The horizontal (or vertical) bearing. Set to zero in */ + /* case of error. */ + /* */ + /* aadvance :: The horizontal (or vertical) advance. Set to zero in */ + /* case of error. */ + /* */ + typedef void (*TT_Get_Metrics_Func)( TT_Face face, FT_Bool vertical, FT_UInt gindex, @@ -657,11 +508,6 @@ FT_BEGIN_HEADER TT_Load_Any_Func load_any; -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS - TT_Load_SFNT_HeaderRec_Func load_sfnt_header; - TT_Load_Directory_Func load_directory; -#endif - /* these functions are called by `load_face' but they can also */ /* be called from external modules, if there is a need to do so */ TT_Load_Table_Func load_head; @@ -674,12 +520,6 @@ FT_BEGIN_HEADER TT_Load_Table_Func load_name; TT_Free_Table_Func free_name; - /* optional tables */ -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS - TT_Load_Table_Func load_hdmx_stub; - TT_Free_Table_Func free_hdmx_stub; -#endif - /* this field was called `load_kerning' up to version 2.1.10 */ TT_Load_Table_Func load_kern; @@ -690,43 +530,12 @@ FT_BEGIN_HEADER /* version 2.1.10 */ TT_Load_Table_Func load_bhed; -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS - - /* see `ttsbit.h' */ - TT_Set_SBit_Strike_OldFunc set_sbit_strike_stub; - TT_Load_Table_Func load_sbits_stub; - - /* - * The following two fields appeared in version 2.1.8, and were placed - * between `load_sbits' and `load_sbit_image'. We support them as a - * special exception since they are used by Xfont library within the - * X.Org xserver, and because the probability that other rogue clients - * use the other version 2.1.7 fields below is _extremely_ low. - * - * Note that this forces us to disable an interesting memory-saving - * optimization though... - */ - - TT_Find_SBit_Image_Func find_sbit_image; - TT_Load_SBit_Metrics_Func load_sbit_metrics; - -#endif - TT_Load_SBit_Image_Func load_sbit_image; -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS - TT_Free_Table_Func free_sbits_stub; -#endif - /* see `ttpost.h' */ TT_Get_PS_Name_Func get_psname; TT_Free_Table_Func free_psnames; -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS - TT_CharMap_Load_Func load_charmap_stub; - TT_CharMap_Free_Func free_charmap_stub; -#endif - /* starting here, the structure differs from version 2.1.7 */ /* this field was introduced in version 2.1.8, named `get_psname' */ @@ -755,136 +564,141 @@ FT_BEGIN_HEADER #ifndef FT_CONFIG_OPTION_PIC -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS -#define FT_DEFINE_DRIVERS_OLD_INTERNAL(a) \ - a, -#else - #define FT_DEFINE_DRIVERS_OLD_INTERNAL(a) -#endif -#define FT_INTERNAL(a) \ - a, - -#define FT_DEFINE_SFNT_INTERFACE(class_, \ - goto_table_, init_face_, load_face_, done_face_, get_interface_, \ - load_any_, load_sfnt_header_, load_directory_, load_head_, \ - load_hhea_, load_cmap_, load_maxp_, load_os2_, load_post_, \ - load_name_, free_name_, load_hdmx_stub_, free_hdmx_stub_, \ - load_kern_, load_gasp_, load_pclt_, load_bhed_, \ - set_sbit_strike_stub_, load_sbits_stub_, find_sbit_image_, \ - load_sbit_metrics_, load_sbit_image_, free_sbits_stub_, \ - get_psname_, free_psnames_, load_charmap_stub_, free_charmap_stub_, \ - get_kerning_, load_font_dir_, load_hmtx_, load_eblc_, free_eblc_, \ - set_sbit_strike_, load_strike_metrics_, get_metrics_ ) \ - static const SFNT_Interface class_ = \ - { \ - FT_INTERNAL(goto_table_) \ - FT_INTERNAL(init_face_) \ - FT_INTERNAL(load_face_) \ - FT_INTERNAL(done_face_) \ - FT_INTERNAL(get_interface_) \ - FT_INTERNAL(load_any_) \ - FT_DEFINE_DRIVERS_OLD_INTERNAL(load_sfnt_header_) \ - FT_DEFINE_DRIVERS_OLD_INTERNAL(load_directory_) \ - FT_INTERNAL(load_head_) \ - FT_INTERNAL(load_hhea_) \ - FT_INTERNAL(load_cmap_) \ - FT_INTERNAL(load_maxp_) \ - FT_INTERNAL(load_os2_) \ - FT_INTERNAL(load_post_) \ - FT_INTERNAL(load_name_) \ - FT_INTERNAL(free_name_) \ - FT_DEFINE_DRIVERS_OLD_INTERNAL(load_hdmx_stub_) \ - FT_DEFINE_DRIVERS_OLD_INTERNAL(free_hdmx_stub_) \ - FT_INTERNAL(load_kern_) \ - FT_INTERNAL(load_gasp_) \ - FT_INTERNAL(load_pclt_) \ - FT_INTERNAL(load_bhed_) \ - FT_DEFINE_DRIVERS_OLD_INTERNAL(set_sbit_strike_stub_) \ - FT_DEFINE_DRIVERS_OLD_INTERNAL(load_sbits_stub_) \ - FT_DEFINE_DRIVERS_OLD_INTERNAL(find_sbit_image_) \ - FT_DEFINE_DRIVERS_OLD_INTERNAL(load_sbit_metrics_) \ - FT_INTERNAL(load_sbit_image_) \ - FT_DEFINE_DRIVERS_OLD_INTERNAL(free_sbits_stub_) \ - FT_INTERNAL(get_psname_) \ - FT_INTERNAL(free_psnames_) \ - FT_DEFINE_DRIVERS_OLD_INTERNAL(load_charmap_stub_) \ - FT_DEFINE_DRIVERS_OLD_INTERNAL(free_charmap_stub_) \ - FT_INTERNAL(get_kerning_) \ - FT_INTERNAL(load_font_dir_) \ - FT_INTERNAL(load_hmtx_) \ - FT_INTERNAL(load_eblc_) \ - FT_INTERNAL(free_eblc_) \ - FT_INTERNAL(set_sbit_strike_) \ - FT_INTERNAL(load_strike_metrics_) \ - FT_INTERNAL(get_metrics_) \ +#define FT_DEFINE_SFNT_INTERFACE( \ + class_, \ + goto_table_, \ + init_face_, \ + load_face_, \ + done_face_, \ + get_interface_, \ + load_any_, \ + load_head_, \ + load_hhea_, \ + load_cmap_, \ + load_maxp_, \ + load_os2_, \ + load_post_, \ + load_name_, \ + free_name_, \ + load_kern_, \ + load_gasp_, \ + load_pclt_, \ + load_bhed_, \ + load_sbit_image_, \ + get_psname_, \ + free_psnames_, \ + get_kerning_, \ + load_font_dir_, \ + load_hmtx_, \ + load_eblc_, \ + free_eblc_, \ + set_sbit_strike_, \ + load_strike_metrics_, \ + get_metrics_ ) \ + static const SFNT_Interface class_ = \ + { \ + goto_table_, \ + init_face_, \ + load_face_, \ + done_face_, \ + get_interface_, \ + load_any_, \ + load_head_, \ + load_hhea_, \ + load_cmap_, \ + load_maxp_, \ + load_os2_, \ + load_post_, \ + load_name_, \ + free_name_, \ + load_kern_, \ + load_gasp_, \ + load_pclt_, \ + load_bhed_, \ + load_sbit_image_, \ + get_psname_, \ + free_psnames_, \ + get_kerning_, \ + load_font_dir_, \ + load_hmtx_, \ + load_eblc_, \ + free_eblc_, \ + set_sbit_strike_, \ + load_strike_metrics_, \ + get_metrics_, \ }; #else /* FT_CONFIG_OPTION_PIC */ -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS -#define FT_DEFINE_DRIVERS_OLD_INTERNAL(a, a_) \ - clazz->a = a_; -#else - #define FT_DEFINE_DRIVERS_OLD_INTERNAL(a, a_) -#endif -#define FT_INTERNAL(a, a_) \ - clazz->a = a_; - -#define FT_DEFINE_SFNT_INTERFACE(class_, \ - goto_table_, init_face_, load_face_, done_face_, get_interface_, \ - load_any_, load_sfnt_header_, load_directory_, load_head_, \ - load_hhea_, load_cmap_, load_maxp_, load_os2_, load_post_, \ - load_name_, free_name_, load_hdmx_stub_, free_hdmx_stub_, \ - load_kern_, load_gasp_, load_pclt_, load_bhed_, \ - set_sbit_strike_stub_, load_sbits_stub_, find_sbit_image_, \ - load_sbit_metrics_, load_sbit_image_, free_sbits_stub_, \ - get_psname_, free_psnames_, load_charmap_stub_, free_charmap_stub_, \ - get_kerning_, load_font_dir_, load_hmtx_, load_eblc_, free_eblc_, \ - set_sbit_strike_, load_strike_metrics_, get_metrics_ ) \ - void \ - FT_Init_Class_##class_( FT_Library library, SFNT_Interface* clazz ) \ - { \ - FT_UNUSED(library); \ - FT_INTERNAL(goto_table,goto_table_) \ - FT_INTERNAL(init_face,init_face_) \ - FT_INTERNAL(load_face,load_face_) \ - FT_INTERNAL(done_face,done_face_) \ - FT_INTERNAL(get_interface,get_interface_) \ - FT_INTERNAL(load_any,load_any_) \ - FT_DEFINE_DRIVERS_OLD_INTERNAL(load_sfnt_header,load_sfnt_header_) \ - FT_DEFINE_DRIVERS_OLD_INTERNAL(load_directory,load_directory_) \ - FT_INTERNAL(load_head,load_head_) \ - FT_INTERNAL(load_hhea,load_hhea_) \ - FT_INTERNAL(load_cmap,load_cmap_) \ - FT_INTERNAL(load_maxp,load_maxp_) \ - FT_INTERNAL(load_os2,load_os2_) \ - FT_INTERNAL(load_post,load_post_) \ - FT_INTERNAL(load_name,load_name_) \ - FT_INTERNAL(free_name,free_name_) \ - FT_DEFINE_DRIVERS_OLD_INTERNAL(load_hdmx_stub,load_hdmx_stub_) \ - FT_DEFINE_DRIVERS_OLD_INTERNAL(free_hdmx_stub,free_hdmx_stub_) \ - FT_INTERNAL(load_kern,load_kern_) \ - FT_INTERNAL(load_gasp,load_gasp_) \ - FT_INTERNAL(load_pclt,load_pclt_) \ - FT_INTERNAL(load_bhed,load_bhed_) \ - FT_DEFINE_DRIVERS_OLD_INTERNAL(set_sbit_strike_stub,set_sbit_strike_stub_) \ - FT_DEFINE_DRIVERS_OLD_INTERNAL(load_sbits_stub,load_sbits_stub_) \ - FT_DEFINE_DRIVERS_OLD_INTERNAL(find_sbit_image,find_sbit_image_) \ - FT_DEFINE_DRIVERS_OLD_INTERNAL(load_sbit_metrics,load_sbit_metrics_) \ - FT_INTERNAL(load_sbit_image,load_sbit_image_) \ - FT_DEFINE_DRIVERS_OLD_INTERNAL(free_sbits_stub,free_sbits_stub_) \ - FT_INTERNAL(get_psname,get_psname_) \ - FT_INTERNAL(free_psnames,free_psnames_) \ - FT_DEFINE_DRIVERS_OLD_INTERNAL(load_charmap_stub,load_charmap_stub_) \ - FT_DEFINE_DRIVERS_OLD_INTERNAL(free_charmap_stub,free_charmap_stub_) \ - FT_INTERNAL(get_kerning,get_kerning_) \ - FT_INTERNAL(load_font_dir,load_font_dir_) \ - FT_INTERNAL(load_hmtx,load_hmtx_) \ - FT_INTERNAL(load_eblc,load_eblc_) \ - FT_INTERNAL(free_eblc,free_eblc_) \ - FT_INTERNAL(set_sbit_strike,set_sbit_strike_) \ - FT_INTERNAL(load_strike_metrics,load_strike_metrics_) \ - FT_INTERNAL(get_metrics,get_metrics_) \ +#define FT_INTERNAL( a, a_ ) \ + clazz->a = a_; + +#define FT_DEFINE_SFNT_INTERFACE( \ + class_, \ + goto_table_, \ + init_face_, \ + load_face_, \ + done_face_, \ + get_interface_, \ + load_any_, \ + load_head_, \ + load_hhea_, \ + load_cmap_, \ + load_maxp_, \ + load_os2_, \ + load_post_, \ + load_name_, \ + free_name_, \ + load_kern_, \ + load_gasp_, \ + load_pclt_, \ + load_bhed_, \ + load_sbit_image_, \ + get_psname_, \ + free_psnames_, \ + get_kerning_, \ + load_font_dir_, \ + load_hmtx_, \ + load_eblc_, \ + free_eblc_, \ + set_sbit_strike_, \ + load_strike_metrics_, \ + get_metrics_ ) \ + void \ + FT_Init_Class_ ## class_( FT_Library library, \ + SFNT_Interface* clazz ) \ + { \ + FT_UNUSED( library ); \ + \ + clazz->goto_table = goto_table_; \ + clazz->init_face = init_face_; \ + clazz->load_face = load_face_; \ + clazz->done_face = done_face_; \ + clazz->get_interface = get_interface_; \ + clazz->load_any = load_any_; \ + clazz->load_head = load_head_; \ + clazz->load_hhea = load_hhea_; \ + clazz->load_cmap = load_cmap_; \ + clazz->load_maxp = load_maxp_; \ + clazz->load_os2 = load_os2_; \ + clazz->load_post = load_post_; \ + clazz->load_name = load_name_; \ + clazz->free_name = free_name_; \ + clazz->load_kern = load_kern_; \ + clazz->load_gasp = load_gasp_; \ + clazz->load_pclt = load_pclt_; \ + clazz->load_bhed = load_bhed_; \ + clazz->load_sbit_image = load_sbit_image_; \ + clazz->get_psname = get_psname_; \ + clazz->free_psnames = free_psnames_; \ + clazz->get_kerning = get_kerning_; \ + clazz->load_font_dir = load_font_dir_; \ + clazz->load_hmtx = load_hmtx_; \ + clazz->load_eblc = load_eblc_; \ + clazz->free_eblc = free_eblc_; \ + clazz->set_sbit_strike = set_sbit_strike_; \ + clazz->load_strike_metrics = load_strike_metrics_; \ + clazz->get_metrics = get_metrics_; \ } #endif /* FT_CONFIG_OPTION_PIC */ diff --git a/include/freetype/internal/t1types.h b/include/internal/t1types.h similarity index 98% rename from include/freetype/internal/t1types.h rename to include/internal/t1types.h index f859de2..e20237c 100644 --- a/include/freetype/internal/t1types.h +++ b/include/internal/t1types.h @@ -5,7 +5,7 @@ /* Basic Type1/Type2 type definitions and interface (specification */ /* only). */ /* */ -/* Copyright 1996-2004, 2006, 2008, 2009, 2011 by */ +/* Copyright 1996-2004, 2006, 2008, 2009, 2011, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -205,10 +205,6 @@ FT_BEGIN_HEADER FT_CharMapRec charmaprecs[2]; FT_CharMap charmaps[2]; -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS - PS_Unicodes unicode_map; -#endif - /* support for Multiple Masters fonts */ PS_Blend blend; diff --git a/include/freetype/internal/tttypes.h b/include/internal/tttypes.h similarity index 94% rename from include/freetype/internal/tttypes.h rename to include/internal/tttypes.h index 57b1731..ad302b8 100644 --- a/include/freetype/internal/tttypes.h +++ b/include/internal/tttypes.h @@ -5,7 +5,7 @@ /* Basic SFNT/TrueType type definitions and interface (specification */ /* only). */ /* */ -/* Copyright 1996-2001, 2002, 2004, 2005, 2006, 2007, 2008 by */ +/* Copyright 1996-2002, 2004-2008, 2012-2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -140,6 +140,75 @@ FT_BEGIN_HEADER /*************************************************************************/ /* */ /* <Struct> */ + /* WOFF_HeaderRec */ + /* */ + /* <Description> */ + /* WOFF file format header. */ + /* */ + /* <Fields> */ + /* See */ + /* */ + /* http://www.w3.org/TR/WOFF/#WOFFHeader */ + /* */ + typedef struct WOFF_HeaderRec_ + { + FT_ULong signature; + FT_ULong flavor; + FT_ULong length; + FT_UShort num_tables; + FT_UShort reserved; + FT_ULong totalSfntSize; + FT_UShort majorVersion; + FT_UShort minorVersion; + FT_ULong metaOffset; + FT_ULong metaLength; + FT_ULong metaOrigLength; + FT_ULong privOffset; + FT_ULong privLength; + + } WOFF_HeaderRec, *WOFF_Header; + + + /*************************************************************************/ + /* */ + /* <Struct> */ + /* WOFF_TableRec */ + /* */ + /* <Description> */ + /* This structure describes a given table of a WOFF font. */ + /* */ + /* <Fields> */ + /* Tag :: A four-bytes tag describing the table. */ + /* */ + /* Offset :: The offset of the table from the start of the WOFF */ + /* font in its resource. */ + /* */ + /* CompLength :: Compressed table length (in bytes). */ + /* */ + /* OrigLength :: Unompressed table length (in bytes). */ + /* */ + /* CheckSum :: The table checksum. This value can be ignored. */ + /* */ + /* OrigOffset :: The uncompressed table file offset. This value gets */ + /* computed while constructing the (uncompressed) SFNT */ + /* header. It is not contained in the WOFF file. */ + /* */ + typedef struct WOFF_TableRec_ + { + FT_ULong Tag; /* table ID */ + FT_ULong Offset; /* table file offset */ + FT_ULong CompLength; /* compressed table length */ + FT_ULong OrigLength; /* uncompressed table length */ + FT_ULong CheckSum; /* uncompressed checksum */ + + FT_ULong OrigOffset; /* uncompressed table file offset */ + /* (not in the WOFF file) */ + } WOFF_TableRec, *WOFF_Table; + + + /*************************************************************************/ + /* */ + /* <Struct> */ /* TT_LongMetricsRec */ /* */ /* <Description> */ @@ -311,87 +380,6 @@ FT_BEGIN_HEADER } TT_GaspRec; -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS - - /*************************************************************************/ - /* */ - /* <Struct> */ - /* TT_HdmxEntryRec */ - /* */ - /* <Description> */ - /* A small structure used to model the pre-computed widths of a given */ - /* size. They are found in the `hdmx' table. */ - /* */ - /* <Fields> */ - /* ppem :: The pixels per EM value at which these metrics apply. */ - /* */ - /* max_width :: The maximum advance width for this metric. */ - /* */ - /* widths :: An array of widths. Note: These are 8-bit bytes. */ - /* */ - typedef struct TT_HdmxEntryRec_ - { - FT_Byte ppem; - FT_Byte max_width; - FT_Byte* widths; - - } TT_HdmxEntryRec, *TT_HdmxEntry; - - - /*************************************************************************/ - /* */ - /* <Struct> */ - /* TT_HdmxRec */ - /* */ - /* <Description> */ - /* A structure used to model the `hdmx' table, which contains */ - /* pre-computed widths for a set of given sizes/dimensions. */ - /* */ - /* <Fields> */ - /* version :: The version number. */ - /* */ - /* num_records :: The number of hdmx records. */ - /* */ - /* records :: An array of hdmx records. */ - /* */ - typedef struct TT_HdmxRec_ - { - FT_UShort version; - FT_Short num_records; - TT_HdmxEntry records; - - } TT_HdmxRec, *TT_Hdmx; - - - /*************************************************************************/ - /* */ - /* <Struct> */ - /* TT_Kern0_PairRec */ - /* */ - /* <Description> */ - /* A structure used to model a kerning pair for the kerning table */ - /* format 0. The engine now loads this table if it finds one in the */ - /* font file. */ - /* */ - /* <Fields> */ - /* left :: The index of the left glyph in pair. */ - /* */ - /* right :: The index of the right glyph in pair. */ - /* */ - /* value :: The kerning distance. A positive value spaces the */ - /* glyphs, a negative one makes them closer. */ - /* */ - typedef struct TT_Kern0_PairRec_ - { - FT_UShort left; /* index of left glyph in pair */ - FT_UShort right; /* index of right glyph in pair */ - FT_FWord value; /* kerning value */ - - } TT_Kern0_PairRec, *TT_Kern0_Pair; - -#endif /* FT_CONFIG_OPTION_OLD_INTERNALS */ - - /*************************************************************************/ /*************************************************************************/ /*************************************************************************/ @@ -434,16 +422,16 @@ FT_BEGIN_HEADER /* */ typedef struct TT_SBit_MetricsRec_ { - FT_Byte height; - FT_Byte width; + FT_UShort height; + FT_UShort width; - FT_Char horiBearingX; - FT_Char horiBearingY; - FT_Byte horiAdvance; + FT_Short horiBearingX; + FT_Short horiBearingY; + FT_UShort horiAdvance; - FT_Char vertBearingX; - FT_Char vertBearingY; - FT_Byte vertAdvance; + FT_Short vertBearingX; + FT_Short vertBearingY; + FT_UShort vertAdvance; } TT_SBit_MetricsRec, *TT_SBit_Metrics; @@ -1060,6 +1048,20 @@ FT_BEGIN_HEADER (*TT_Loader_EndGlyphFunc)( TT_Loader loader ); + typedef enum TT_SbitTableType_ + { + TT_SBIT_TABLE_TYPE_NONE = 0, + TT_SBIT_TABLE_TYPE_EBLC, /* `EBLC' (Microsoft), */ + /* `bloc' (Apple) */ + TT_SBIT_TABLE_TYPE_CBLC, /* `CBLC' (Google) */ + TT_SBIT_TABLE_TYPE_SBIX, /* `sbix' (Apple) */ + + /* do not remove */ + TT_SBIT_TABLE_TYPE_MAX + + } TT_SbitTableType; + + /*************************************************************************/ /* */ /* TrueType Face Type */ @@ -1171,13 +1173,6 @@ FT_BEGIN_HEADER /* */ /* pclt :: The `pclt' SFNT table. */ /* */ - /* num_sbit_strikes :: The number of sbit strikes, i.e., bitmap */ - /* sizes, embedded in this font. */ - /* */ - /* sbit_strikes :: An array of sbit strikes embedded in this */ - /* font. This table is optional in a */ - /* TrueType/OpenType font. */ - /* */ /* num_sbit_scales :: The number of sbit scales for this font. */ /* */ /* sbit_scales :: Array of sbit scales embedded in this */ @@ -1269,9 +1264,6 @@ FT_BEGIN_HEADER TT_HoriHeader horizontal; /* TrueType horizontal header */ TT_MaxProfile max_profile; -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS - FT_ULong max_components; /* stubbed to 0 */ -#endif FT_Bool vertical_info; TT_VertHeader vertical; /* TT Vertical header, if present */ @@ -1308,11 +1300,6 @@ FT_BEGIN_HEADER /* */ /***********************************************************************/ - /* horizontal device metrics */ -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS - TT_HdmxRec hdmx; -#endif - /* grid-fitting and scaling table */ TT_GaspRec gasp; /* the `gasp' table */ @@ -1320,11 +1307,6 @@ FT_BEGIN_HEADER TT_PCLT pclt; /* embedded bitmaps support */ -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS - FT_ULong num_sbit_strikes; - TT_SBit_Strike sbit_strikes; -#endif - FT_ULong num_sbit_scales; TT_SBit_Scale sbit_scales; @@ -1338,12 +1320,6 @@ FT_BEGIN_HEADER /* */ /***********************************************************************/ - /* the glyph locations */ -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS - FT_UShort num_locations_stub; - FT_Long* glyph_locations_stub; -#endif - /* the font program, if any */ FT_ULong font_program_size; FT_Byte* font_program; @@ -1356,13 +1332,6 @@ FT_BEGIN_HEADER FT_ULong cvt_size; FT_Short* cvt; -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS - /* the format 0 kerning table, if any */ - FT_Int num_kern_pairs; - FT_Int kern_table_index; - TT_Kern0_Pair kern_pairs; -#endif - /* A pointer to the bytecode interpreter to use. This is also */ /* used to hook the debugger for the `ttdebug' utility. */ TT_Interpreter interpreter; @@ -1383,11 +1352,8 @@ FT_BEGIN_HEADER const char* postscript_name; - /* since version 2.1.8, but was originally placed after */ - /* `glyph_locations_stub' */ FT_ULong glyf_len; - /* since version 2.1.8, but was originally placed before `extra' */ #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT FT_Bool doblend; GX_Blend blend; @@ -1412,6 +1378,7 @@ FT_BEGIN_HEADER FT_Byte* sbit_table; FT_ULong sbit_table_size; + TT_SbitTableType sbit_table_type; FT_UInt sbit_num_strikes; FT_Byte* kern_table; @@ -1428,6 +1395,13 @@ FT_BEGIN_HEADER FT_ULong horz_metrics_offset; FT_ULong vert_metrics_offset; +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + /* since 2.4.12 */ + FT_ULong sph_found_func_flags; /* special functions found */ + /* for this face */ + FT_Bool sph_compatibility_mode; +#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */ + } TT_FaceRec; @@ -1443,7 +1417,7 @@ FT_BEGIN_HEADER /* <Fields> */ /* memory :: A handle to the memory manager. */ /* */ - /* max_points :: The maximal size in points of the zone. */ + /* max_points :: The maximum size in points of the zone. */ /* */ /* max_contours :: Max size in links contours of the zone. */ /* */ @@ -1505,7 +1479,6 @@ FT_BEGIN_HEADER FT_Int advance; FT_Int linear; FT_Bool linear_def; - FT_Bool preserve_pps; FT_Vector pp1; FT_Vector pp2; diff --git a/include/freetype/t1tables.h b/include/t1tables.h similarity index 76% rename from include/freetype/t1tables.h rename to include/t1tables.h index a14255e..61aefdd 100644 --- a/include/freetype/t1tables.h +++ b/include/t1tables.h @@ -5,7 +5,7 @@ /* Basic Type 1/Type 2 tables definitions and interface (specification */ /* only). */ /* */ -/* Copyright 1996-2004, 2006, 2008, 2009, 2011 by */ +/* Copyright 1996-2004, 2006, 2008, 2009, 2011, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -49,6 +49,26 @@ FT_BEGIN_HEADER /* This section contains the definition of Type 1-specific tables, */ /* including structures related to other PostScript font formats. */ /* */ + /* <Order> */ + /* PS_FontInfoRec */ + /* PS_FontInfo */ + /* PS_PrivateRec */ + /* PS_Private */ + /* */ + /* CID_FaceDictRec */ + /* CID_FaceDict */ + /* CID_FaceInfoRec */ + /* CID_FaceInfo */ + /* */ + /* FT_Has_PS_Glyph_Names */ + /* FT_Get_PS_Font_Info */ + /* FT_Get_PS_Font_Private */ + /* FT_Get_PS_Font_Value */ + /* */ + /* T1_Blend_Flags */ + /* T1_EncodingType */ + /* PS_Dict_Keys */ + /* */ /*************************************************************************/ @@ -190,14 +210,30 @@ FT_BEGIN_HEADER /* given blend dictionary (font info or private). Used to support */ /* Multiple Masters fonts. */ /* */ + /* <Values> */ + /* T1_BLEND_UNDERLINE_POSITION :: */ + /* T1_BLEND_UNDERLINE_THICKNESS :: */ + /* T1_BLEND_ITALIC_ANGLE :: */ + /* T1_BLEND_BLUE_VALUES :: */ + /* T1_BLEND_OTHER_BLUES :: */ + /* T1_BLEND_STANDARD_WIDTH :: */ + /* T1_BLEND_STANDARD_HEIGHT :: */ + /* T1_BLEND_STEM_SNAP_WIDTHS :: */ + /* T1_BLEND_STEM_SNAP_HEIGHTS :: */ + /* T1_BLEND_BLUE_SCALE :: */ + /* T1_BLEND_BLUE_SHIFT :: */ + /* T1_BLEND_FAMILY_BLUES :: */ + /* T1_BLEND_FAMILY_OTHER_BLUES :: */ + /* T1_BLEND_FORCE_BOLD :: */ + /* */ typedef enum T1_Blend_Flags_ { - /*# required fields in a FontInfo blend dictionary */ + /* required fields in a FontInfo blend dictionary */ T1_BLEND_UNDERLINE_POSITION = 0, T1_BLEND_UNDERLINE_THICKNESS, T1_BLEND_ITALIC_ANGLE, - /*# required fields in a Private blend dictionary */ + /* required fields in a Private blend dictionary */ T1_BLEND_BLUE_VALUES, T1_BLEND_OTHER_BLUES, T1_BLEND_STANDARD_WIDTH, @@ -210,15 +246,13 @@ FT_BEGIN_HEADER T1_BLEND_FAMILY_OTHER_BLUES, T1_BLEND_FORCE_BOLD, - /*# never remove */ - T1_BLEND_MAX + T1_BLEND_MAX /* do not remove */ } T1_Blend_Flags; - /* */ - - /*# backwards compatible definitions */ + /* these constants are deprecated; use the corresponding */ + /* `T1_Blend_Flags' values instead */ #define t1_blend_underline_position T1_BLEND_UNDERLINE_POSITION #define t1_blend_underline_thickness T1_BLEND_UNDERLINE_THICKNESS #define t1_blend_italic_angle T1_BLEND_ITALIC_ANGLE @@ -235,6 +269,8 @@ FT_BEGIN_HEADER #define t1_blend_force_bold T1_BLEND_FORCE_BOLD #define t1_blend_max T1_BLEND_MAX + /* */ + /* maximum number of Multiple Masters designs, as defined in the spec */ #define T1_MAX_MM_DESIGNS 16 @@ -333,10 +369,17 @@ FT_BEGIN_HEADER /* */ typedef struct CID_FaceDictRec_* CID_FaceDict; - /* */ - - /* backwards-compatible definition */ + /*************************************************************************/ + /* */ + /* <Struct> */ + /* CID_FontDict */ + /* */ + /* <Description> */ + /* This type is equivalent to @CID_FaceDictRec. It is deprecated but */ + /* kept to maintain source compatibility between various versions of */ + /* FreeType. */ + /* */ typedef CID_FaceDictRec CID_FontDict; @@ -503,6 +546,13 @@ FT_BEGIN_HEADER /* An enumeration describing the `Encoding' entry in a Type 1 */ /* dictionary. */ /* */ + /* <Values> */ + /* T1_ENCODING_TYPE_NONE :: */ + /* T1_ENCODING_TYPE_ARRAY :: */ + /* T1_ENCODING_TYPE_STANDARD :: */ + /* T1_ENCODING_TYPE_ISOLATIN1 :: */ + /* T1_ENCODING_TYPE_EXPERT :: */ + /* */ typedef enum T1_EncodingType_ { T1_ENCODING_TYPE_NONE = 0, @@ -523,6 +573,54 @@ FT_BEGIN_HEADER /* An enumeration used in calls to @FT_Get_PS_Font_Value to identify */ /* the Type~1 dictionary entry to retrieve. */ /* */ + /* <Values> */ + /* PS_DICT_FONT_TYPE :: */ + /* PS_DICT_FONT_MATRIX :: */ + /* PS_DICT_FONT_BBOX :: */ + /* PS_DICT_PAINT_TYPE :: */ + /* PS_DICT_FONT_NAME :: */ + /* PS_DICT_UNIQUE_ID :: */ + /* PS_DICT_NUM_CHAR_STRINGS :: */ + /* PS_DICT_CHAR_STRING_KEY :: */ + /* PS_DICT_CHAR_STRING :: */ + /* PS_DICT_ENCODING_TYPE :: */ + /* PS_DICT_ENCODING_ENTRY :: */ + /* PS_DICT_NUM_SUBRS :: */ + /* PS_DICT_SUBR :: */ + /* PS_DICT_STD_HW :: */ + /* PS_DICT_STD_VW :: */ + /* PS_DICT_NUM_BLUE_VALUES :: */ + /* PS_DICT_BLUE_VALUE :: */ + /* PS_DICT_BLUE_FUZZ :: */ + /* PS_DICT_NUM_OTHER_BLUES :: */ + /* PS_DICT_OTHER_BLUE :: */ + /* PS_DICT_NUM_FAMILY_BLUES :: */ + /* PS_DICT_FAMILY_BLUE :: */ + /* PS_DICT_NUM_FAMILY_OTHER_BLUES :: */ + /* PS_DICT_FAMILY_OTHER_BLUE :: */ + /* PS_DICT_BLUE_SCALE :: */ + /* PS_DICT_BLUE_SHIFT :: */ + /* PS_DICT_NUM_STEM_SNAP_H :: */ + /* PS_DICT_STEM_SNAP_H :: */ + /* PS_DICT_NUM_STEM_SNAP_V :: */ + /* PS_DICT_STEM_SNAP_V :: */ + /* PS_DICT_FORCE_BOLD :: */ + /* PS_DICT_RND_STEM_UP :: */ + /* PS_DICT_MIN_FEATURE :: */ + /* PS_DICT_LEN_IV :: */ + /* PS_DICT_PASSWORD :: */ + /* PS_DICT_LANGUAGE_GROUP :: */ + /* PS_DICT_VERSION :: */ + /* PS_DICT_NOTICE :: */ + /* PS_DICT_FULL_NAME :: */ + /* PS_DICT_FAMILY_NAME :: */ + /* PS_DICT_WEIGHT :: */ + /* PS_DICT_IS_FIXED_PITCH :: */ + /* PS_DICT_UNDERLINE_POSITION :: */ + /* PS_DICT_UNDERLINE_THICKNESS :: */ + /* PS_DICT_FS_TYPE :: */ + /* PS_DICT_ITALIC_ANGLE :: */ + /* */ typedef enum PS_Dict_Keys_ { /* conventionally in the font dictionary */ diff --git a/include/freetype/ttnameid.h b/include/ttnameid.h similarity index 86% rename from include/freetype/ttnameid.h rename to include/ttnameid.h index 66aef04..e65b558 100644 --- a/include/freetype/ttnameid.h +++ b/include/ttnameid.h @@ -4,7 +4,7 @@ /* */ /* TrueType name ID definitions (specification only). */ /* */ -/* Copyright 1996-2002, 2003, 2004, 2006, 2007, 2008 by */ +/* Copyright 1996-2004, 2006-2008, 2012-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -316,11 +316,12 @@ FT_BEGIN_HEADER /* */ /* Possible values of the language identifier field in the name records */ /* of the TTF `name' table if the `platform' identifier code is */ - /* TT_PLATFORM_MACINTOSH. */ + /* TT_PLATFORM_MACINTOSH. These values are also used as return values */ + /* for function @FT_Get_CMap_Language_ID. */ /* */ /* The canonical source for the Apple assigned Language ID's is at */ /* */ - /* http://fonts.apple.com/TTRefMan/RM06/Chap6name.html */ + /* https://developer.apple.com/fonts/TTRefMan/RM06/Chap6name.html */ /* */ #define TT_MAC_LANGID_ENGLISH 0 #define TT_MAC_LANGID_FRENCH 1 @@ -461,45 +462,34 @@ FT_BEGIN_HEADER /* of the TTF `name' table if the `platform' identifier code is */ /* TT_PLATFORM_MICROSOFT. */ /* */ - /* The canonical source for the MS assigned LCID's (seems to) be at */ + /* The canonical source for the MS assigned LCIDs is */ /* */ /* http://www.microsoft.com/globaldev/reference/lcid-all.mspx */ /* */ - /* It used to be at various places, among them */ - /* */ - /* http://www.microsoft.com/typography/OTSPEC/lcid-cp.txt */ - /* http://www.microsoft.com/globaldev/reference/loclanghome.asp */ - /* http://support.microsoft.com/support/kb/articles/Q224/8/04.ASP */ - /* http://msdn.microsoft.com/library/en-us/passport25/ */ - /* NET_Passport_VBScript_Documentation/Single_Sign_In/ */ - /* Advanced_Single_Sign_In/Localization_and_LCIDs.asp */ - /* */ - /* Hopefully, it seems now that the Globaldev site prevails... */ - /* (updated by Antoine, 2004-02-17) */ #define TT_MS_LANGID_ARABIC_GENERAL 0x0001 #define TT_MS_LANGID_ARABIC_SAUDI_ARABIA 0x0401 #define TT_MS_LANGID_ARABIC_IRAQ 0x0801 -#define TT_MS_LANGID_ARABIC_EGYPT 0x0c01 +#define TT_MS_LANGID_ARABIC_EGYPT 0x0C01 #define TT_MS_LANGID_ARABIC_LIBYA 0x1001 #define TT_MS_LANGID_ARABIC_ALGERIA 0x1401 #define TT_MS_LANGID_ARABIC_MOROCCO 0x1801 -#define TT_MS_LANGID_ARABIC_TUNISIA 0x1c01 +#define TT_MS_LANGID_ARABIC_TUNISIA 0x1C01 #define TT_MS_LANGID_ARABIC_OMAN 0x2001 #define TT_MS_LANGID_ARABIC_YEMEN 0x2401 #define TT_MS_LANGID_ARABIC_SYRIA 0x2801 -#define TT_MS_LANGID_ARABIC_JORDAN 0x2c01 +#define TT_MS_LANGID_ARABIC_JORDAN 0x2C01 #define TT_MS_LANGID_ARABIC_LEBANON 0x3001 #define TT_MS_LANGID_ARABIC_KUWAIT 0x3401 #define TT_MS_LANGID_ARABIC_UAE 0x3801 -#define TT_MS_LANGID_ARABIC_BAHRAIN 0x3c01 +#define TT_MS_LANGID_ARABIC_BAHRAIN 0x3C01 #define TT_MS_LANGID_ARABIC_QATAR 0x4001 #define TT_MS_LANGID_BULGARIAN_BULGARIA 0x0402 #define TT_MS_LANGID_CATALAN_SPAIN 0x0403 #define TT_MS_LANGID_CHINESE_GENERAL 0x0004 #define TT_MS_LANGID_CHINESE_TAIWAN 0x0404 #define TT_MS_LANGID_CHINESE_PRC 0x0804 -#define TT_MS_LANGID_CHINESE_HONG_KONG 0x0c04 +#define TT_MS_LANGID_CHINESE_HONG_KONG 0x0C04 #define TT_MS_LANGID_CHINESE_SINGAPORE 0x1004 #if 1 /* this looks like the correct value */ @@ -517,7 +507,7 @@ FT_BEGIN_HEADER #define TT_MS_LANGID_DANISH_DENMARK 0x0406 #define TT_MS_LANGID_GERMAN_GERMANY 0x0407 #define TT_MS_LANGID_GERMAN_SWITZERLAND 0x0807 -#define TT_MS_LANGID_GERMAN_AUSTRIA 0x0c07 +#define TT_MS_LANGID_GERMAN_AUSTRIA 0x0C07 #define TT_MS_LANGID_GERMAN_LUXEMBOURG 0x1007 #define TT_MS_LANGID_GERMAN_LIECHTENSTEI 0x1407 #define TT_MS_LANGID_GREEK_GREECE 0x0408 @@ -530,69 +520,69 @@ FT_BEGIN_HEADER #define TT_MS_LANGID_ENGLISH_GENERAL 0x0009 #define TT_MS_LANGID_ENGLISH_UNITED_STATES 0x0409 #define TT_MS_LANGID_ENGLISH_UNITED_KINGDOM 0x0809 -#define TT_MS_LANGID_ENGLISH_AUSTRALIA 0x0c09 +#define TT_MS_LANGID_ENGLISH_AUSTRALIA 0x0C09 #define TT_MS_LANGID_ENGLISH_CANADA 0x1009 #define TT_MS_LANGID_ENGLISH_NEW_ZEALAND 0x1409 #define TT_MS_LANGID_ENGLISH_IRELAND 0x1809 -#define TT_MS_LANGID_ENGLISH_SOUTH_AFRICA 0x1c09 +#define TT_MS_LANGID_ENGLISH_SOUTH_AFRICA 0x1C09 #define TT_MS_LANGID_ENGLISH_JAMAICA 0x2009 #define TT_MS_LANGID_ENGLISH_CARIBBEAN 0x2409 #define TT_MS_LANGID_ENGLISH_BELIZE 0x2809 -#define TT_MS_LANGID_ENGLISH_TRINIDAD 0x2c09 +#define TT_MS_LANGID_ENGLISH_TRINIDAD 0x2C09 #define TT_MS_LANGID_ENGLISH_ZIMBABWE 0x3009 #define TT_MS_LANGID_ENGLISH_PHILIPPINES 0x3409 #define TT_MS_LANGID_ENGLISH_INDONESIA 0x3809 -#define TT_MS_LANGID_ENGLISH_HONG_KONG 0x3c09 +#define TT_MS_LANGID_ENGLISH_HONG_KONG 0x3C09 #define TT_MS_LANGID_ENGLISH_INDIA 0x4009 #define TT_MS_LANGID_ENGLISH_MALAYSIA 0x4409 #define TT_MS_LANGID_ENGLISH_SINGAPORE 0x4809 -#define TT_MS_LANGID_SPANISH_SPAIN_TRADITIONAL_SORT 0x040a -#define TT_MS_LANGID_SPANISH_MEXICO 0x080a -#define TT_MS_LANGID_SPANISH_SPAIN_INTERNATIONAL_SORT 0x0c0a -#define TT_MS_LANGID_SPANISH_GUATEMALA 0x100a -#define TT_MS_LANGID_SPANISH_COSTA_RICA 0x140a -#define TT_MS_LANGID_SPANISH_PANAMA 0x180a -#define TT_MS_LANGID_SPANISH_DOMINICAN_REPUBLIC 0x1c0a -#define TT_MS_LANGID_SPANISH_VENEZUELA 0x200a -#define TT_MS_LANGID_SPANISH_COLOMBIA 0x240a -#define TT_MS_LANGID_SPANISH_PERU 0x280a -#define TT_MS_LANGID_SPANISH_ARGENTINA 0x2c0a -#define TT_MS_LANGID_SPANISH_ECUADOR 0x300a -#define TT_MS_LANGID_SPANISH_CHILE 0x340a -#define TT_MS_LANGID_SPANISH_URUGUAY 0x380a -#define TT_MS_LANGID_SPANISH_PARAGUAY 0x3c0a -#define TT_MS_LANGID_SPANISH_BOLIVIA 0x400a -#define TT_MS_LANGID_SPANISH_EL_SALVADOR 0x440a -#define TT_MS_LANGID_SPANISH_HONDURAS 0x480a -#define TT_MS_LANGID_SPANISH_NICARAGUA 0x4c0a -#define TT_MS_LANGID_SPANISH_PUERTO_RICO 0x500a -#define TT_MS_LANGID_SPANISH_UNITED_STATES 0x540a +#define TT_MS_LANGID_SPANISH_SPAIN_TRADITIONAL_SORT 0x040A +#define TT_MS_LANGID_SPANISH_MEXICO 0x080A +#define TT_MS_LANGID_SPANISH_SPAIN_INTERNATIONAL_SORT 0x0C0A +#define TT_MS_LANGID_SPANISH_GUATEMALA 0x100A +#define TT_MS_LANGID_SPANISH_COSTA_RICA 0x140A +#define TT_MS_LANGID_SPANISH_PANAMA 0x180A +#define TT_MS_LANGID_SPANISH_DOMINICAN_REPUBLIC 0x1C0A +#define TT_MS_LANGID_SPANISH_VENEZUELA 0x200A +#define TT_MS_LANGID_SPANISH_COLOMBIA 0x240A +#define TT_MS_LANGID_SPANISH_PERU 0x280A +#define TT_MS_LANGID_SPANISH_ARGENTINA 0x2C0A +#define TT_MS_LANGID_SPANISH_ECUADOR 0x300A +#define TT_MS_LANGID_SPANISH_CHILE 0x340A +#define TT_MS_LANGID_SPANISH_URUGUAY 0x380A +#define TT_MS_LANGID_SPANISH_PARAGUAY 0x3C0A +#define TT_MS_LANGID_SPANISH_BOLIVIA 0x400A +#define TT_MS_LANGID_SPANISH_EL_SALVADOR 0x440A +#define TT_MS_LANGID_SPANISH_HONDURAS 0x480A +#define TT_MS_LANGID_SPANISH_NICARAGUA 0x4C0A +#define TT_MS_LANGID_SPANISH_PUERTO_RICO 0x500A +#define TT_MS_LANGID_SPANISH_UNITED_STATES 0x540A /* The following ID blatantly violate MS specs by using a */ /* sublanguage > 0x1F. */ -#define TT_MS_LANGID_SPANISH_LATIN_AMERICA 0xE40aU -#define TT_MS_LANGID_FINNISH_FINLAND 0x040b -#define TT_MS_LANGID_FRENCH_FRANCE 0x040c -#define TT_MS_LANGID_FRENCH_BELGIUM 0x080c -#define TT_MS_LANGID_FRENCH_CANADA 0x0c0c -#define TT_MS_LANGID_FRENCH_SWITZERLAND 0x100c -#define TT_MS_LANGID_FRENCH_LUXEMBOURG 0x140c -#define TT_MS_LANGID_FRENCH_MONACO 0x180c -#define TT_MS_LANGID_FRENCH_WEST_INDIES 0x1c0c -#define TT_MS_LANGID_FRENCH_REUNION 0x200c -#define TT_MS_LANGID_FRENCH_CONGO 0x240c +#define TT_MS_LANGID_SPANISH_LATIN_AMERICA 0xE40AU +#define TT_MS_LANGID_FINNISH_FINLAND 0x040B +#define TT_MS_LANGID_FRENCH_FRANCE 0x040C +#define TT_MS_LANGID_FRENCH_BELGIUM 0x080C +#define TT_MS_LANGID_FRENCH_CANADA 0x0C0C +#define TT_MS_LANGID_FRENCH_SWITZERLAND 0x100C +#define TT_MS_LANGID_FRENCH_LUXEMBOURG 0x140C +#define TT_MS_LANGID_FRENCH_MONACO 0x180C +#define TT_MS_LANGID_FRENCH_WEST_INDIES 0x1C0C +#define TT_MS_LANGID_FRENCH_REUNION 0x200C +#define TT_MS_LANGID_FRENCH_CONGO 0x240C /* which was formerly: */ #define TT_MS_LANGID_FRENCH_ZAIRE TT_MS_LANGID_FRENCH_CONGO -#define TT_MS_LANGID_FRENCH_SENEGAL 0x280c -#define TT_MS_LANGID_FRENCH_CAMEROON 0x2c0c -#define TT_MS_LANGID_FRENCH_COTE_D_IVOIRE 0x300c -#define TT_MS_LANGID_FRENCH_MALI 0x340c -#define TT_MS_LANGID_FRENCH_MOROCCO 0x380c -#define TT_MS_LANGID_FRENCH_HAITI 0x3c0c - /* and another violation of the spec (see 0xE40aU) */ -#define TT_MS_LANGID_FRENCH_NORTH_AFRICA 0xE40cU -#define TT_MS_LANGID_HEBREW_ISRAEL 0x040d -#define TT_MS_LANGID_HUNGARIAN_HUNGARY 0x040e -#define TT_MS_LANGID_ICELANDIC_ICELAND 0x040f +#define TT_MS_LANGID_FRENCH_SENEGAL 0x280C +#define TT_MS_LANGID_FRENCH_CAMEROON 0x2C0C +#define TT_MS_LANGID_FRENCH_COTE_D_IVOIRE 0x300C +#define TT_MS_LANGID_FRENCH_MALI 0x340C +#define TT_MS_LANGID_FRENCH_MOROCCO 0x380C +#define TT_MS_LANGID_FRENCH_HAITI 0x3C0C + /* and another violation of the spec (see 0xE40AU) */ +#define TT_MS_LANGID_FRENCH_NORTH_AFRICA 0xE40CU +#define TT_MS_LANGID_HEBREW_ISRAEL 0x040D +#define TT_MS_LANGID_HUNGARIAN_HUNGARY 0x040E +#define TT_MS_LANGID_ICELANDIC_ICELAND 0x040F #define TT_MS_LANGID_ITALIAN_ITALY 0x0410 #define TT_MS_LANGID_ITALIAN_SWITZERLAND 0x0810 #define TT_MS_LANGID_JAPANESE_JAPAN 0x0411 @@ -610,27 +600,27 @@ FT_BEGIN_HEADER #define TT_MS_LANGID_MOLDAVIAN_MOLDAVIA 0x0818 #define TT_MS_LANGID_RUSSIAN_RUSSIA 0x0419 #define TT_MS_LANGID_RUSSIAN_MOLDAVIA 0x0819 -#define TT_MS_LANGID_CROATIAN_CROATIA 0x041a -#define TT_MS_LANGID_SERBIAN_SERBIA_LATIN 0x081a -#define TT_MS_LANGID_SERBIAN_SERBIA_CYRILLIC 0x0c1a +#define TT_MS_LANGID_CROATIAN_CROATIA 0x041A +#define TT_MS_LANGID_SERBIAN_SERBIA_LATIN 0x081A +#define TT_MS_LANGID_SERBIAN_SERBIA_CYRILLIC 0x0C1A #if 0 /* this used to be this value, but it looks like we were wrong */ -#define TT_MS_LANGID_BOSNIAN_BOSNIA_HERZEGOVINA 0x101a +#define TT_MS_LANGID_BOSNIAN_BOSNIA_HERZEGOVINA 0x101A #else /* current sources say */ -#define TT_MS_LANGID_CROATIAN_BOSNIA_HERZEGOVINA 0x101a -#define TT_MS_LANGID_BOSNIAN_BOSNIA_HERZEGOVINA 0x141a +#define TT_MS_LANGID_CROATIAN_BOSNIA_HERZEGOVINA 0x101A +#define TT_MS_LANGID_BOSNIAN_BOSNIA_HERZEGOVINA 0x141A /* and XPsp2 Platform SDK added (2004-07-26) */ /* Names are shortened to be significant within 40 chars. */ -#define TT_MS_LANGID_SERBIAN_BOSNIA_HERZ_LATIN 0x181a -#define TT_MS_LANGID_SERBIAN_BOSNIA_HERZ_CYRILLIC 0x181a +#define TT_MS_LANGID_SERBIAN_BOSNIA_HERZ_LATIN 0x181A +#define TT_MS_LANGID_SERBIAN_BOSNIA_HERZ_CYRILLIC 0x181A #endif -#define TT_MS_LANGID_SLOVAK_SLOVAKIA 0x041b -#define TT_MS_LANGID_ALBANIAN_ALBANIA 0x041c -#define TT_MS_LANGID_SWEDISH_SWEDEN 0x041d -#define TT_MS_LANGID_SWEDISH_FINLAND 0x081d -#define TT_MS_LANGID_THAI_THAILAND 0x041e -#define TT_MS_LANGID_TURKISH_TURKEY 0x041f +#define TT_MS_LANGID_SLOVAK_SLOVAKIA 0x041B +#define TT_MS_LANGID_ALBANIAN_ALBANIA 0x041C +#define TT_MS_LANGID_SWEDISH_SWEDEN 0x041D +#define TT_MS_LANGID_SWEDISH_FINLAND 0x081D +#define TT_MS_LANGID_THAI_THAILAND 0x041E +#define TT_MS_LANGID_TURKISH_TURKEY 0x041F #define TT_MS_LANGID_URDU_PAKISTAN 0x0420 #define TT_MS_LANGID_URDU_INDIA 0x0820 #define TT_MS_LANGID_INDONESIAN_INDONESIA 0x0421 @@ -643,13 +633,13 @@ FT_BEGIN_HEADER #define TT_MS_LANGID_CLASSIC_LITHUANIAN_LITHUANIA 0x0827 #define TT_MS_LANGID_TAJIK_TAJIKISTAN 0x0428 #define TT_MS_LANGID_FARSI_IRAN 0x0429 -#define TT_MS_LANGID_VIETNAMESE_VIET_NAM 0x042a -#define TT_MS_LANGID_ARMENIAN_ARMENIA 0x042b -#define TT_MS_LANGID_AZERI_AZERBAIJAN_LATIN 0x042c -#define TT_MS_LANGID_AZERI_AZERBAIJAN_CYRILLIC 0x082c -#define TT_MS_LANGID_BASQUE_SPAIN 0x042d -#define TT_MS_LANGID_SORBIAN_GERMANY 0x042e -#define TT_MS_LANGID_MACEDONIAN_MACEDONIA 0x042f +#define TT_MS_LANGID_VIETNAMESE_VIET_NAM 0x042A +#define TT_MS_LANGID_ARMENIAN_ARMENIA 0x042B +#define TT_MS_LANGID_AZERI_AZERBAIJAN_LATIN 0x042C +#define TT_MS_LANGID_AZERI_AZERBAIJAN_CYRILLIC 0x082C +#define TT_MS_LANGID_BASQUE_SPAIN 0x042D +#define TT_MS_LANGID_SORBIAN_GERMANY 0x042E +#define TT_MS_LANGID_MACEDONIAN_MACEDONIA 0x042F #define TT_MS_LANGID_SUTU_SOUTH_AFRICA 0x0430 #define TT_MS_LANGID_TSONGA_SOUTH_AFRICA 0x0431 #define TT_MS_LANGID_TSWANA_SOUTH_AFRICA 0x0432 @@ -660,32 +650,32 @@ FT_BEGIN_HEADER #define TT_MS_LANGID_GEORGIAN_GEORGIA 0x0437 #define TT_MS_LANGID_FAEROESE_FAEROE_ISLANDS 0x0438 #define TT_MS_LANGID_HINDI_INDIA 0x0439 -#define TT_MS_LANGID_MALTESE_MALTA 0x043a +#define TT_MS_LANGID_MALTESE_MALTA 0x043A /* Added by XPsp2 Platform SDK (2004-07-26) */ -#define TT_MS_LANGID_SAMI_NORTHERN_NORWAY 0x043b -#define TT_MS_LANGID_SAMI_NORTHERN_SWEDEN 0x083b -#define TT_MS_LANGID_SAMI_NORTHERN_FINLAND 0x0C3b -#define TT_MS_LANGID_SAMI_LULE_NORWAY 0x103b -#define TT_MS_LANGID_SAMI_LULE_SWEDEN 0x143b -#define TT_MS_LANGID_SAMI_SOUTHERN_NORWAY 0x183b -#define TT_MS_LANGID_SAMI_SOUTHERN_SWEDEN 0x1C3b -#define TT_MS_LANGID_SAMI_SKOLT_FINLAND 0x203b -#define TT_MS_LANGID_SAMI_INARI_FINLAND 0x243b +#define TT_MS_LANGID_SAMI_NORTHERN_NORWAY 0x043B +#define TT_MS_LANGID_SAMI_NORTHERN_SWEDEN 0x083B +#define TT_MS_LANGID_SAMI_NORTHERN_FINLAND 0x0C3B +#define TT_MS_LANGID_SAMI_LULE_NORWAY 0x103B +#define TT_MS_LANGID_SAMI_LULE_SWEDEN 0x143B +#define TT_MS_LANGID_SAMI_SOUTHERN_NORWAY 0x183B +#define TT_MS_LANGID_SAMI_SOUTHERN_SWEDEN 0x1C3B +#define TT_MS_LANGID_SAMI_SKOLT_FINLAND 0x203B +#define TT_MS_LANGID_SAMI_INARI_FINLAND 0x243B /* ... and we also keep our old identifier... */ -#define TT_MS_LANGID_SAAMI_LAPONIA 0x043b +#define TT_MS_LANGID_SAAMI_LAPONIA 0x043B #if 0 /* this seems to be a previous inversion */ -#define TT_MS_LANGID_IRISH_GAELIC_IRELAND 0x043c -#define TT_MS_LANGID_SCOTTISH_GAELIC_UNITED_KINGDOM 0x083c +#define TT_MS_LANGID_IRISH_GAELIC_IRELAND 0x043C +#define TT_MS_LANGID_SCOTTISH_GAELIC_UNITED_KINGDOM 0x083C #else -#define TT_MS_LANGID_SCOTTISH_GAELIC_UNITED_KINGDOM 0x083c -#define TT_MS_LANGID_IRISH_GAELIC_IRELAND 0x043c +#define TT_MS_LANGID_SCOTTISH_GAELIC_UNITED_KINGDOM 0x083C +#define TT_MS_LANGID_IRISH_GAELIC_IRELAND 0x043C #endif -#define TT_MS_LANGID_YIDDISH_GERMANY 0x043d -#define TT_MS_LANGID_MALAY_MALAYSIA 0x043e -#define TT_MS_LANGID_MALAY_BRUNEI_DARUSSALAM 0x083e -#define TT_MS_LANGID_KAZAK_KAZAKSTAN 0x043f +#define TT_MS_LANGID_YIDDISH_GERMANY 0x043D +#define TT_MS_LANGID_MALAY_MALAYSIA 0x043E +#define TT_MS_LANGID_MALAY_BRUNEI_DARUSSALAM 0x083E +#define TT_MS_LANGID_KAZAK_KAZAKSTAN 0x043F #define TT_MS_LANGID_KIRGHIZ_KIRGHIZSTAN /* Cyrillic*/ 0x0440 /* alias declared in Windows 2000 */ #define TT_MS_LANGID_KIRGHIZ_KIRGHIZ_REPUBLIC \ @@ -703,12 +693,12 @@ FT_BEGIN_HEADER #define TT_MS_LANGID_GUJARATI_INDIA 0x0447 #define TT_MS_LANGID_ORIYA_INDIA 0x0448 #define TT_MS_LANGID_TAMIL_INDIA 0x0449 -#define TT_MS_LANGID_TELUGU_INDIA 0x044a -#define TT_MS_LANGID_KANNADA_INDIA 0x044b -#define TT_MS_LANGID_MALAYALAM_INDIA 0x044c -#define TT_MS_LANGID_ASSAMESE_INDIA 0x044d -#define TT_MS_LANGID_MARATHI_INDIA 0x044e -#define TT_MS_LANGID_SANSKRIT_INDIA 0x044f +#define TT_MS_LANGID_TELUGU_INDIA 0x044A +#define TT_MS_LANGID_KANNADA_INDIA 0x044B +#define TT_MS_LANGID_MALAYALAM_INDIA 0x044C +#define TT_MS_LANGID_ASSAMESE_INDIA 0x044D +#define TT_MS_LANGID_MARATHI_INDIA 0x044E +#define TT_MS_LANGID_SANSKRIT_INDIA 0x044F #define TT_MS_LANGID_MONGOLIAN_MONGOLIA /* Cyrillic */ 0x0450 #define TT_MS_LANGID_MONGOLIAN_MONGOLIA_MONGOLIAN 0x0850 #define TT_MS_LANGID_TIBETAN_CHINA 0x0451 @@ -742,13 +732,13 @@ FT_BEGIN_HEADER #define TT_MS_LANGID_SINDHI_INDIA /* Arabic */ 0x0459 #define TT_MS_LANGID_SINDHI_PAKISTAN 0x0859 /* Missing a LCID for Sindhi in Devanagari script */ -#define TT_MS_LANGID_SYRIAC_SYRIA 0x045a -#define TT_MS_LANGID_SINHALESE_SRI_LANKA 0x045b -#define TT_MS_LANGID_CHEROKEE_UNITED_STATES 0x045c -#define TT_MS_LANGID_INUKTITUT_CANADA 0x045d -#define TT_MS_LANGID_AMHARIC_ETHIOPIA 0x045e -#define TT_MS_LANGID_TAMAZIGHT_MOROCCO /* Arabic */ 0x045f -#define TT_MS_LANGID_TAMAZIGHT_MOROCCO_LATIN 0x085f +#define TT_MS_LANGID_SYRIAC_SYRIA 0x045A +#define TT_MS_LANGID_SINHALESE_SRI_LANKA 0x045B +#define TT_MS_LANGID_CHEROKEE_UNITED_STATES 0x045C +#define TT_MS_LANGID_INUKTITUT_CANADA 0x045D +#define TT_MS_LANGID_AMHARIC_ETHIOPIA 0x045E +#define TT_MS_LANGID_TAMAZIGHT_MOROCCO /* Arabic */ 0x045F +#define TT_MS_LANGID_TAMAZIGHT_MOROCCO_LATIN 0x085F /* Missing a LCID for Tifinagh script */ #define TT_MS_LANGID_KASHMIRI_PAKISTAN /* Arabic */ 0x0460 /* Spelled this way by XPsp2 Platform SDK (2004-07-26) */ @@ -768,15 +758,15 @@ FT_BEGIN_HEADER #define TT_MS_LANGID_FULFULDE_NIGERIA 0x0467 #define TT_MS_LANGID_HAUSA_NIGERIA 0x0468 #define TT_MS_LANGID_IBIBIO_NIGERIA 0x0469 -#define TT_MS_LANGID_YORUBA_NIGERIA 0x046a -#define TT_MS_LANGID_QUECHUA_BOLIVIA 0x046b -#define TT_MS_LANGID_QUECHUA_ECUADOR 0x086b -#define TT_MS_LANGID_QUECHUA_PERU 0x0c6b -#define TT_MS_LANGID_SEPEDI_SOUTH_AFRICA 0x046c +#define TT_MS_LANGID_YORUBA_NIGERIA 0x046A +#define TT_MS_LANGID_QUECHUA_BOLIVIA 0x046B +#define TT_MS_LANGID_QUECHUA_ECUADOR 0x086B +#define TT_MS_LANGID_QUECHUA_PERU 0x0C6B +#define TT_MS_LANGID_SEPEDI_SOUTH_AFRICA 0x046C /* Also spelled by XPsp2 Platform SDK (2004-07-26) */ #define TT_MS_LANGID_SOTHO_SOUTHERN_SOUTH_AFRICA \ TT_MS_LANGID_SEPEDI_SOUTH_AFRICA - /* language codes 0x046d, 0x046e and 0x046f are (still) unknown. */ + /* language codes 0x046D, 0x046E and 0x046F are (still) unknown. */ #define TT_MS_LANGID_IGBO_NIGERIA 0x0470 #define TT_MS_LANGID_KANURI_NIGERIA 0x0471 #define TT_MS_LANGID_OROMO_ETHIOPIA 0x0472 @@ -793,12 +783,12 @@ FT_BEGIN_HEADER /* studying). */ #define TT_MS_LANGID_YI_CHINA 0x0478 #define TT_MS_LANGID_PAPIAMENTU_NETHERLANDS_ANTILLES 0x0479 - /* language codes from 0x047a to 0x047f are (still) unknown. */ + /* language codes from 0x047A to 0x047F are (still) unknown. */ #define TT_MS_LANGID_UIGHUR_CHINA 0x0480 #define TT_MS_LANGID_MAORI_NEW_ZEALAND 0x0481 #if 0 /* not deemed useful for fonts */ -#define TT_MS_LANGID_HUMAN_INTERFACE_DEVICE 0x04ff +#define TT_MS_LANGID_HUMAN_INTERFACE_DEVICE 0x04FF #endif @@ -1218,7 +1208,7 @@ FT_BEGIN_HEADER /* */ /* Here some alias #defines in order to be clearer. */ /* */ - /* These are not always #defined to stay within the 31~character limit */ + /* These are not always #defined to stay within the 31~character limit, */ /* which some compilers have. */ /* */ /* Credits go to Dave Hoo <dhoo@flash.net> for pointing out that modern */ diff --git a/include/freetype/tttables.h b/include/tttables.h similarity index 87% rename from include/freetype/tttables.h rename to include/tttables.h index 02236c2..e1d8b05 100644 --- a/include/freetype/tttables.h +++ b/include/tttables.h @@ -5,7 +5,7 @@ /* Basic SFNT/TrueType tables definitions and interface */ /* (specification only). */ /* */ -/* Copyright 1996-2005, 2008-2011 by */ +/* Copyright 1996-2005, 2008-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -48,6 +48,25 @@ FT_BEGIN_HEADER /* This section contains the definition of TrueType-specific tables */ /* as well as some routines used to access and process them. */ /* */ + /* <Order> */ + /* TT_Header */ + /* TT_HoriHeader */ + /* TT_VertHeader */ + /* TT_OS2 */ + /* TT_Postscript */ + /* TT_PCLT */ + /* TT_MaxProfile */ + /* */ + /* FT_Sfnt_Tag */ + /* FT_Get_Sfnt_Table */ + /* FT_Load_Sfnt_Table */ + /* FT_Sfnt_Table_Info */ + /* */ + /* FT_Get_CMap_Language_ID */ + /* FT_Get_CMap_Format */ + /* */ + /* FT_PARAM_TAG_UNPATENTED_HINTING */ + /* */ /*************************************************************************/ @@ -170,8 +189,8 @@ FT_BEGIN_HEADER /* */ /* <Note> */ /* IMPORTANT: The TT_HoriHeader and TT_VertHeader structures should */ - /* be identical except for the names of their fields which */ - /* are different. */ + /* be identical except for the names of their fields, */ + /* which are different. */ /* */ /* This ensures that a single function in the `ttload' */ /* module is able to read both the horizontal and vertical */ @@ -296,8 +315,8 @@ FT_BEGIN_HEADER /* */ /* <Note> */ /* IMPORTANT: The TT_HoriHeader and TT_VertHeader structures should */ - /* be identical except for the names of their fields which */ - /* are different. */ + /* be identical except for the names of their fields, */ + /* which are different. */ /* */ /* This ensures that a single function in the `ttload' */ /* module is able to read both the horizontal and vertical */ @@ -340,12 +359,11 @@ FT_BEGIN_HEADER /* TT_OS2 */ /* */ /* <Description> */ - /* A structure used to model a TrueType OS/2 table. This is the long */ - /* table version. All fields comply to the TrueType specification. */ + /* A structure used to model a TrueType OS/2 table. All fields */ + /* comply to the OpenType specification. */ /* */ - /* Note that we now support old Mac fonts which do not include an */ - /* OS/2 table. In this case, the `version' field is always set to */ - /* 0xFFFF. */ + /* Note that we now support old Mac fonts that do not include an OS/2 */ + /* table. In this case, the `version' field is always set to 0xFFFF. */ /* */ typedef struct TT_OS2_ { @@ -384,12 +402,12 @@ FT_BEGIN_HEADER FT_UShort usWinAscent; FT_UShort usWinDescent; - /* only version 1 tables: */ + /* only version 1 and higher: */ FT_ULong ulCodePageRange1; /* Bits 0-31 */ FT_ULong ulCodePageRange2; /* Bits 32-63 */ - /* only version 2 tables: */ + /* only version 2 and higher: */ FT_Short sxHeight; FT_Short sCapHeight; @@ -397,6 +415,11 @@ FT_BEGIN_HEADER FT_UShort usBreakChar; FT_UShort usMaxContext; + /* only version 5 and higher: */ + + FT_UShort usLowerOpticalPointSize; /* in twips (1/20th points) */ + FT_UShort usUpperOpticalPointSize; /* in twips (1/20th points) */ + } TT_OS2; @@ -465,7 +488,7 @@ FT_BEGIN_HEADER /* TT_MaxProfile */ /* */ /* <Description> */ - /* The maximum profile is a table containing many max values which */ + /* The maximum profile is a table containing many max values, which */ /* can be used to pre-allocate arrays. This ensures that no memory */ /* allocation occurs during a glyph load. */ /* */ @@ -555,21 +578,44 @@ FT_BEGIN_HEADER /* An enumeration used to specify the index of an SFNT table. */ /* Used in the @FT_Get_Sfnt_Table API function. */ /* */ + /* <Values> */ + /* FT_SFNT_HEAD :: To access the font's @TT_Header structure. */ + /* */ + /* FT_SFNT_MAXP :: To access the font's @TT_MaxProfile structure. */ + /* */ + /* FT_SFNT_OS2 :: To access the font's @TT_OS2 structure. */ + /* */ + /* FT_SFNT_HHEA :: To access the font's @TT_HoriHeader structure. */ + /* */ + /* FT_SFNT_VHEA :: To access the font's @TT_VertHeader struture. */ + /* */ + /* FT_SFNT_POST :: To access the font's @TT_Postscript structure. */ + /* */ + /* FT_SFNT_PCLT :: To access the font's @TT_PCLT structure. */ + /* */ typedef enum FT_Sfnt_Tag_ { - ft_sfnt_head = 0, /* TT_Header */ - ft_sfnt_maxp = 1, /* TT_MaxProfile */ - ft_sfnt_os2 = 2, /* TT_OS2 */ - ft_sfnt_hhea = 3, /* TT_HoriHeader */ - ft_sfnt_vhea = 4, /* TT_VertHeader */ - ft_sfnt_post = 5, /* TT_Postscript */ - ft_sfnt_pclt = 6, /* TT_PCLT */ + FT_SFNT_HEAD, + FT_SFNT_MAXP, + FT_SFNT_OS2, + FT_SFNT_HHEA, + FT_SFNT_VHEA, + FT_SFNT_POST, + FT_SFNT_PCLT, - sfnt_max /* internal end mark */ + FT_SFNT_MAX } FT_Sfnt_Tag; - /* */ + /* these constants are deprecated; use the corresponding `FT_Sfnt_Tag' */ + /* values instead */ +#define ft_sfnt_head FT_SFNT_HEAD +#define ft_sfnt_maxp FT_SFNT_MAXP +#define ft_sfnt_os2 FT_SFNT_OS2 +#define ft_sfnt_hhea FT_SFNT_HHEA +#define ft_sfnt_vhea FT_SFNT_VHEA +#define ft_sfnt_post FT_SFNT_POST +#define ft_sfnt_pclt FT_SFNT_PCLT /*************************************************************************/ @@ -600,6 +646,16 @@ FT_BEGIN_HEADER /* by the sfnt, truetype, and opentype drivers. See @FT_Sfnt_Tag for */ /* a list. */ /* */ + /* Here an example how to access the `vhea' table: */ + /* */ + /* { */ + /* TT_VertHeader* vert_header; */ + /* */ + /* */ + /* vert_header = */ + /* (TT_VertHeader*)FT_Get_Sfnt_Table( face, FT_SFNT_VHEA ); */ + /* } */ + /* */ FT_EXPORT( void* ) FT_Get_Sfnt_Table( FT_Face face, FT_Sfnt_Tag tag ); @@ -662,6 +718,12 @@ FT_BEGIN_HEADER * error = FT_Load_Sfnt_Table( face, tag, 0, buffer, &length ); * if ( error ) { ... could not load table ... } * } + * + * Note that structures like @TT_Header or @TT_OS2 can't be used with + * this function; they are limited to @FT_Get_Sfnt_Table. Reason is that + * those structures depend on the processor architecture, with varying + * size (e.g. 32bit vs. 64bit) or order (big endian vs. little endian). + * */ FT_EXPORT( FT_Error ) FT_Load_Sfnt_Table( FT_Face face, @@ -702,7 +764,8 @@ FT_BEGIN_HEADER * FreeType error code. 0~means success. * * @note: - * SFNT tables with length zero are treated as missing. + * While parsing fonts, FreeType handles SFNT tables with length zero as + * missing. * */ FT_EXPORT( FT_Error ) @@ -719,7 +782,7 @@ FT_BEGIN_HEADER /* */ /* <Description> */ /* Return TrueType/sfnt specific cmap language ID. Definitions of */ - /* language ID values are in `freetype/ttnameid.h'. */ + /* language ID values are in `ttnameid.h'. */ /* */ /* <Input> */ /* charmap :: */ @@ -729,6 +792,9 @@ FT_BEGIN_HEADER /* The language ID of `charmap'. If `charmap' doesn't belong to a */ /* TrueType/sfnt face, just return~0 as the default value. */ /* */ + /* For a format~14 cmap (to access Unicode IVS), the return value is */ + /* 0xFFFFFFFF. */ + /* */ FT_EXPORT( FT_ULong ) FT_Get_CMap_Language_ID( FT_CharMap charmap ); diff --git a/include/freetype/tttags.h b/include/tttags.h similarity index 94% rename from include/freetype/tttags.h rename to include/tttags.h index 307ce4b..d59aa19 100644 --- a/include/freetype/tttags.h +++ b/include/tttags.h @@ -4,7 +4,7 @@ /* */ /* Tags for TrueType and OpenType tables (specification only). */ /* */ -/* Copyright 1996-2001, 2004, 2005, 2007, 2008 by */ +/* Copyright 1996-2001, 2004, 2005, 2007, 2008, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -40,6 +40,8 @@ FT_BEGIN_HEADER #define TTAG_bhed FT_MAKE_TAG( 'b', 'h', 'e', 'd' ) #define TTAG_bloc FT_MAKE_TAG( 'b', 'l', 'o', 'c' ) #define TTAG_bsln FT_MAKE_TAG( 'b', 's', 'l', 'n' ) +#define TTAG_CBDT FT_MAKE_TAG( 'C', 'B', 'D', 'T' ) +#define TTAG_CBLC FT_MAKE_TAG( 'C', 'B', 'L', 'C' ) #define TTAG_CFF FT_MAKE_TAG( 'C', 'F', 'F', ' ' ) #define TTAG_CID FT_MAKE_TAG( 'C', 'I', 'D', ' ' ) #define TTAG_cmap FT_MAKE_TAG( 'c', 'm', 'a', 'p' ) @@ -86,6 +88,7 @@ FT_BEGIN_HEADER #define TTAG_post FT_MAKE_TAG( 'p', 'o', 's', 't' ) #define TTAG_prep FT_MAKE_TAG( 'p', 'r', 'e', 'p' ) #define TTAG_prop FT_MAKE_TAG( 'p', 'r', 'o', 'p' ) +#define TTAG_sbix FT_MAKE_TAG( 's', 'b', 'i', 'x' ) #define TTAG_sfnt FT_MAKE_TAG( 's', 'f', 'n', 't' ) #define TTAG_SING FT_MAKE_TAG( 'S', 'I', 'N', 'G' ) #define TTAG_trak FT_MAKE_TAG( 't', 'r', 'a', 'k' ) @@ -97,6 +100,7 @@ FT_BEGIN_HEADER #define TTAG_VDMX FT_MAKE_TAG( 'V', 'D', 'M', 'X' ) #define TTAG_vhea FT_MAKE_TAG( 'v', 'h', 'e', 'a' ) #define TTAG_vmtx FT_MAKE_TAG( 'v', 'm', 't', 'x' ) +#define TTAG_wOFF FT_MAKE_TAG( 'w', 'O', 'F', 'F' ) FT_END_HEADER diff --git a/include/freetype/ttunpat.h b/include/ttunpat.h similarity index 99% rename from include/freetype/ttunpat.h rename to include/ttunpat.h index a016275..bf53ddd 100644 --- a/include/freetype/ttunpat.h +++ b/include/ttunpat.h @@ -48,7 +48,8 @@ FT_BEGIN_HEADER */ #define FT_PARAM_TAG_UNPATENTED_HINTING FT_MAKE_TAG( 'u', 'n', 'p', 'a' ) - /* */ + /* */ + FT_END_HEADER diff --git a/modules.cfg b/modules.cfg index a85378e..4e52594 100644 --- a/modules.cfg +++ b/modules.cfg @@ -1,6 +1,6 @@ # modules.cfg # -# Copyright 2005-2007, 2009-2011 by +# Copyright 2005-2007, 2009-2011, 2013 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -19,7 +19,7 @@ # activate a module, remove the comment character. # # Note that many modules and components are further controlled with macros -# in the file `include/freetype/config/ftoption.h'. +# in the file `include/config/ftoption.h'. #### @@ -85,7 +85,7 @@ HINTING_MODULES += autofit HINTING_MODULES += pshinter # The TrueType hinting engine doesn't have a module of its own but is -# controlled in file include/freetype/config/ftoption.h +# controlled in file include/config/ftoption.h # (TT_CONFIG_OPTION_BYTECODE_INTERPRETER and friends). @@ -106,7 +106,7 @@ RASTER_MODULES += smooth # FreeType's cache sub-system (quite stable but still in beta -- this means # that its public API is subject to change if necessary). See -# include/freetype/ftcache.h. Needs ftglyph.c. +# include/ftcache.h. Needs ftglyph.c. AUX_MODULES += cache # TrueType GX/AAT table validation. Needs ftgxval.c below. @@ -114,17 +114,17 @@ AUX_MODULES += cache # Support for streams compressed with gzip (files with suffix .gz). # -# See include/freetype/ftgzip.h for the API. +# See include/ftgzip.h for the API. AUX_MODULES += gzip # Support for streams compressed with LZW (files with suffix .Z). # -# See include/freetype/ftlzw.h for the API. +# See include/ftlzw.h for the API. AUX_MODULES += lzw # Support for streams compressed with bzip2 (files with suffix .bz2). # -# See include/freetype/ftbzip2.h for the API. +# See include/ftbzip2.h for the API. AUX_MODULES += bzip2 # OpenType table validation. Needs ftotval.c below. @@ -149,95 +149,95 @@ AUX_MODULES += psnames # Exact bounding box calculation. # -# See include/freetype/ftbbox.h for the API. +# See include/ftbbox.h for the API. BASE_EXTENSIONS += ftbbox.c # Access BDF-specific strings. Needs BDF font driver. # -# See include/freetype/ftbdf.h for the API. +# See include/ftbdf.h for the API. BASE_EXTENSIONS += ftbdf.c # Utility functions for converting 1bpp, 2bpp, 4bpp, and 8bpp bitmaps into # 8bpp format, and for emboldening of bitmap glyphs. # -# See include/freetype/ftbitmap.h for the API. +# See include/ftbitmap.h for the API. BASE_EXTENSIONS += ftbitmap.c # Access CID font information. # -# See include/freetype/ftcid.h for the API. +# See include/ftcid.h for the API. BASE_EXTENSIONS += ftcid.c # Access FSType information. Needs fttype1.c. # -# See include/freetype/freetype.h for the API. +# See include/freetype.h for the API. BASE_EXTENSIONS += ftfstype.c # Support for GASP table queries. # -# See include/freetype/ftgasp.h for the API. +# See include/ftgasp.h for the API. BASE_EXTENSIONS += ftgasp.c # Convenience functions to handle glyphs. Needs ftbitmap.c. # -# See include/freetype/ftglyph.h for the API. +# See include/ftglyph.h for the API. BASE_EXTENSIONS += ftglyph.c # Interface for gxvalid module. # -# See include/freetype/ftgxval.h for the API. +# See include/ftgxval.h for the API. BASE_EXTENSIONS += ftgxval.c # Support for LCD color filtering of subpixel bitmaps. # -# See include/freetype/ftlcdfil.h for the API. +# See include/ftlcdfil.h for the API. BASE_EXTENSIONS += ftlcdfil.c # Multiple Master font interface. # -# See include/freetype/ftmm.h for the API. +# See include/ftmm.h for the API. BASE_EXTENSIONS += ftmm.c # Interface for otvalid module. # -# See include/freetype/ftotval.h for the API. +# See include/ftotval.h for the API. BASE_EXTENSIONS += ftotval.c # Support for FT_Face_CheckTrueTypePatents. # -# See include/freetype/freetype.h for the API. +# See include/freetype.h for the API. BASE_EXTENSIONS += ftpatent.c # Interface for accessing PFR-specific data. Needs PFR font driver. # -# See include/freetype/ftpfr.h for the API. +# See include/ftpfr.h for the API. BASE_EXTENSIONS += ftpfr.c # Path stroker. Needs ftglyph.c. # -# See include/freetype/ftstroke.h for the API. +# See include/ftstroke.h for the API. BASE_EXTENSIONS += ftstroke.c # Support for synthetic embolding and slanting of fonts. Needs ftbitmap.c. # -# See include/freetype/ftsynth.h for the API. +# See include/ftsynth.h for the API. BASE_EXTENSIONS += ftsynth.c # Interface to access data specific to PostScript Type 1 and Type 2 (CFF) # fonts. # -# See include/freetype/t1tables.h for the API. +# See include/t1tables.h for the API. BASE_EXTENSIONS += fttype1.c # Interface for accessing data specific to Windows FNT files. Needs winfnt # driver. # -# See include/freetype/ftwinfnt.h for the API. +# See include/ftwinfnt.h for the API. BASE_EXTENSIONS += ftwinfnt.c # Support functions for X11. # -# See include/freetype/ftxf86.h for the API. +# See include/ftxf86.h for the API. BASE_EXTENSIONS += ftxf86.c #### diff --git a/objs/.gitignore b/objs/.gitignore index ad264ce..21b67f6 100644 --- a/objs/.gitignore +++ b/objs/.gitignore @@ -7,3 +7,9 @@ ftoption.h libfreetype.la .libs *.lo +*.o +*.a +debug*/ +release*/ +win32/ +win64/ diff --git a/packaging/freetype.manifest b/packaging/freetype.manifest new file mode 100644 index 0000000..97e8c31 --- /dev/null +++ b/packaging/freetype.manifest @@ -0,0 +1,5 @@ +<manifest> + <request> + <domain name="_"/> + </request> +</manifest> diff --git a/packaging/freetype.spec b/packaging/freetype.spec index b0187f1..7c32def 100644 --- a/packaging/freetype.spec +++ b/packaging/freetype.spec @@ -1,11 +1,14 @@ Name: freetype Summary: A free and portable font rendering engine -Version: 2.4.9 +Version: 2.5.5 Release: 1 Group: System/Libraries -License: FTL or GPLv2+ +License: FTL or GPL-2.0+ URL: http://www.freetype.org Source0: http://download.savannah.gnu.org/releases-noredirect/freetype/freetype-%{version}.tar.gz +Source1001: packaging/freetype.manifest +BuildRequires: which +BuildRequires: pkgconfig(libpng) Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Provides: %{name}-bytecode @@ -41,6 +44,7 @@ FreeType. %setup -q %build +cp %{SOURCE1001} . %configure --disable-static sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' builds/unix/libtool @@ -51,6 +55,8 @@ make %{?_smp_mflags} rm -rf %{buildroot} %makeinstall gnulocaledir=$RPM_BUILD_ROOT%{_datadir}/locale +mkdir -p %{buildroot}/usr/share/license +cat docs/FTL.TXT > %{buildroot}/usr/share/license/%{name} # fix multilib issues @@ -60,9 +66,9 @@ rm -rf %{buildroot} %define wordsize 32 %endif -mv $RPM_BUILD_ROOT%{_includedir}/freetype2/freetype/config/ftconfig.h \ -$RPM_BUILD_ROOT%{_includedir}/freetype2/freetype/config/ftconfig-%{wordsize}.h -cat >$RPM_BUILD_ROOT%{_includedir}/freetype2/freetype/config/ftconfig.h <<EOF +mv $RPM_BUILD_ROOT%{_includedir}/freetype2/config/ftconfig.h \ +$RPM_BUILD_ROOT%{_includedir}/freetype2/config/ftconfig-%{wordsize}.h +cat >$RPM_BUILD_ROOT%{_includedir}/freetype2/config/ftconfig.h <<EOF #ifndef __FTCONFIG_H__MULTILIB #define __FTCONFIG_H__MULTILIB @@ -88,16 +94,19 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %postun -p /sbin/ldconfig %files +%manifest freetype.manifest %defattr(-,root,root,-) %{_libdir}/libfreetype.so.* +/usr/share/license/%{name} %files devel +%manifest freetype.manifest %defattr(-,root,root,-) %dir %{_includedir}/freetype2 %{_datadir}/aclocal/freetype2.m4 %{_includedir}/freetype2/* -%{_includedir}/*.h %{_libdir}/libfreetype.so %{_bindir}/freetype-config %{_libdir}/pkgconfig/*.pc +%{_datadir}/man/man1/* diff --git a/src/Jamfile b/src/Jamfile index 76ee0f4..1cc0685 100644 --- a/src/Jamfile +++ b/src/Jamfile @@ -1,6 +1,6 @@ # FreeType 2 src Jamfile # -# Copyright 2001, 2002 by +# Copyright 2001, 2002, 2013 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -11,7 +11,7 @@ SubDir FT2_TOP $(FT2_SRC_DIR) ; -# The file <freetype/internal/internal.h> is used to define macros that are +# The file <internal/internal.h> is used to define macros that are # later used in #include statements. It needs to be parsed in order to # record these definitions. # diff --git a/src/autofit/afangles.c b/src/autofit/afangles.c index 790af17..f8b095b 100644 --- a/src/autofit/afangles.c +++ b/src/autofit/afangles.c @@ -5,7 +5,7 @@ /* Routines used to compute vector angles with limited accuracy */ /* and very high speed. It also contains sorting routines (body). */ /* */ -/* Copyright 2003-2006, 2011 by */ +/* Copyright 2003-2006, 2011-2012 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -20,66 +20,6 @@ #include "aftypes.h" -#if 0 - - FT_LOCAL_DEF( FT_Int ) - af_corner_is_flat( FT_Pos x_in, - FT_Pos y_in, - FT_Pos x_out, - FT_Pos y_out ) - { - FT_Pos ax = x_in; - FT_Pos ay = y_in; - - FT_Pos d_in, d_out, d_corner; - - - if ( ax < 0 ) - ax = -ax; - if ( ay < 0 ) - ay = -ay; - d_in = ax + ay; - - ax = x_out; - if ( ax < 0 ) - ax = -ax; - ay = y_out; - if ( ay < 0 ) - ay = -ay; - d_out = ax + ay; - - ax = x_out + x_in; - if ( ax < 0 ) - ax = -ax; - ay = y_out + y_in; - if ( ay < 0 ) - ay = -ay; - d_corner = ax + ay; - - return ( d_in + d_out - d_corner ) < ( d_corner >> 4 ); - } - - - FT_LOCAL_DEF( FT_Int ) - af_corner_orientation( FT_Pos x_in, - FT_Pos y_in, - FT_Pos x_out, - FT_Pos y_out ) - { - FT_Pos delta; - - - delta = x_in * y_out - y_in * x_out; - - if ( delta == 0 ) - return 0; - else - return 1 - 2 * ( delta < 0 ); - } - -#endif /* 0 */ - - /* * We are not using `af_angle_atan' anymore, but we keep the source * code below just in case... @@ -255,7 +195,7 @@ { for ( j = i; j > 0; j-- ) { - if ( table[j] > table[j - 1] ) + if ( table[j] >= table[j - 1] ) break; swap = table[j]; @@ -267,18 +207,26 @@ FT_LOCAL_DEF( void ) - af_sort_widths( FT_UInt count, - AF_Width table ) + af_sort_and_quantize_widths( FT_UInt* count, + AF_Width table, + FT_Pos threshold ) { FT_UInt i, j; + FT_UInt cur_idx; + FT_Pos cur_val; + FT_Pos sum; AF_WidthRec swap; - for ( i = 1; i < count; i++ ) + if ( *count == 1 ) + return; + + /* sort */ + for ( i = 1; i < *count; i++ ) { for ( j = i; j > 0; j-- ) { - if ( table[j].org > table[j - 1].org ) + if ( table[j].org >= table[j - 1].org ) break; swap = table[j]; @@ -286,6 +234,51 @@ table[j - 1] = swap; } } + + cur_idx = 0; + cur_val = table[cur_idx].org; + + /* compute and use mean values for clusters not larger than */ + /* `threshold'; this is very primitive and might not yield */ + /* the best result, but normally, using reference character */ + /* `o', `*count' is 2, so the code below is fully sufficient */ + for ( i = 1; i < *count; i++ ) + { + if ( table[i].org - cur_val > threshold || + i == *count - 1 ) + { + sum = 0; + + /* fix loop for end of array */ + if ( table[i].org - cur_val <= threshold && + i == *count - 1 ) + i++; + + for ( j = cur_idx; j < i; j++ ) + { + sum += table[j].org; + table[j].org = 0; + } + table[cur_idx].org = sum / j; + + if ( i < *count - 1 ) + { + cur_idx = i + 1; + cur_val = table[cur_idx].org; + } + } + } + + cur_idx = 1; + + /* compress array to remove zero values */ + for ( i = 1; i < *count; i++ ) + { + if ( table[i].org ) + table[cur_idx++] = table[i]; + } + + *count = cur_idx; } diff --git a/src/autofit/afblue.c b/src/autofit/afblue.c new file mode 100644 index 0000000..811226e --- /dev/null +++ b/src/autofit/afblue.c @@ -0,0 +1,177 @@ +/* This file has been generated by the Perl script `afblue.pl', */ +/* using data from file `afblue.dat'. */ + +/***************************************************************************/ +/* */ +/* afblue.c */ +/* */ +/* Auto-fitter data for blue strings (body). */ +/* */ +/* Copyright 2013 by */ +/* David Turner, Robert Wilhelm, and Werner Lemberg. */ +/* */ +/* This file is part of the FreeType project, and may only be used, */ +/* modified, and distributed under the terms of the FreeType project */ +/* license, LICENSE.TXT. By continuing to use, modify, or distribute */ +/* this file you indicate that you have read the license and */ +/* understand and accept it fully. */ +/* */ +/***************************************************************************/ + + +#include "aftypes.h" + + + FT_LOCAL_ARRAY_DEF( char ) + af_blue_strings[] = + { + /* */ + '\xD0', '\x91', '\xD0', '\x92', '\xD0', '\x95', '\xD0', '\x9F', '\xD0', '\x97', '\xD0', '\x9E', '\xD0', '\xA1', '\xD0', '\xAD', /* БВЕПЗОСЭ */ + '\0', + '\xD0', '\x91', '\xD0', '\x92', '\xD0', '\x95', '\xD0', '\xA8', '\xD0', '\x97', '\xD0', '\x9E', '\xD0', '\xA1', '\xD0', '\xAD', /* БВЕШЗОСЭ */ + '\0', + '\xD1', '\x85', '\xD0', '\xBF', '\xD0', '\xBD', '\xD1', '\x88', '\xD0', '\xB5', '\xD0', '\xB7', '\xD0', '\xBE', '\xD1', '\x81', /* хпншезос */ + '\0', + '\xD1', '\x80', '\xD1', '\x83', '\xD1', '\x84', /* руф */ + '\0', + '\xE0', '\xA4', '\x95', '\xE0', '\xA4', '\xAE', '\xE0', '\xA4', '\x85', '\xE0', '\xA4', '\x86', '\xE0', '\xA4', '\xA5', '\xE0', '\xA4', '\xA7', '\xE0', '\xA4', '\xAD', '\xE0', '\xA4', '\xB6', /* क म अ आ थ ध भ श */ + '\0', + '\xE0', '\xA4', '\x88', '\xE0', '\xA4', '\x90', '\xE0', '\xA4', '\x93', '\xE0', '\xA4', '\x94', '\xE0', '\xA4', '\xBF', '\xE0', '\xA5', '\x80', '\xE0', '\xA5', '\x8B', '\xE0', '\xA5', '\x8C', /* ई ऐ ओ औ ि ी ो ौ */ + '\0', + '\xE0', '\xA4', '\x95', '\xE0', '\xA4', '\xAE', '\xE0', '\xA4', '\x85', '\xE0', '\xA4', '\x86', '\xE0', '\xA4', '\xA5', '\xE0', '\xA4', '\xA7', '\xE0', '\xA4', '\xAD', '\xE0', '\xA4', '\xB6', /* क म अ आ थ ध भ श */ + '\0', + '\xE0', '\xA5', '\x81', '\xE0', '\xA5', '\x83', /* ु ृ */ + '\0', + '\xCE', '\x93', '\xCE', '\x92', '\xCE', '\x95', '\xCE', '\x96', '\xCE', '\x98', '\xCE', '\x9F', '\xCE', '\xA9', /* ΓΒΕΖΘΟΩ */ + '\0', + '\xCE', '\x92', '\xCE', '\x94', '\xCE', '\x96', '\xCE', '\x9E', '\xCE', '\x98', '\xCE', '\x9F', /* ΒΔΖΞΘΟ */ + '\0', + '\xCE', '\xB2', '\xCE', '\xB8', '\xCE', '\xB4', '\xCE', '\xB6', '\xCE', '\xBB', '\xCE', '\xBE', /* βθδζλξ */ + '\0', + '\xCE', '\xB1', '\xCE', '\xB5', '\xCE', '\xB9', '\xCE', '\xBF', '\xCF', '\x80', '\xCF', '\x83', '\xCF', '\x84', '\xCF', '\x89', /* αειοπστω */ + '\0', + '\xCE', '\xB2', '\xCE', '\xB3', '\xCE', '\xB7', '\xCE', '\xBC', '\xCF', '\x81', '\xCF', '\x86', '\xCF', '\x87', '\xCF', '\x88', /* βγημρφχψ */ + '\0', + '\xD7', '\x91', '\xD7', '\x93', '\xD7', '\x94', '\xD7', '\x97', '\xD7', '\x9A', '\xD7', '\x9B', '\xD7', '\x9D', '\xD7', '\xA1', /* בדהחךכםס */ + '\0', + '\xD7', '\x91', '\xD7', '\x98', '\xD7', '\x9B', '\xD7', '\x9D', '\xD7', '\xA1', '\xD7', '\xA6', /* בטכםסצ */ + '\0', + '\xD7', '\xA7', '\xD7', '\x9A', '\xD7', '\x9F', '\xD7', '\xA3', '\xD7', '\xA5', /* קךןףץ */ + '\0', + 'T', 'H', 'E', 'Z', 'O', 'C', 'Q', 'S', /* THEZOCQS */ + '\0', + 'H', 'E', 'Z', 'L', 'O', 'C', 'U', 'S', /* HEZLOCUS */ + '\0', + 'f', 'i', 'j', 'k', 'd', 'b', 'h', /* fijkdbh */ + '\0', + 'x', 'z', 'r', 'o', 'e', 's', 'c', /* xzroesc */ + '\0', + 'p', 'q', 'g', 'j', 'y', /* pqgjy */ + '\0', + '\xE0', '\xB0', '\x87', '\xE0', '\xB0', '\x8C', '\xE0', '\xB0', '\x99', '\xE0', '\xB0', '\x9E', '\xE0', '\xB0', '\xA3', '\xE0', '\xB0', '\xB1', '\xE0', '\xB1', '\xAF', /* ఇ ఌ ఙ ఞ à°£ à°± ౯ */ + '\0', + '\xE0', '\xB0', '\x85', '\xE0', '\xB0', '\x95', '\xE0', '\xB0', '\x9A', '\xE0', '\xB0', '\xB0', '\xE0', '\xB0', '\xBD', '\xE0', '\xB1', '\xA8', '\xE0', '\xB1', '\xAC', /* అ క చ à°° à°½ ౨ ౬ */ +#ifdef AF_CONFIG_OPTION_CJK + '\0', + '\xE4', '\xBB', '\x96', '\xE4', '\xBB', '\xAC', '\xE4', '\xBD', '\xA0', '\xE4', '\xBE', '\x86', '\xE5', '\x80', '\x91', '\xE5', '\x88', '\xB0', '\xE5', '\x92', '\x8C', '\xE5', '\x9C', '\xB0', /* 他们你來們到和地 */ + '\xE5', '\xAF', '\xB9', '\xE5', '\xB0', '\x8D', '\xE5', '\xB0', '\xB1', '\xE5', '\xB8', '\xAD', '\xE6', '\x88', '\x91', '\xE6', '\x97', '\xB6', '\xE6', '\x99', '\x82', '\xE6', '\x9C', '\x83', /* 对對就席我时時會 */ + '\xE6', '\x9D', '\xA5', '\xE7', '\x82', '\xBA', '\xE8', '\x83', '\xBD', '\xE8', '\x88', '\xB0', '\xE8', '\xAA', '\xAA', '\xE8', '\xAF', '\xB4', '\xE8', '\xBF', '\x99', '\xE9', '\x80', '\x99', /* 来為能舰說说这這 */ + '\xE9', '\xBD', '\x8A', '|', /* 齊 | */ + '\xE5', '\x86', '\x9B', '\xE5', '\x90', '\x8C', '\xE5', '\xB7', '\xB2', '\xE6', '\x84', '\xBF', '\xE6', '\x97', '\xA2', '\xE6', '\x98', '\x9F', '\xE6', '\x98', '\xAF', '\xE6', '\x99', '\xAF', /* 军同已愿既星是景 */ + '\xE6', '\xB0', '\x91', '\xE7', '\x85', '\xA7', '\xE7', '\x8E', '\xB0', '\xE7', '\x8F', '\xBE', '\xE7', '\x90', '\x86', '\xE7', '\x94', '\xA8', '\xE7', '\xBD', '\xAE', '\xE8', '\xA6', '\x81', /* 民照现現理用置要 */ + '\xE8', '\xBB', '\x8D', '\xE9', '\x82', '\xA3', '\xE9', '\x85', '\x8D', '\xE9', '\x87', '\x8C', '\xE9', '\x96', '\x8B', '\xE9', '\x9B', '\xB7', '\xE9', '\x9C', '\xB2', '\xE9', '\x9D', '\xA2', /* 軍那配里開雷露面 */ + '\xE9', '\xA1', '\xBE', /* 顾 */ + '\0', + '\xE4', '\xB8', '\xAA', '\xE4', '\xB8', '\xBA', '\xE4', '\xBA', '\xBA', '\xE4', '\xBB', '\x96', '\xE4', '\xBB', '\xA5', '\xE4', '\xBB', '\xAC', '\xE4', '\xBD', '\xA0', '\xE4', '\xBE', '\x86', /* 个为人他以们你來 */ + '\xE5', '\x80', '\x8B', '\xE5', '\x80', '\x91', '\xE5', '\x88', '\xB0', '\xE5', '\x92', '\x8C', '\xE5', '\xA4', '\xA7', '\xE5', '\xAF', '\xB9', '\xE5', '\xB0', '\x8D', '\xE5', '\xB0', '\xB1', /* 個們到和大对對就 */ + '\xE6', '\x88', '\x91', '\xE6', '\x97', '\xB6', '\xE6', '\x99', '\x82', '\xE6', '\x9C', '\x89', '\xE6', '\x9D', '\xA5', '\xE7', '\x82', '\xBA', '\xE8', '\xA6', '\x81', '\xE8', '\xAA', '\xAA', /* 我时時有来為要說 */ + '\xE8', '\xAF', '\xB4', '|', /* 说 | */ + '\xE4', '\xB8', '\xBB', '\xE4', '\xBA', '\x9B', '\xE5', '\x9B', '\xA0', '\xE5', '\xAE', '\x83', '\xE6', '\x83', '\xB3', '\xE6', '\x84', '\x8F', '\xE7', '\x90', '\x86', '\xE7', '\x94', '\x9F', /* 主些因它想意理生 */ + '\xE7', '\x95', '\xB6', '\xE7', '\x9C', '\x8B', '\xE7', '\x9D', '\x80', '\xE7', '\xBD', '\xAE', '\xE8', '\x80', '\x85', '\xE8', '\x87', '\xAA', '\xE8', '\x91', '\x97', '\xE8', '\xA3', '\xA1', /* 當看着置者自著裡 */ + '\xE8', '\xBF', '\x87', '\xE8', '\xBF', '\x98', '\xE8', '\xBF', '\x9B', '\xE9', '\x80', '\xB2', '\xE9', '\x81', '\x8E', '\xE9', '\x81', '\x93', '\xE9', '\x82', '\x84', '\xE9', '\x87', '\x8C', /* 过还进進過道還里 */ + '\xE9', '\x9D', '\xA2', /* 面 */ +#ifdef AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT + '\0', + '\xE4', '\xBA', '\x9B', '\xE4', '\xBB', '\xAC', '\xE4', '\xBD', '\xA0', '\xE4', '\xBE', '\x86', '\xE5', '\x80', '\x91', '\xE5', '\x88', '\xB0', '\xE5', '\x92', '\x8C', '\xE5', '\x9C', '\xB0', /* 些们你來們到和地 */ + '\xE5', '\xA5', '\xB9', '\xE5', '\xB0', '\x86', '\xE5', '\xB0', '\x87', '\xE5', '\xB0', '\xB1', '\xE5', '\xB9', '\xB4', '\xE5', '\xBE', '\x97', '\xE6', '\x83', '\x85', '\xE6', '\x9C', '\x80', /* 她将將就年得情最 */ + '\xE6', '\xA0', '\xB7', '\xE6', '\xA8', '\xA3', '\xE7', '\x90', '\x86', '\xE8', '\x83', '\xBD', '\xE8', '\xAA', '\xAA', '\xE8', '\xAF', '\xB4', '\xE8', '\xBF', '\x99', '\xE9', '\x80', '\x99', /* 样樣理能說说这這 */ + '\xE9', '\x80', '\x9A', '|', /* 通 | */ + '\xE5', '\x8D', '\xB3', '\xE5', '\x90', '\x97', '\xE5', '\x90', '\xA7', '\xE5', '\x90', '\xAC', '\xE5', '\x91', '\xA2', '\xE5', '\x93', '\x81', '\xE5', '\x93', '\x8D', '\xE5', '\x97', '\x8E', /* 即吗吧听呢品响嗎 */ + '\xE5', '\xB8', '\x88', '\xE5', '\xB8', '\xAB', '\xE6', '\x94', '\xB6', '\xE6', '\x96', '\xAD', '\xE6', '\x96', '\xB7', '\xE6', '\x98', '\x8E', '\xE7', '\x9C', '\xBC', '\xE9', '\x96', '\x93', /* 师師收断斷明眼間 */ + '\xE9', '\x97', '\xB4', '\xE9', '\x99', '\x85', '\xE9', '\x99', '\x88', '\xE9', '\x99', '\x90', '\xE9', '\x99', '\xA4', '\xE9', '\x99', '\xB3', '\xE9', '\x9A', '\x8F', '\xE9', '\x9A', '\x9B', /* 间际陈限除陳随際 */ + '\xE9', '\x9A', '\xA8', /* 隨 */ + '\0', + '\xE4', '\xBA', '\x8B', '\xE5', '\x89', '\x8D', '\xE5', '\xAD', '\xB8', '\xE5', '\xB0', '\x86', '\xE5', '\xB0', '\x87', '\xE6', '\x83', '\x85', '\xE6', '\x83', '\xB3', '\xE6', '\x88', '\x96', /* 事前學将將情想或 */ + '\xE6', '\x94', '\xBF', '\xE6', '\x96', '\xAF', '\xE6', '\x96', '\xB0', '\xE6', '\xA0', '\xB7', '\xE6', '\xA8', '\xA3', '\xE6', '\xB0', '\x91', '\xE6', '\xB2', '\x92', '\xE6', '\xB2', '\xA1', /* 政斯新样樣民沒没 */ + '\xE7', '\x84', '\xB6', '\xE7', '\x89', '\xB9', '\xE7', '\x8E', '\xB0', '\xE7', '\x8F', '\xBE', '\xE7', '\x90', '\x83', '\xE7', '\xAC', '\xAC', '\xE7', '\xB6', '\x93', '\xE8', '\xB0', '\x81', /* 然特现現球第經谁 */ + '\xE8', '\xB5', '\xB7', '|', /* èµ· | */ + '\xE4', '\xBE', '\x8B', '\xE5', '\x88', '\xA5', '\xE5', '\x88', '\xAB', '\xE5', '\x88', '\xB6', '\xE5', '\x8A', '\xA8', '\xE5', '\x8B', '\x95', '\xE5', '\x90', '\x97', '\xE5', '\x97', '\x8E', /* 例別别制动動吗嗎 */ + '\xE5', '\xA2', '\x9E', '\xE6', '\x8C', '\x87', '\xE6', '\x98', '\x8E', '\xE6', '\x9C', '\x9D', '\xE6', '\x9C', '\x9F', '\xE6', '\x9E', '\x84', '\xE7', '\x89', '\xA9', '\xE7', '\xA1', '\xAE', /* 增指明朝期构物确 */ + '\xE7', '\xA7', '\x8D', '\xE8', '\xAA', '\xBF', '\xE8', '\xB0', '\x83', '\xE8', '\xB2', '\xBB', '\xE8', '\xB4', '\xB9', '\xE9', '\x82', '\xA3', '\xE9', '\x83', '\xBD', '\xE9', '\x96', '\x93', /* 种調调費费那都間 */ + '\xE9', '\x97', '\xB4', /* 间 */ +#endif /* AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT */ +#endif /* AF_CONFIG_OPTION_CJK */ + '\0', + + }; + + + /* stringsets are specific to styles */ + FT_LOCAL_ARRAY_DEF( AF_Blue_StringRec ) + af_blue_stringsets[] = + { + /* */ + { AF_BLUE_STRING_CYRILLIC_CAPITAL_TOP, AF_BLUE_PROPERTY_LATIN_TOP }, + { AF_BLUE_STRING_CYRILLIC_CAPITAL_BOTTOM, 0 }, + { AF_BLUE_STRING_CYRILLIC_SMALL, AF_BLUE_PROPERTY_LATIN_TOP | + AF_BLUE_PROPERTY_LATIN_X_HEIGHT }, + { AF_BLUE_STRING_CYRILLIC_SMALL, 0 }, + { AF_BLUE_STRING_CYRILLIC_SMALL_DESCENDER, 0 }, + { AF_BLUE_STRING_MAX, 0 }, + { AF_BLUE_STRING_DEVANAGARI_TOP, AF_BLUE_PROPERTY_LATIN_TOP }, + { AF_BLUE_STRING_DEVANAGARI_HEAD, AF_BLUE_PROPERTY_LATIN_TOP }, + { AF_BLUE_STRING_DEVANAGARI_BASE, AF_BLUE_PROPERTY_LATIN_TOP | + AF_BLUE_PROPERTY_LATIN_NEUTRAL | + AF_BLUE_PROPERTY_LATIN_X_HEIGHT }, + { AF_BLUE_STRING_DEVANAGARI_BASE, 0 }, + { AF_BLUE_STRING_DEVANAGARI_BOTTOM, 0 }, + { AF_BLUE_STRING_MAX, 0 }, + { AF_BLUE_STRING_GREEK_CAPITAL_TOP, AF_BLUE_PROPERTY_LATIN_TOP }, + { AF_BLUE_STRING_GREEK_CAPITAL_BOTTOM, 0 }, + { AF_BLUE_STRING_GREEK_SMALL_BETA_TOP, AF_BLUE_PROPERTY_LATIN_TOP }, + { AF_BLUE_STRING_GREEK_SMALL, AF_BLUE_PROPERTY_LATIN_TOP | + AF_BLUE_PROPERTY_LATIN_X_HEIGHT }, + { AF_BLUE_STRING_GREEK_SMALL, 0 }, + { AF_BLUE_STRING_GREEK_SMALL_DESCENDER, 0 }, + { AF_BLUE_STRING_MAX, 0 }, + { AF_BLUE_STRING_HEBREW_TOP, AF_BLUE_PROPERTY_LATIN_TOP | + AF_BLUE_PROPERTY_LATIN_LONG }, + { AF_BLUE_STRING_HEBREW_BOTTOM, 0 }, + { AF_BLUE_STRING_HEBREW_DESCENDER, 0 }, + { AF_BLUE_STRING_MAX, 0 }, + { AF_BLUE_STRING_LATIN_CAPITAL_TOP, AF_BLUE_PROPERTY_LATIN_TOP }, + { AF_BLUE_STRING_LATIN_CAPITAL_BOTTOM, 0 }, + { AF_BLUE_STRING_LATIN_SMALL_F_TOP, AF_BLUE_PROPERTY_LATIN_TOP }, + { AF_BLUE_STRING_LATIN_SMALL, AF_BLUE_PROPERTY_LATIN_TOP | + AF_BLUE_PROPERTY_LATIN_X_HEIGHT }, + { AF_BLUE_STRING_LATIN_SMALL, 0 }, + { AF_BLUE_STRING_LATIN_SMALL_DESCENDER, 0 }, + { AF_BLUE_STRING_MAX, 0 }, + { AF_BLUE_STRING_TELUGU_TOP, AF_BLUE_PROPERTY_LATIN_TOP }, + { AF_BLUE_STRING_TELUGU_BOTTOM, 0 }, + { AF_BLUE_STRING_MAX, 0 }, +#ifdef AF_CONFIG_OPTION_CJK + { AF_BLUE_STRING_CJK_TOP, AF_BLUE_PROPERTY_CJK_TOP }, + { AF_BLUE_STRING_CJK_BOTTOM, 0 }, +#ifdef AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT + { AF_BLUE_STRING_CJK_LEFT, AF_BLUE_PROPERTY_CJK_HORIZ }, + { AF_BLUE_STRING_CJK_RIGHT, AF_BLUE_PROPERTY_CJK_HORIZ | + AF_BLUE_PROPERTY_CJK_RIGHT }, +#endif /* AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT */ + { AF_BLUE_STRING_MAX, 0 }, +#endif /* AF_CONFIG_OPTION_CJK */ + + }; + + +/* END */ diff --git a/src/autofit/afblue.cin b/src/autofit/afblue.cin new file mode 100644 index 0000000..c6762be --- /dev/null +++ b/src/autofit/afblue.cin @@ -0,0 +1,39 @@ +/***************************************************************************/ +/* */ +/* afblue.c */ +/* */ +/* Auto-fitter data for blue strings (body). */ +/* */ +/* Copyright 2013 by */ +/* David Turner, Robert Wilhelm, and Werner Lemberg. */ +/* */ +/* This file is part of the FreeType project, and may only be used, */ +/* modified, and distributed under the terms of the FreeType project */ +/* license, LICENSE.TXT. By continuing to use, modify, or distribute */ +/* this file you indicate that you have read the license and */ +/* understand and accept it fully. */ +/* */ +/***************************************************************************/ + + +#include "aftypes.h" + + + FT_LOCAL_ARRAY_DEF( char ) + af_blue_strings[] = + { + /* */ +@AF_BLUE_STRINGS_ARRAY@ + }; + + + /* stringsets are specific to styles */ + FT_LOCAL_ARRAY_DEF( AF_Blue_StringRec ) + af_blue_stringsets[] = + { + /* */ +@AF_BLUE_STRINGSETS_ARRAY@ + }; + + +/* END */ diff --git a/src/autofit/afblue.dat b/src/autofit/afblue.dat new file mode 100644 index 0000000..3f98c13 --- /dev/null +++ b/src/autofit/afblue.dat @@ -0,0 +1,337 @@ +// afblue.dat +// +// Auto-fitter data for blue strings. +// +// Copyright 2013, 2014 by +// David Turner, Robert Wilhelm, and Werner Lemberg. +// +// This file is part of the FreeType project, and may only be used, +// modified, and distributed under the terms of the FreeType project +// license, LICENSE.TXT. By continuing to use, modify, or distribute +// this file you indicate that you have read the license and +// understand and accept it fully. + + +// This file contains data specific to blue zones. It gets processed by +// a script to simulate `jagged arrays', with enumeration values holding +// offsets into the arrays. +// +// The format of the file is rather simple: A section starts with three +// labels separated by whitespace and followed by a colon (everything in a +// single line); the first label gives the name of the enumeration template, +// the second the name of the array template, and the third the name of the +// `maximum' template, holding the size of the largest array element. The +// script then fills the corresponding templates (indicated by `@' +// characters around the name). +// +// A section contains one or more data records. Each data record consists +// of two or more lines. The first line holds the enumeration name, and the +// remaining lines the corresponding array data. +// +// There are two possible representations for array data. +// +// - A string of characters in UTF-8 encoding enclosed in double quotes, +// using C syntax. There can be only one string per line, thus the +// starting and ending double quote must be the first and last character +// in the line, respectively, ignoring whitespace before and after the +// string. Space characters within the string are ignored too. If there +// are multiple strings (in multiple lines), they are concatenated to a +// single string. In the output, a string gets represented as a series of +// singles bytes, followed by a zero byte. The enumeration values simply +// hold byte offsets to the start of the corresponding strings. +// +// - Data blocks enclosed in balanced braces, which get copied verbatim and +// which can span multiple lines. The opening brace of a block must be +// the first character of a line (ignoring whitespace), and the closing +// brace the last (ignoring whitespace also). The script appends a comma +// character after each block and counts the number of blocks to set the +// enumeration values. +// +// A section can contain either strings only or data blocks only. +// +// A comment line starts with `//'; it gets removed. A preprocessor +// directive line (using the standard syntax of `cpp') starts with `#' and +// gets copied verbatim to both the enumeration and the array. Whitespace +// outside of a string is insignificant. +// +// Preprocessor directives are ignored while the script computes maximum +// values; this essentially means that the maximum values can easily be too +// large. Given that the purpose of those values is to create local +// fixed-size arrays at compile time for further processing of the blue zone +// data, this isn't a problem. Note the the final zero byte of a string is +// not counted. Note also that the count holds the number of UTF-8 encoded +// characters, not bytes. + + +// The blue zone string data, to be used in the blue stringsets below. + +AF_BLUE_STRING_ENUM AF_BLUE_STRINGS_ARRAY AF_BLUE_STRING_MAX_LEN: + + AF_BLUE_STRING_CYRILLIC_CAPITAL_TOP + "БВЕПЗОСЭ" + AF_BLUE_STRING_CYRILLIC_CAPITAL_BOTTOM + "БВЕШЗОСЭ" + AF_BLUE_STRING_CYRILLIC_SMALL + "хпншезос" + AF_BLUE_STRING_CYRILLIC_SMALL_DESCENDER + "руф" + + // we separate the letters with spaces to avoid ligatures; + // this is just for convenience to simplify reading + AF_BLUE_STRING_DEVANAGARI_BASE + "क म अ आ थ ध भ श" + AF_BLUE_STRING_DEVANAGARI_TOP + "ई ऐ ओ औ ि ी ो ौ" + // note that some fonts have extreme variation in the height of the + // round head elements; for this reason we also define the `base' + // blue zone, which must be always present + AF_BLUE_STRING_DEVANAGARI_HEAD + "क म अ आ थ ध भ श" + AF_BLUE_STRING_DEVANAGARI_BOTTOM + "ु ृ" + + AF_BLUE_STRING_GREEK_CAPITAL_TOP + "ΓΒΕΖΘΟΩ" + AF_BLUE_STRING_GREEK_CAPITAL_BOTTOM + "ΒΔΖΞΘΟ" + AF_BLUE_STRING_GREEK_SMALL_BETA_TOP + "βθδζλξ" + AF_BLUE_STRING_GREEK_SMALL + "αειοπστω" + AF_BLUE_STRING_GREEK_SMALL_DESCENDER + "βγημρφχψ" + + AF_BLUE_STRING_HEBREW_TOP + "בדהחךכםס" + AF_BLUE_STRING_HEBREW_BOTTOM + "בטכםסצ" + AF_BLUE_STRING_HEBREW_DESCENDER + "קךןףץ" + + AF_BLUE_STRING_LATIN_CAPITAL_TOP + "THEZOCQS" + AF_BLUE_STRING_LATIN_CAPITAL_BOTTOM + "HEZLOCUS" + AF_BLUE_STRING_LATIN_SMALL_F_TOP + "fijkdbh" + AF_BLUE_STRING_LATIN_SMALL + "xzroesc" + AF_BLUE_STRING_LATIN_SMALL_DESCENDER + "pqgjy" + + // we separate the letters with spaces to avoid ligatures; + // this is just for convenience to simplify reading + AF_BLUE_STRING_TELUGU_TOP + "ఇ ఌ ఙ ఞ à°£ à°± ౯" + + AF_BLUE_STRING_TELUGU_BOTTOM + "అ క చ à°° à°½ ౨ ౬" + +#ifdef AF_CONFIG_OPTION_CJK + + AF_BLUE_STRING_CJK_TOP + "他们你來們到和地" + "对對就席我时時會" + "来為能舰說说这這" + "齊 |" + "军同已愿既星是景" + "民照现現理用置要" + "軍那配里開雷露面" + "顾" + AF_BLUE_STRING_CJK_BOTTOM + "个为人他以们你來" + "個們到和大对對就" + "我时時有来為要說" + "说 |" + "主些因它想意理生" + "當看着置者自著裡" + "过还进進過道還里" + "面" + +#ifdef AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT + + AF_BLUE_STRING_CJK_LEFT + "些们你來們到和地" + "她将將就年得情最" + "样樣理能說说这這" + "通 |" + "即吗吧听呢品响嗎" + "师師收断斷明眼間" + "间际陈限除陳随際" + "隨" + AF_BLUE_STRING_CJK_RIGHT + "事前學将將情想或" + "政斯新样樣民沒没" + "然特现現球第經谁" + "èµ· |" + "例別别制动動吗嗎" + "增指明朝期构物确" + "种調调費费那都間" + "间" + +#endif /* AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT */ + +#endif /* AF_CONFIG_OPTION_CJK */ + + +// The blue zone stringsets, as used in the script styles, cf. `afstyles.h'. +// +// The AF_BLUE_PROPERTY_XXX flags are defined in `afblue.h'; here some +// explanations. +// +// A blue zone in general is defined by a reference and an overshoot line. +// During the hinting process, all coordinate values between those two lines +// are set equal to the reference value, provided that the blue zone is not +// wider than 0.75 pixels (otherwise the blue zone gets ignored). All +// entries must have `AF_BLUE_STRING_MAX' as the final line. +// +// During the glyph analysis, edges are sorted from bottom to top, and then +// sequentially checked, edge by edge, against the blue zones in the order +// given below. +// +// +// latin auto-hinter +// ----------------- +// +// Characters in a blue string are automatically classified as having a flat +// (reference) or a round (overshoot) extremum. The blue zone is then set +// up by the mean values of all flat extrema and all round extrema, +// respectively. Only horizontal blue zones (i.e., adjusting vertical +// coordinate values) are supported. +// +// For the latin auto-hinter, the overshoot should be larger than the +// reference for top zones, and vice versa for bottom zones. +// +// LATIN_TOP +// Take the maximum flat and round coordinate values of the blue string +// characters for computing the blue zone's reference and overshoot +// values. +// +// If not set, take the minimum values. +// +// LATIN_NEUTRAL +// Ignore round extrema and define the blue zone with flat values only. +// Both top and bottom of contours can match. This is useful for +// scripts like Devanagari where vowel signs attach to the base +// character and are implemented as components of composite glyphs. +// +// If not set, both round and flat extrema are taken into account. +// Additionally, only the top or the bottom of a contour can match, +// depending on the LATIN_TOP flag. +// +// Neutral blue zones should always follow non-neutral blue zones. +// +// LATIN_X_HEIGHT +// Scale all glyphs vertically from the corresponding script to make the +// reference line of this blue zone align on the grid. The scaling +// takes place before all other blue zones get aligned to the grid. +// Only one blue character string of a script style can have this flag. +// +// LATIN_LONG +// Apply an additional constraint for blue zone values: Don't +// necessarily use the extremum as-is but a segment of the topmost (or +// bottommost) contour that is longer than a heuristic threshold, and +// which is not too far away vertically from the real extremum. This +// ensures that small bumps in the outline are ignored (for example, the +// `vertical serifs' found in many Hebrew glyph designs). +// +// The segment must be at least EM/25 font units long, and the distance +// to the extremum must be smaller than EM/4. +// +// +// cjk auto-hinter +// --------------- +// +// Characters in a blue string are *not* automatically classified. Instead, +// first come the characters used for the overshoot value, then the +// character `|', then the characters used for the reference value. The +// blue zone is then set up by the mean values of all reference values and +// all overshoot values, respectively. Both horizontal and vertical blue +// zones (i.e., adjusting vertical and horizontal coordinate values, +// respectively) are supported. +// +// For the cjk auto-hinter, the overshoot should be smaller than the +// reference for top zones, and vice versa for bottom zones. +// +// CJK_TOP +// Take the maximum flat and round coordinate values of the blue string +// characters. If not set, take the minimum values. +// +// CJK_RIGHT +// A synonym for CJK_TOP. If CJK_HORIZ is set, this flag indicates the +// right blue zone, taking horizontal maximum values. +// +// CJK_HORIZ +// Define a blue zone for horizontal hinting (i.e., vertical blue +// zones). If not set, this is a blue zone for vertical hinting. + + +AF_BLUE_STRINGSET_ENUM AF_BLUE_STRINGSETS_ARRAY AF_BLUE_STRINGSET_MAX_LEN: + + AF_BLUE_STRINGSET_CYRL + { AF_BLUE_STRING_CYRILLIC_CAPITAL_TOP, AF_BLUE_PROPERTY_LATIN_TOP } + { AF_BLUE_STRING_CYRILLIC_CAPITAL_BOTTOM, 0 } + { AF_BLUE_STRING_CYRILLIC_SMALL, AF_BLUE_PROPERTY_LATIN_TOP | + AF_BLUE_PROPERTY_LATIN_X_HEIGHT } + { AF_BLUE_STRING_CYRILLIC_SMALL, 0 } + { AF_BLUE_STRING_CYRILLIC_SMALL_DESCENDER, 0 } + { AF_BLUE_STRING_MAX, 0 } + + AF_BLUE_STRINGSET_DEVA + { AF_BLUE_STRING_DEVANAGARI_TOP, AF_BLUE_PROPERTY_LATIN_TOP } + { AF_BLUE_STRING_DEVANAGARI_HEAD, AF_BLUE_PROPERTY_LATIN_TOP } + { AF_BLUE_STRING_DEVANAGARI_BASE, AF_BLUE_PROPERTY_LATIN_TOP | + AF_BLUE_PROPERTY_LATIN_NEUTRAL | + AF_BLUE_PROPERTY_LATIN_X_HEIGHT } + { AF_BLUE_STRING_DEVANAGARI_BASE, 0 } + { AF_BLUE_STRING_DEVANAGARI_BOTTOM, 0 } + { AF_BLUE_STRING_MAX, 0 } + + AF_BLUE_STRINGSET_GREK + { AF_BLUE_STRING_GREEK_CAPITAL_TOP, AF_BLUE_PROPERTY_LATIN_TOP } + { AF_BLUE_STRING_GREEK_CAPITAL_BOTTOM, 0 } + { AF_BLUE_STRING_GREEK_SMALL_BETA_TOP, AF_BLUE_PROPERTY_LATIN_TOP } + { AF_BLUE_STRING_GREEK_SMALL, AF_BLUE_PROPERTY_LATIN_TOP | + AF_BLUE_PROPERTY_LATIN_X_HEIGHT } + { AF_BLUE_STRING_GREEK_SMALL, 0 } + { AF_BLUE_STRING_GREEK_SMALL_DESCENDER, 0 } + { AF_BLUE_STRING_MAX, 0 } + + AF_BLUE_STRINGSET_HEBR + { AF_BLUE_STRING_HEBREW_TOP, AF_BLUE_PROPERTY_LATIN_TOP | + AF_BLUE_PROPERTY_LATIN_LONG } + { AF_BLUE_STRING_HEBREW_BOTTOM, 0 } + { AF_BLUE_STRING_HEBREW_DESCENDER, 0 } + { AF_BLUE_STRING_MAX, 0 } + + AF_BLUE_STRINGSET_LATN + { AF_BLUE_STRING_LATIN_CAPITAL_TOP, AF_BLUE_PROPERTY_LATIN_TOP } + { AF_BLUE_STRING_LATIN_CAPITAL_BOTTOM, 0 } + { AF_BLUE_STRING_LATIN_SMALL_F_TOP, AF_BLUE_PROPERTY_LATIN_TOP } + { AF_BLUE_STRING_LATIN_SMALL, AF_BLUE_PROPERTY_LATIN_TOP | + AF_BLUE_PROPERTY_LATIN_X_HEIGHT } + { AF_BLUE_STRING_LATIN_SMALL, 0 } + { AF_BLUE_STRING_LATIN_SMALL_DESCENDER, 0 } + { AF_BLUE_STRING_MAX, 0 } + + AF_BLUE_STRINGSET_TELU + { AF_BLUE_STRING_TELUGU_TOP, AF_BLUE_PROPERTY_LATIN_TOP } + { AF_BLUE_STRING_TELUGU_BOTTOM, 0 } + { AF_BLUE_STRING_MAX, 0 } + +#ifdef AF_CONFIG_OPTION_CJK + + AF_BLUE_STRINGSET_HANI + { AF_BLUE_STRING_CJK_TOP, AF_BLUE_PROPERTY_CJK_TOP } + { AF_BLUE_STRING_CJK_BOTTOM, 0 } +#ifdef AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT + { AF_BLUE_STRING_CJK_LEFT, AF_BLUE_PROPERTY_CJK_HORIZ } + { AF_BLUE_STRING_CJK_RIGHT, AF_BLUE_PROPERTY_CJK_HORIZ | + AF_BLUE_PROPERTY_CJK_RIGHT } +#endif /* AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT */ + { AF_BLUE_STRING_MAX, 0 } + +#endif /* AF_CONFIG_OPTION_CJK */ + + +// END diff --git a/src/autofit/afblue.h b/src/autofit/afblue.h new file mode 100644 index 0000000..a861841 --- /dev/null +++ b/src/autofit/afblue.h @@ -0,0 +1,203 @@ +/* This file has been generated by the Perl script `afblue.pl', */ +/* using data from file `afblue.dat'. */ + +/***************************************************************************/ +/* */ +/* afblue.h */ +/* */ +/* Auto-fitter data for blue strings (specification). */ +/* */ +/* Copyright 2013, 2014 by */ +/* David Turner, Robert Wilhelm, and Werner Lemberg. */ +/* */ +/* This file is part of the FreeType project, and may only be used, */ +/* modified, and distributed under the terms of the FreeType project */ +/* license, LICENSE.TXT. By continuing to use, modify, or distribute */ +/* this file you indicate that you have read the license and */ +/* understand and accept it fully. */ +/* */ +/***************************************************************************/ + + +#ifndef __AFBLUE_H__ +#define __AFBLUE_H__ + + +FT_BEGIN_HEADER + + + /* an auxiliary macro to decode a UTF-8 character -- since we only use */ + /* hard-coded, self-converted data, no error checking is performed */ +#define GET_UTF8_CHAR( ch, p ) \ + ch = (unsigned char)*p++; \ + if ( ch >= 0x80 ) \ + { \ + FT_UInt len; \ + \ + \ + if ( ch < 0xE0 ) \ + { \ + len = 1; \ + ch &= 0x1F; \ + } \ + else if ( ch < 0xF0 ) \ + { \ + len = 2; \ + ch &= 0x0F; \ + } \ + else \ + { \ + len = 3; \ + ch &= 0x07; \ + } \ + \ + for ( ; len > 0; len-- ) \ + ch = ( ch << 6 ) | ( *p++ & 0x3F ); \ + } + + + /*************************************************************************/ + /*************************************************************************/ + /***** *****/ + /***** B L U E S T R I N G S *****/ + /***** *****/ + /*************************************************************************/ + /*************************************************************************/ + + /* At the bottommost level, we define strings for finding blue zones. */ + + +#define AF_BLUE_STRING_MAX_LEN 51 + + /* The AF_Blue_String enumeration values are offsets into the */ + /* `af_blue_strings' array. */ + + typedef enum AF_Blue_String_ + { + AF_BLUE_STRING_CYRILLIC_CAPITAL_TOP = 0, + AF_BLUE_STRING_CYRILLIC_CAPITAL_BOTTOM = 17, + AF_BLUE_STRING_CYRILLIC_SMALL = 34, + AF_BLUE_STRING_CYRILLIC_SMALL_DESCENDER = 51, + AF_BLUE_STRING_DEVANAGARI_BASE = 58, + AF_BLUE_STRING_DEVANAGARI_TOP = 83, + AF_BLUE_STRING_DEVANAGARI_HEAD = 108, + AF_BLUE_STRING_DEVANAGARI_BOTTOM = 133, + AF_BLUE_STRING_GREEK_CAPITAL_TOP = 140, + AF_BLUE_STRING_GREEK_CAPITAL_BOTTOM = 155, + AF_BLUE_STRING_GREEK_SMALL_BETA_TOP = 168, + AF_BLUE_STRING_GREEK_SMALL = 181, + AF_BLUE_STRING_GREEK_SMALL_DESCENDER = 198, + AF_BLUE_STRING_HEBREW_TOP = 215, + AF_BLUE_STRING_HEBREW_BOTTOM = 232, + AF_BLUE_STRING_HEBREW_DESCENDER = 245, + AF_BLUE_STRING_LATIN_CAPITAL_TOP = 256, + AF_BLUE_STRING_LATIN_CAPITAL_BOTTOM = 265, + AF_BLUE_STRING_LATIN_SMALL_F_TOP = 274, + AF_BLUE_STRING_LATIN_SMALL = 282, + AF_BLUE_STRING_LATIN_SMALL_DESCENDER = 290, + AF_BLUE_STRING_TELUGU_TOP = 296, + AF_BLUE_STRING_TELUGU_BOTTOM = 318, + af_blue_1_1 = 339, +#ifdef AF_CONFIG_OPTION_CJK + AF_BLUE_STRING_CJK_TOP = af_blue_1_1 + 1, + AF_BLUE_STRING_CJK_BOTTOM = af_blue_1_1 + 153, + af_blue_1_1_1 = af_blue_1_1 + 304, +#ifdef AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT + AF_BLUE_STRING_CJK_LEFT = af_blue_1_1_1 + 1, + AF_BLUE_STRING_CJK_RIGHT = af_blue_1_1_1 + 153, + af_blue_1_1_2 = af_blue_1_1_1 + 304, +#else + af_blue_1_1_2 = af_blue_1_1_1 + 0, +#endif /* AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT */ + af_blue_1_2 = af_blue_1_1_2 + 0, +#else + af_blue_1_2 = af_blue_1_1 + 0, +#endif /* AF_CONFIG_OPTION_CJK */ + + + AF_BLUE_STRING_MAX /* do not remove */ + + } AF_Blue_String; + + + FT_LOCAL_ARRAY( char ) + af_blue_strings[]; + + + /*************************************************************************/ + /*************************************************************************/ + /***** *****/ + /***** B L U E S T R I N G S E T S *****/ + /***** *****/ + /*************************************************************************/ + /*************************************************************************/ + + /* The next level is to group blue strings into style-specific sets. */ + + + /* Properties are specific to a writing system. We assume that a given */ + /* blue string can't be used in more than a single writing system, which */ + /* is a safe bet. */ +#define AF_BLUE_PROPERTY_LATIN_TOP ( 1 << 0 ) /* must have value 1 */ +#define AF_BLUE_PROPERTY_LATIN_NEUTRAL ( 1 << 1 ) +#define AF_BLUE_PROPERTY_LATIN_X_HEIGHT ( 1 << 2 ) +#define AF_BLUE_PROPERTY_LATIN_LONG ( 1 << 3 ) + +#define AF_BLUE_PROPERTY_CJK_TOP ( 1 << 0 ) /* must have value 1 */ +#define AF_BLUE_PROPERTY_CJK_HORIZ ( 1 << 1 ) /* must have value 2 */ +#define AF_BLUE_PROPERTY_CJK_RIGHT AF_BLUE_PROPERTY_CJK_TOP + + +#define AF_BLUE_STRINGSET_MAX_LEN 7 + + /* The AF_Blue_Stringset enumeration values are offsets into the */ + /* `af_blue_stringsets' array. */ + + typedef enum AF_Blue_Stringset_ + { + AF_BLUE_STRINGSET_CYRL = 0, + AF_BLUE_STRINGSET_DEVA = 6, + AF_BLUE_STRINGSET_GREK = 12, + AF_BLUE_STRINGSET_HEBR = 19, + AF_BLUE_STRINGSET_LATN = 23, + AF_BLUE_STRINGSET_TELU = 30, + af_blue_2_1 = 33, +#ifdef AF_CONFIG_OPTION_CJK + AF_BLUE_STRINGSET_HANI = af_blue_2_1 + 0, + af_blue_2_1_1 = af_blue_2_1 + 2, +#ifdef AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT + af_blue_2_1_2 = af_blue_2_1_1 + 2, +#else + af_blue_2_1_2 = af_blue_2_1_1 + 0, +#endif /* AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT */ + af_blue_2_2 = af_blue_2_1_2 + 1, +#else + af_blue_2_2 = af_blue_2_1 + 0, +#endif /* AF_CONFIG_OPTION_CJK */ + + + AF_BLUE_STRINGSET_MAX /* do not remove */ + + } AF_Blue_Stringset; + + + typedef struct AF_Blue_StringRec_ + { + AF_Blue_String string; + FT_UShort properties; + + } AF_Blue_StringRec; + + + FT_LOCAL_ARRAY( AF_Blue_StringRec ) + af_blue_stringsets[]; + +/* */ + +FT_END_HEADER + + +#endif /* __AFBLUE_H__ */ + + +/* END */ diff --git a/src/autofit/afblue.hin b/src/autofit/afblue.hin new file mode 100644 index 0000000..0b4b48d --- /dev/null +++ b/src/autofit/afblue.hin @@ -0,0 +1,142 @@ +/***************************************************************************/ +/* */ +/* afblue.h */ +/* */ +/* Auto-fitter data for blue strings (specification). */ +/* */ +/* Copyright 2013, 2014 by */ +/* David Turner, Robert Wilhelm, and Werner Lemberg. */ +/* */ +/* This file is part of the FreeType project, and may only be used, */ +/* modified, and distributed under the terms of the FreeType project */ +/* license, LICENSE.TXT. By continuing to use, modify, or distribute */ +/* this file you indicate that you have read the license and */ +/* understand and accept it fully. */ +/* */ +/***************************************************************************/ + + +#ifndef __AFBLUE_H__ +#define __AFBLUE_H__ + + +FT_BEGIN_HEADER + + + /* an auxiliary macro to decode a UTF-8 character -- since we only use */ + /* hard-coded, self-converted data, no error checking is performed */ +#define GET_UTF8_CHAR( ch, p ) \ + ch = (unsigned char)*p++; \ + if ( ch >= 0x80 ) \ + { \ + FT_UInt len; \ + \ + \ + if ( ch < 0xE0 ) \ + { \ + len = 1; \ + ch &= 0x1F; \ + } \ + else if ( ch < 0xF0 ) \ + { \ + len = 2; \ + ch &= 0x0F; \ + } \ + else \ + { \ + len = 3; \ + ch &= 0x07; \ + } \ + \ + for ( ; len > 0; len-- ) \ + ch = ( ch << 6 ) | ( *p++ & 0x3F ); \ + } + + + /*************************************************************************/ + /*************************************************************************/ + /***** *****/ + /***** B L U E S T R I N G S *****/ + /***** *****/ + /*************************************************************************/ + /*************************************************************************/ + + /* At the bottommost level, we define strings for finding blue zones. */ + + +#define AF_BLUE_STRING_MAX_LEN @AF_BLUE_STRING_MAX_LEN@ + + /* The AF_Blue_String enumeration values are offsets into the */ + /* `af_blue_strings' array. */ + + typedef enum AF_Blue_String_ + { +@AF_BLUE_STRING_ENUM@ + + AF_BLUE_STRING_MAX /* do not remove */ + + } AF_Blue_String; + + + FT_LOCAL_ARRAY( char ) + af_blue_strings[]; + + + /*************************************************************************/ + /*************************************************************************/ + /***** *****/ + /***** B L U E S T R I N G S E T S *****/ + /***** *****/ + /*************************************************************************/ + /*************************************************************************/ + + /* The next level is to group blue strings into style-specific sets. */ + + + /* Properties are specific to a writing system. We assume that a given */ + /* blue string can't be used in more than a single writing system, which */ + /* is a safe bet. */ +#define AF_BLUE_PROPERTY_LATIN_TOP ( 1 << 0 ) /* must have value 1 */ +#define AF_BLUE_PROPERTY_LATIN_NEUTRAL ( 1 << 1 ) +#define AF_BLUE_PROPERTY_LATIN_X_HEIGHT ( 1 << 2 ) +#define AF_BLUE_PROPERTY_LATIN_LONG ( 1 << 3 ) + +#define AF_BLUE_PROPERTY_CJK_TOP ( 1 << 0 ) /* must have value 1 */ +#define AF_BLUE_PROPERTY_CJK_HORIZ ( 1 << 1 ) /* must have value 2 */ +#define AF_BLUE_PROPERTY_CJK_RIGHT AF_BLUE_PROPERTY_CJK_TOP + + +#define AF_BLUE_STRINGSET_MAX_LEN @AF_BLUE_STRINGSET_MAX_LEN@ + + /* The AF_Blue_Stringset enumeration values are offsets into the */ + /* `af_blue_stringsets' array. */ + + typedef enum AF_Blue_Stringset_ + { +@AF_BLUE_STRINGSET_ENUM@ + + AF_BLUE_STRINGSET_MAX /* do not remove */ + + } AF_Blue_Stringset; + + + typedef struct AF_Blue_StringRec_ + { + AF_Blue_String string; + FT_UShort properties; + + } AF_Blue_StringRec; + + + FT_LOCAL_ARRAY( AF_Blue_StringRec ) + af_blue_stringsets[]; + +/* */ + +FT_END_HEADER + + +#endif /* __AFBLUE_H__ */ + + +/* END */ diff --git a/src/autofit/afcjk.c b/src/autofit/afcjk.c index 8e407c8..048e0e7 100644 --- a/src/autofit/afcjk.c +++ b/src/autofit/afcjk.c @@ -2,9 +2,9 @@ /* */ /* afcjk.c */ /* */ -/* Auto-fitter hinting routines for CJK script (body). */ +/* Auto-fitter hinting routines for CJK writing system (body). */ /* */ -/* Copyright 2006-2012 by */ +/* Copyright 2006-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -26,7 +26,8 @@ #include FT_ADVANCES_H #include FT_INTERNAL_DEBUG_H -#include "aftypes.h" +#include "afglobal.h" +#include "afpic.h" #include "aflatin.h" @@ -67,13 +68,18 @@ FT_LOCAL_DEF( void ) af_cjk_metrics_init_widths( AF_CJKMetrics metrics, - FT_Face face, - FT_ULong charcode ) + FT_Face face ) { /* scan the array of segments in each direction */ AF_GlyphHintsRec hints[1]; + FT_TRACE5(( "\n" + "cjk standard widths computation (style `%s')\n" + "===================================================\n" + "\n", + af_style_names[metrics->root.style_class->style] )); + af_glyph_hints_init( hints, face->memory ); metrics->axis[AF_DIMENSION_HORZ].width_count = 0; @@ -81,15 +87,59 @@ { FT_Error error; - FT_UInt glyph_index; + FT_ULong glyph_index; + FT_Long y_offset; int dim; AF_CJKMetricsRec dummy[1]; AF_Scaler scaler = &dummy->root.scaler; +#ifdef FT_CONFIG_OPTION_PIC + AF_FaceGlobals globals = metrics->root.globals; +#endif - glyph_index = FT_Get_Char_Index( face, charcode ); - if ( glyph_index == 0 ) - goto Exit; + AF_StyleClass style_class = metrics->root.style_class; + AF_ScriptClass script_class = AF_SCRIPT_CLASSES_GET + [style_class->script]; + + FT_UInt32 standard_char; + + + standard_char = script_class->standard_char1; + af_get_char_index( &metrics->root, + standard_char, + &glyph_index, + &y_offset ); + if ( !glyph_index ) + { + if ( script_class->standard_char2 ) + { + standard_char = script_class->standard_char2; + af_get_char_index( &metrics->root, + standard_char, + &glyph_index, + &y_offset ); + if ( !glyph_index ) + { + if ( script_class->standard_char3 ) + { + standard_char = script_class->standard_char3; + af_get_char_index( &metrics->root, + standard_char, + &glyph_index, + &y_offset ); + if ( !glyph_index ) + goto Exit; + } + else + goto Exit; + } + } + else + goto Exit; + } + + FT_TRACE5(( "standard character: U+%04lX (glyph index %d)\n", + standard_char, glyph_index )); error = FT_Load_Glyph( face, glyph_index, FT_LOAD_NO_SCALE ); if ( error || face->glyph->outline.n_points <= 0 ) @@ -108,7 +158,7 @@ scaler->render_mode = FT_RENDER_MODE_NORMAL; scaler->flags = 0; - af_glyph_hints_rescale( hints, (AF_ScriptMetrics)dummy ); + af_glyph_hints_rescale( hints, (AF_StyleMetrics)dummy ); error = af_glyph_hints_reload( hints, &face->glyph->outline ); if ( error ) @@ -122,11 +172,15 @@ FT_UInt num_widths = 0; - error = af_latin_hints_compute_segments( hints, (AF_Dimension)dim ); + error = af_latin_hints_compute_segments( hints, + (AF_Dimension)dim ); if ( error ) goto Exit; - af_latin_hints_link_segments( hints, (AF_Dimension)dim ); + af_latin_hints_link_segments( hints, + 0, + NULL, + (AF_Dimension)dim ); seg = axhints->segments; limit = seg + axhints->num_segments; @@ -150,7 +204,10 @@ } } - af_sort_widths( num_widths, axis->widths ); + /* this also replaces multiple almost identical stem widths */ + /* with a single one (the value 100 is heuristic) */ + af_sort_and_quantize_widths( &num_widths, axis->widths, + dummy->units_per_em / 100 ); axis->width_count = num_widths; } @@ -168,263 +225,212 @@ axis->edge_distance_threshold = stdw / 5; axis->standard_width = stdw; axis->extra_light = 0; + +#ifdef FT_DEBUG_LEVEL_TRACE + { + FT_UInt i; + + + FT_TRACE5(( "%s widths:\n", + dim == AF_DIMENSION_VERT ? "horizontal" + : "vertical" )); + + FT_TRACE5(( " %d (standard)", axis->standard_width )); + for ( i = 1; i < axis->width_count; i++ ) + FT_TRACE5(( " %d", axis->widths[i].org )); + + FT_TRACE5(( "\n" )); + } +#endif } } + FT_TRACE5(( "\n" )); + af_glyph_hints_done( hints ); } -#define AF_CJK_MAX_TEST_CHARACTERS 32 + /* Find all blue zones. */ - - /* Each blue zone has two types of fill and unfill, this is, */ - /* filling the entire glyph square or not. */ - - enum + static void + af_cjk_metrics_init_blues( AF_CJKMetrics metrics, + FT_Face face ) { - AF_CJK_BLUE_TYPE_FILL, - AF_CJK_BLUE_TYPE_UNFILL, - AF_CJK_BLUE_TYPE_MAX - }; + FT_Pos fills[AF_BLUE_STRING_MAX_LEN]; + FT_Pos flats[AF_BLUE_STRING_MAX_LEN]; + FT_Int num_fills; + FT_Int num_flats; - /* Put some common and representative Han Ideographs characters here. */ - static const FT_ULong af_cjk_hani_blue_chars[AF_CJK_BLUE_MAX] - [AF_CJK_BLUE_TYPE_MAX] - [AF_CJK_MAX_TEST_CHARACTERS] = - { - { - { - 0x4ED6, 0x4EEC, 0x4F60, 0x4F86, 0x5011, 0x5230, 0x548C, 0x5730, - 0x5BF9, 0x5C0D, 0x5C31, 0x5E2D, 0x6211, 0x65F6, 0x6642, 0x6703, - 0x6765, 0x70BA, 0x80FD, 0x8230, 0x8AAA, 0x8BF4, 0x8FD9, 0x9019, - 0x9F4A /* top fill */ - }, - { - 0x519B, 0x540C, 0x5DF2, 0x613F, 0x65E2, 0x661F, 0x662F, 0x666F, - 0x6C11, 0x7167, 0x73B0, 0x73FE, 0x7406, 0x7528, 0x7F6E, 0x8981, - 0x8ECD, 0x90A3, 0x914D, 0x91CC, 0x958B, 0x96F7, 0x9732, 0x9762, - 0x987E /* top unfill */ - } - }, - { - { - 0x4E2A, 0x4E3A, 0x4EBA, 0x4ED6, 0x4EE5, 0x4EEC, 0x4F60, 0x4F86, - 0x500B, 0x5011, 0x5230, 0x548C, 0x5927, 0x5BF9, 0x5C0D, 0x5C31, - 0x6211, 0x65F6, 0x6642, 0x6709, 0x6765, 0x70BA, 0x8981, 0x8AAA, - 0x8BF4 /* bottom fill */ - }, - { - 0x4E3B, 0x4E9B, 0x56E0, 0x5B83, 0x60F3, 0x610F, 0x7406, 0x751F, - 0x7576, 0x770B, 0x7740, 0x7F6E, 0x8005, 0x81EA, 0x8457, 0x88E1, - 0x8FC7, 0x8FD8, 0x8FDB, 0x9032, 0x904E, 0x9053, 0x9084, 0x91CC, - 0x9762 /* bottom unfill */ - } - }, -#ifndef AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT - { {0x0000}, {0x0000} }, - { {0x0000}, {0x0000} } -#else - { - { - 0x4E9B, 0x4EEC, 0x4F60, 0x4F86, 0x5011, 0x5230, 0x548C, 0x5730, - 0x5979, 0x5C06, 0x5C07, 0x5C31, 0x5E74, 0x5F97, 0x60C5, 0x6700, - 0x6837, 0x6A23, 0x7406, 0x80FD, 0x8AAA, 0x8BF4, 0x8FD9, 0x9019, - 0x901A /* left fill */ - }, - { - 0x5373, 0x5417, 0x5427, 0x542C, 0x5462, 0x54C1, 0x54CD, 0x55CE, - 0x5E08, 0x5E2B, 0x6536, 0x65AD, 0x65B7, 0x660E, 0x773C, 0x9593, - 0x95F4, 0x9645, 0x9648, 0x9650, 0x9664, 0x9673, 0x968F, 0x969B, - 0x96A8 /* left unfill */ - } - }, - { - { - 0x4E8B, 0x524D, 0x5B78, 0x5C06, 0x5C07, 0x60C5, 0x60F3, 0x6216, - 0x653F, 0x65AF, 0x65B0, 0x6837, 0x6A23, 0x6C11, 0x6C92, 0x6CA1, - 0x7136, 0x7279, 0x73B0, 0x73FE, 0x7403, 0x7B2C, 0x7D93, 0x8C01, - 0x8D77 /* right fill */ - }, - { - 0x4F8B, 0x5225, 0x522B, 0x5236, 0x52A8, 0x52D5, 0x5417, 0x55CE, - 0x589E, 0x6307, 0x660E, 0x671D, 0x671F, 0x6784, 0x7269, 0x786E, - 0x79CD, 0x8ABF, 0x8C03, 0x8CBB, 0x8D39, 0x90A3, 0x90FD, 0x9593, - 0x95F4 /* right unfill */ - } - } -#endif /* AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT */ - }; + FT_Bool fill; + AF_CJKBlue blue; + FT_Error error; + AF_CJKAxis axis; + FT_Outline outline; - /* Calculate blue zones for all the CJK_BLUE_XXX's. */ + AF_StyleClass sc = metrics->root.style_class; - static void - af_cjk_metrics_init_blues( AF_CJKMetrics metrics, - FT_Face face, - const FT_ULong blue_chars - [AF_CJK_BLUE_MAX] - [AF_CJK_BLUE_TYPE_MAX] - [AF_CJK_MAX_TEST_CHARACTERS] ) - { - FT_Pos fills[AF_CJK_MAX_TEST_CHARACTERS]; - FT_Pos flats[AF_CJK_MAX_TEST_CHARACTERS]; + AF_Blue_Stringset bss = sc->blue_stringset; + const AF_Blue_StringRec* bs = &af_blue_stringsets[bss]; - FT_Int num_fills; - FT_Int num_flats; - FT_Int bb; - AF_CJKBlue blue; - FT_Error error; - AF_CJKAxis axis; - FT_GlyphSlot glyph = face->glyph; + /* we walk over the blue character strings as specified in the */ + /* style's entry in the `af_blue_stringset' array, computing its */ + /* extremum points (depending on the string properties) */ -#ifdef FT_DEBUG_LEVEL_TRACE - FT_String* cjk_blue_name[AF_CJK_BLUE_MAX] = { - (FT_String*)"top", - (FT_String*)"bottom", - (FT_String*)"left", - (FT_String*)"right" - }; - FT_String* cjk_blue_type_name[AF_CJK_BLUE_TYPE_MAX] = { - (FT_String*)"filled", - (FT_String*)"unfilled" - }; -#endif + FT_TRACE5(( "cjk blue zones computation\n" + "==========================\n" + "\n" )); + for ( ; bs->string != AF_BLUE_STRING_MAX; bs++ ) + { + const char* p = &af_blue_strings[bs->string]; + FT_Pos* blue_ref; + FT_Pos* blue_shoot; - /* We compute the blues simply by loading each character from the */ - /* `blue_chars[blues]' string, then computing its extreme points */ - /* (depending blue zone type etc.). */ - FT_TRACE5(( "cjk blue zones computation\n" )); - FT_TRACE5(( "------------------------------------------------\n" )); + if ( AF_CJK_IS_HORIZ_BLUE( bs ) ) + axis = &metrics->axis[AF_DIMENSION_HORZ]; + else + axis = &metrics->axis[AF_DIMENSION_VERT]; + +#ifdef FT_DEBUG_LEVEL_TRACE + { + FT_String* cjk_blue_name[4] = + { + (FT_String*)"bottom", /* -- , -- */ + (FT_String*)"top", /* -- , TOP */ + (FT_String*)"left", /* HORIZ, -- */ + (FT_String*)"right" /* HORIZ, TOP */ + }; - for ( bb = 0; bb < AF_CJK_BLUE_MAX; bb++ ) - { - FT_Int fill_type; - FT_Pos* blue_ref; - FT_Pos* blue_shoot; + FT_TRACE5(( "blue zone %d (%s):\n", + axis->blue_count, + cjk_blue_name[AF_CJK_IS_HORIZ_BLUE( bs ) | + AF_CJK_IS_TOP_BLUE( bs ) ] )); + } +#endif /* FT_DEBUG_LEVEL_TRACE */ num_fills = 0; num_flats = 0; - for ( fill_type = 0; fill_type < AF_CJK_BLUE_TYPE_MAX; fill_type++ ) - { - const FT_ULong* p = blue_chars[bb][fill_type]; - const FT_ULong* limit = p + AF_CJK_MAX_TEST_CHARACTERS; - FT_Bool fill = FT_BOOL( - fill_type == AF_CJK_BLUE_TYPE_FILL ); + fill = 1; /* start with characters that define fill values */ + FT_TRACE5(( " [overshoot values]\n" )); + while ( *p ) + { + FT_ULong ch; + FT_ULong glyph_index; + FT_Long y_offset; + FT_Pos best_pos; /* same as points.y or points.x, resp. */ + FT_Int best_point; + FT_Vector* points; - FT_TRACE5(( "cjk blue %s/%s\n", cjk_blue_name[bb], - cjk_blue_type_name[fill_type] )); + GET_UTF8_CHAR( ch, p ); - for ( ; p < limit && *p; p++ ) + /* switch to characters that define flat values */ + if ( ch == '|' ) { - FT_UInt glyph_index; - FT_Pos best_pos; /* same as points.y */ - FT_Int best_point; - FT_Vector* points; + fill = 0; + FT_TRACE5(( " [reference values]\n" )); + continue; + } + /* load the character in the face -- skip unknown or empty ones */ + af_get_char_index( &metrics->root, ch, &glyph_index, &y_offset ); + if ( glyph_index == 0 ) + { + FT_TRACE5(( " U+%04lX unavailable\n", ch )); + continue; + } - FT_TRACE5(( " U+%lX...", *p )); + error = FT_Load_Glyph( face, glyph_index, FT_LOAD_NO_SCALE ); + outline = face->glyph->outline; + if ( error || outline.n_points <= 0 ) + { + FT_TRACE5(( " U+%04lX contains no outlines\n", ch )); + continue; + } - /* load the character in the face -- skip unknown or empty ones */ - glyph_index = FT_Get_Char_Index( face, *p ); - if ( glyph_index == 0 ) - { - FT_TRACE5(( "unavailable\n" )); - continue; - } + /* now compute min or max point indices and coordinates */ + points = outline.points; + best_point = -1; + best_pos = 0; /* make compiler happy */ - error = FT_Load_Glyph( face, glyph_index, FT_LOAD_NO_SCALE ); - if ( error || glyph->outline.n_points <= 0 ) - { - FT_TRACE5(( "no outline\n" )); - continue; - } + { + FT_Int nn; + FT_Int first = 0; + FT_Int last = -1; - /* now compute min or max point indices and coordinates */ - points = glyph->outline.points; - best_point = -1; - best_pos = 0; /* make compiler happy */ + for ( nn = 0; nn < outline.n_contours; first = last + 1, nn++ ) { - FT_Int nn; - FT_Int first = 0; - FT_Int last = -1; - - - for ( nn = 0; - nn < glyph->outline.n_contours; - first = last + 1, nn++ ) - { - FT_Int pp; + FT_Int pp; - last = glyph->outline.contours[nn]; + last = outline.contours[nn]; - /* Avoid single-point contours since they are never */ - /* rasterized. In some fonts, they correspond to mark */ - /* attachment points which are way outside of the glyph's */ - /* real outline. */ - if ( last <= first ) - continue; + /* Avoid single-point contours since they are never rasterized. */ + /* In some fonts, they correspond to mark attachment points */ + /* which are way outside of the glyph's real outline. */ + if ( last <= first ) + continue; - switch ( bb ) + if ( AF_CJK_IS_HORIZ_BLUE( bs ) ) + { + if ( AF_CJK_IS_RIGHT_BLUE( bs ) ) { - case AF_CJK_BLUE_TOP: for ( pp = first; pp <= last; pp++ ) - if ( best_point < 0 || points[pp].y > best_pos ) + if ( best_point < 0 || points[pp].x > best_pos ) { best_point = pp; - best_pos = points[pp].y; + best_pos = points[pp].x; } - break; - - case AF_CJK_BLUE_BOTTOM: + } + else + { for ( pp = first; pp <= last; pp++ ) - if ( best_point < 0 || points[pp].y < best_pos ) + if ( best_point < 0 || points[pp].x < best_pos ) { best_point = pp; - best_pos = points[pp].y; + best_pos = points[pp].x; } - break; - - case AF_CJK_BLUE_LEFT: + } + } + else + { + if ( AF_CJK_IS_TOP_BLUE( bs ) ) + { for ( pp = first; pp <= last; pp++ ) - if ( best_point < 0 || points[pp].x < best_pos ) + if ( best_point < 0 || points[pp].y > best_pos ) { best_point = pp; - best_pos = points[pp].x; + best_pos = points[pp].y; } - break; - - case AF_CJK_BLUE_RIGHT: + } + else + { for ( pp = first; pp <= last; pp++ ) - if ( best_point < 0 || points[pp].x > best_pos ) + if ( best_point < 0 || points[pp].y < best_pos ) { best_point = pp; - best_pos = points[pp].x; + best_pos = points[pp].y; } - break; - - default: - ; } } - FT_TRACE5(( "best_pos=%5ld\n", best_pos )); } - if ( fill ) - fills[num_fills++] = best_pos; - else - flats[num_flats++] = best_pos; + FT_TRACE5(( " U+%04lX: best_pos = %5ld\n", ch, best_pos )); } + + if ( fill ) + fills[num_fills++] = best_pos; + else + flats[num_flats++] = best_pos; } if ( num_flats == 0 && num_fills == 0 ) @@ -433,34 +439,30 @@ * we couldn't find a single glyph to compute this blue zone, * we will simply ignore it then */ - FT_TRACE5(( "empty\n" )); + FT_TRACE5(( " empty\n" )); continue; } - /* we have computed the contents of the `fill' and `flats' tables, */ - /* now determine the reference position of the blue -- */ - /* we simply take the median value after a simple sort */ - af_sort_pos( num_flats, flats ); + /* we have computed the contents of the `fill' and `flats' tables, */ + /* now determine the reference and overshoot position of the blue -- */ + /* we simply take the median value after a simple sort */ af_sort_pos( num_fills, fills ); + af_sort_pos( num_flats, flats ); - if ( AF_CJK_BLUE_TOP == bb || AF_CJK_BLUE_BOTTOM == bb ) - axis = &metrics->axis[AF_DIMENSION_VERT]; - else - axis = &metrics->axis[AF_DIMENSION_HORZ]; - - blue = & axis->blues[axis->blue_count]; - blue_ref = & blue->ref.org; - blue_shoot = & blue->shoot.org; + blue = &axis->blues[axis->blue_count]; + blue_ref = &blue->ref.org; + blue_shoot = &blue->shoot.org; axis->blue_count++; + if ( num_flats == 0 ) { - *blue_ref = fills[num_fills / 2]; + *blue_ref = *blue_shoot = fills[num_fills / 2]; } else if ( num_fills == 0 ) { - *blue_ref = flats[num_flats / 2]; + *blue_ref = *blue_shoot = flats[num_flats / 2]; } else @@ -478,25 +480,34 @@ FT_Bool under_ref = FT_BOOL( shoot < ref ); - if ( (AF_CJK_BLUE_TOP == bb || AF_CJK_BLUE_RIGHT == bb) ^ under_ref ) - *blue_shoot = *blue_ref = ( shoot + ref ) / 2; + /* AF_CJK_IS_TOP_BLUE covers `right' and `top' */ + if ( AF_CJK_IS_TOP_BLUE( bs ) ^ under_ref ) + { + *blue_ref = + *blue_shoot = ( shoot + ref ) / 2; + + FT_TRACE5(( " [reference smaller than overshoot," + " taking mean value]\n" )); + } } blue->flags = 0; - if ( AF_CJK_BLUE_TOP == bb ) - blue->flags |= AF_CJK_BLUE_IS_TOP; - else if ( AF_CJK_BLUE_RIGHT == bb ) - blue->flags |= AF_CJK_BLUE_IS_RIGHT; + if ( AF_CJK_IS_TOP_BLUE( bs ) ) + blue->flags |= AF_CJK_BLUE_TOP; - FT_TRACE5(( "-- cjk %s bluezone ref = %ld shoot = %ld\n", - cjk_blue_name[bb], *blue_ref, *blue_shoot )); + FT_TRACE5(( " -> reference = %ld\n" + " overshoot = %ld\n", + *blue_ref, *blue_shoot )); } + FT_TRACE5(( "\n" )); + return; } /* Basically the Latin version with type AF_CJKMetrics for metrics. */ + FT_LOCAL_DEF( void ) af_cjk_metrics_check_digits( AF_CJKMetrics metrics, FT_Face face ) @@ -506,14 +517,14 @@ FT_Fixed advance, old_advance = 0; - /* check whether all ASCII digits have the same advance width; */ - /* digit `0' is 0x30 in all supported charmaps */ + /* digit `0' is 0x30 in all supported charmaps */ for ( i = 0x30; i <= 0x39; i++ ) { - FT_UInt glyph_index; + FT_ULong glyph_index; + FT_Long y_offset; - glyph_index = FT_Get_Char_Index( face, i ); + af_get_char_index( &metrics->root, i, &glyph_index, &y_offset ); if ( glyph_index == 0 ) continue; @@ -543,6 +554,8 @@ } + /* Initialize global metrics. */ + FT_LOCAL_DEF( FT_Error ) af_cjk_metrics_init( AF_CJKMetrics metrics, FT_Face face ) @@ -552,21 +565,21 @@ metrics->units_per_em = face->units_per_EM; - if ( FT_Select_Charmap( face, FT_ENCODING_UNICODE ) ) - face->charmap = NULL; - else + if ( !FT_Select_Charmap( face, FT_ENCODING_UNICODE ) ) { - af_cjk_metrics_init_widths( metrics, face, 0x7530 ); - af_cjk_metrics_init_blues( metrics, face, af_cjk_hani_blue_chars ); + af_cjk_metrics_init_widths( metrics, face ); + af_cjk_metrics_init_blues( metrics, face ); af_cjk_metrics_check_digits( metrics, face ); } FT_Set_Charmap( face, oldmap ); - - return AF_Err_Ok; + return FT_Err_Ok; } + /* Adjust scaling value, then scale and shift widths */ + /* and blue zones (if applicable) for given dimension. */ + static void af_cjk_metrics_scale_dim( AF_CJKMetrics metrics, AF_Scaler scaler, @@ -578,8 +591,6 @@ FT_UInt nn; - axis = &metrics->axis[dim]; - if ( dim == AF_DIMENSION_HORZ ) { scale = scaler->x_scale; @@ -591,6 +602,8 @@ delta = scaler->y_delta; } + axis = &metrics->axis[dim]; + if ( axis->org_scale == scale && axis->org_delta == delta ) return; @@ -646,12 +659,13 @@ blue->shoot.fit = blue->ref.fit - delta2; - FT_TRACE5(( ">> active cjk blue zone %c%d[%ld/%ld]: " - "ref: cur=%.2f fit=%.2f shoot: cur=%.2f fit=%.2f\n", - ( dim == AF_DIMENSION_HORZ ) ? 'H' : 'V', - nn, blue->ref.org, blue->shoot.org, - blue->ref.cur / 64.0, blue->ref.fit / 64.0, - blue->shoot.cur / 64.0, blue->shoot.fit / 64.0 )); + FT_TRACE5(( ">> active cjk blue zone %c%d[%ld/%ld]:\n" + " ref: cur=%.2f fit=%.2f\n" + " shoot: cur=%.2f fit=%.2f\n", + ( dim == AF_DIMENSION_HORZ ) ? 'H' : 'V', + nn, blue->ref.org, blue->shoot.org, + blue->ref.cur / 64.0, blue->ref.fit / 64.0, + blue->shoot.cur / 64.0, blue->shoot.fit / 64.0 )); blue->flags |= AF_CJK_BLUE_ACTIVE; } @@ -659,10 +673,14 @@ } + /* Scale global values in both directions. */ + FT_LOCAL_DEF( void ) af_cjk_metrics_scale( AF_CJKMetrics metrics, AF_Scaler scaler ) { + /* we copy the whole structure since the x and y scaling values */ + /* are not modified, contrary to e.g. the `latin' auto-hinter */ metrics->root.scaler = *scaler; af_cjk_metrics_scale_dim( metrics, scaler, AF_DIMENSION_HORZ ); @@ -678,6 +696,9 @@ /*************************************************************************/ /*************************************************************************/ + + /* Walk over all contours and compute its segments. */ + static FT_Error af_cjk_hints_compute_segments( AF_GlyphHints hints, AF_Dimension dim ) @@ -699,7 +720,7 @@ { AF_Point pt = seg->first; AF_Point last = seg->last; - AF_Flags f0 = (AF_Flags)(pt->flags & AF_FLAG_CONTROL); + AF_Flags f0 = (AF_Flags)( pt->flags & AF_FLAG_CONTROL ); AF_Flags f1; @@ -708,7 +729,7 @@ for ( ; pt != last; f0 = f1 ) { pt = pt->next; - f1 = (AF_Flags)(pt->flags & AF_FLAG_CONTROL); + f1 = (AF_Flags)( pt->flags & AF_FLAG_CONTROL ); if ( !f0 && !f1 ) break; @@ -718,7 +739,7 @@ } } - return AF_Err_Ok; + return FT_Err_Ok; } @@ -744,10 +765,6 @@ /* now compare each segment to the others */ for ( seg1 = segments; seg1 < segment_limit; seg1++ ) { - /* the fake segments are for metrics hinting only */ - if ( seg1->first == seg1->last ) - continue; - if ( seg1->dir != major_dir ) continue; @@ -892,7 +909,7 @@ AF_Dimension dim ) { AF_AxisHints axis = &hints->axis[dim]; - FT_Error error = AF_Err_Ok; + FT_Error error = FT_Err_Ok; FT_Memory memory = hints->memory; AF_CJKAxis laxis = &((AF_CJKMetrics)hints->metrics)->axis[dim]; @@ -934,7 +951,7 @@ for ( seg = segments; seg < segment_limit; seg++ ) { - AF_Edge found = 0; + AF_Edge found = NULL; FT_Pos best = 0xFFFFU; FT_Int ee; @@ -962,14 +979,15 @@ /* can make a single edge. */ if ( link ) { - AF_Segment seg1 = edge->first; - AF_Segment link1; + AF_Segment seg1 = edge->first; FT_Pos dist2 = 0; do { - link1 = seg1->link; + AF_Segment link1 = seg1->link; + + if ( link1 ) { dist2 = AF_SEGMENT_DIST( link, link1 ); @@ -1006,10 +1024,11 @@ edge->first = seg; edge->last = seg; + edge->dir = seg->dir; edge->fpos = seg->pos; - edge->opos = edge->pos = FT_MulFix( seg->pos, scale ); + edge->opos = FT_MulFix( seg->pos, scale ); + edge->pos = edge->opos; seg->edge_next = seg; - edge->dir = seg->dir; } else { @@ -1021,25 +1040,26 @@ } } - /*********************************************************************/ - /* */ - /* Good, we now compute each edge's properties according to segments */ - /* found on its position. Basically, these are as follows. */ - /* */ - /* - edge's main direction */ - /* - stem edge, serif edge or both (which defaults to stem then) */ - /* - rounded edge, straight or both (which defaults to straight) */ - /* - link for edge */ - /* */ - /*********************************************************************/ - - /* first of all, set the `edge' field in each segment -- this is */ - /* required in order to compute edge links */ - /* */ - /* Note that removing this loop and setting the `edge' field of each */ - /* segment directly in the code above slows down execution speed for */ - /* some reasons on platforms like the Sun. */ + /******************************************************************/ + /* */ + /* Good, we now compute each edge's properties according to the */ + /* segments found on its position. Basically, these are */ + /* */ + /* - the edge's main direction */ + /* - stem edge, serif edge or both (which defaults to stem then) */ + /* - rounded edge, straight or both (which defaults to straight) */ + /* - link for edge */ + /* */ + /******************************************************************/ + + /* first of all, set the `edge' field in each segment -- this is */ + /* required in order to compute edge links */ + /* + * Note that removing this loop and setting the `edge' field of each + * segment directly in the code above slows down execution speed for + * some reasons on platforms like the Sun. + */ { AF_Edge edges = axis->edges; AF_Edge edge_limit = edges + axis->num_edges; @@ -1148,6 +1168,8 @@ } + /* Detect segments and edges for given dimension. */ + static FT_Error af_cjk_hints_detect_features( AF_GlyphHints hints, AF_Dimension dim ) @@ -1166,6 +1188,8 @@ } + /* Compute all edges which lie within blue zones. */ + FT_LOCAL_DEF( void ) af_cjk_hints_compute_blue_edges( AF_GlyphHints hints, AF_CJKMetrics metrics, @@ -1213,10 +1237,10 @@ /* zone, check for left edges */ /* */ /* of course, that's for TrueType */ - is_top_right_blue = - FT_BOOL( ( ( blue->flags & AF_CJK_BLUE_IS_TOP ) != 0 ) || - ( ( blue->flags & AF_CJK_BLUE_IS_RIGHT ) != 0 ) ); - is_major_dir = FT_BOOL( edge->dir == axis->major_dir ); + is_top_right_blue = + (FT_Byte)( ( blue->flags & AF_CJK_BLUE_TOP ) != 0 ); + is_major_dir = + FT_BOOL( edge->dir == axis->major_dir ); /* if it is a top zone, the edge must be against the major */ /* direction; if it is a bottom zone, it must be in the major */ @@ -1253,6 +1277,8 @@ } + /* Initalize hinting engine. */ + FT_LOCAL_DEF( FT_Error ) af_cjk_hints_init( AF_GlyphHints hints, AF_CJKMetrics metrics ) @@ -1261,7 +1287,7 @@ FT_UInt32 scaler_flags, other_flags; - af_glyph_hints_rescale( hints, (AF_ScriptMetrics)metrics ); + af_glyph_hints_rescale( hints, (AF_StyleMetrics)metrics ); /* * correct x_scale and y_scale when needed, since they may have @@ -1311,7 +1337,7 @@ hints->scaler_flags = scaler_flags; hints->other_flags = other_flags; - return 0; + return FT_Err_Ok; } @@ -1323,8 +1349,8 @@ /*************************************************************************/ /*************************************************************************/ - /* snap a given width in scaled coordinates to one of the */ - /* current standard widths */ + /* Snap a given width in scaled coordinates to one of the */ + /* current standard widths. */ static FT_Pos af_cjk_snap_width( AF_Width widths, @@ -1371,7 +1397,9 @@ } - /* compute the snapped width of a given stem */ + /* Compute the snapped width of a given stem. */ + /* There is a lot of voodoo in this function; changing the hard-coded */ + /* parameters influence the whole hinting process. */ static FT_Pos af_cjk_compute_stem_width( AF_GlyphHints hints, @@ -1380,8 +1408,8 @@ AF_Edge_Flags base_flags, AF_Edge_Flags stem_flags ) { - AF_CJKMetrics metrics = (AF_CJKMetrics) hints->metrics; - AF_CJKAxis axis = & metrics->axis[dim]; + AF_CJKMetrics metrics = (AF_CJKMetrics)hints->metrics; + AF_CJKAxis axis = &metrics->axis[dim]; FT_Pos dist = width; FT_Int sign = 0; FT_Bool vertical = FT_BOOL( dim == AF_DIMENSION_VERT ); @@ -1492,7 +1520,7 @@ } - /* align one stem edge relative to the previous stem edge */ + /* Align one stem edge relative to the previous stem edge. */ static void af_cjk_align_linked_edge( AF_GlyphHints hints, @@ -1509,9 +1537,18 @@ stem_edge->pos = base_edge->pos + fitted_width; + + FT_TRACE5(( " CJKLINK: edge %d @%d (opos=%.2f) linked to %.2f," + " dist was %.2f, now %.2f\n", + stem_edge - hints->axis[dim].edges, stem_edge->fpos, + stem_edge->opos / 64.0, stem_edge->pos / 64.0, + dist / 64.0, fitted_width / 64.0 )); } + /* Shift the coordinates of the `serif' edge by the same amount */ + /* as the corresponding `base' edge has been moved already. */ + static void af_cjk_align_serif_edge( AF_GlyphHints hints, AF_Edge base, @@ -1665,6 +1702,8 @@ } + /* The main grid-fitting routine. */ + static void af_cjk_hint_edges( AF_GlyphHints hints, AF_Dimension dim ) @@ -1680,10 +1719,16 @@ FT_Bool has_last_stem = FALSE; FT_Pos last_stem_pos = 0; +#ifdef FT_DEBUG_LEVEL_TRACE + FT_UInt num_actions = 0; +#endif + + + FT_TRACE5(( "cjk %s edge hinting (style `%s')\n", + dim == AF_DIMENSION_VERT ? "horizontal" : "vertical", + af_style_names[hints->metrics->style_class->style] )); /* we begin by aligning all stems relative to the blue zone */ - FT_TRACE5(( "==== cjk hinting %s edges =====\n", - dim == AF_DIMENSION_HORZ ? "vertical" : "horizontal" )); if ( AF_HINTS_DO_BLUES( hints ) ) { @@ -1714,10 +1759,14 @@ if ( !edge1 ) continue; - FT_TRACE5(( "CJKBLUE: edge %d @%d (opos=%.2f) snapped to (%.2f), " - "was (%.2f)\n", - edge1-edges, edge1->fpos, edge1->opos / 64.0, blue->fit / 64.0, - edge1->pos / 64.0 )); +#ifdef FT_DEBUG_LEVEL_TRACE + FT_TRACE5(( " CJKBLUE: edge %d @%d (opos=%.2f) snapped to %.2f," + " was %.2f\n", + edge1 - edges, edge1->fpos, edge1->opos / 64.0, + blue->fit / 64.0, edge1->pos / 64.0 )); + + num_actions++; +#endif edge1->pos = blue->fit; edge1->flags |= AF_EDGE_DONE; @@ -1726,6 +1775,10 @@ { af_cjk_align_linked_edge( hints, dim, edge1, edge2 ); edge2->flags |= AF_EDGE_DONE; + +#ifdef FT_DEBUG_LEVEL_TRACE + num_actions++; +#endif } if ( !anchor ) @@ -1767,6 +1820,7 @@ } /* now align the stem */ + /* this should not happen, but it's better to be safe */ if ( edge2->blue_edge ) { @@ -1774,6 +1828,11 @@ af_cjk_align_linked_edge( hints, dim, edge2, edge ); edge->flags |= AF_EDGE_DONE; + +#ifdef FT_DEBUG_LEVEL_TRACE + num_actions++; +#endif + continue; } @@ -1781,6 +1840,11 @@ { af_cjk_align_linked_edge( hints, dim, edge2, edge ); edge->flags |= AF_EDGE_DONE; + +#ifdef FT_DEBUG_LEVEL_TRACE + num_actions++; +#endif + /* We rarely reaches here it seems; * usually the two edges belonging * to one stem are marked as DONE together @@ -1948,7 +2012,7 @@ } if ( !skipped ) - return; + goto Exit; /* * now hint the remaining edges (serifs and single) in order @@ -1968,7 +2032,7 @@ } if ( !skipped ) - return; + goto Exit; for ( edge = edges; edge < edge_limit; edge++ ) { @@ -2006,6 +2070,16 @@ } } } + + Exit: + +#ifdef FT_DEBUG_LEVEL_TRACE + if ( !num_actions ) + FT_TRACE5(( " (none)\n" )); + FT_TRACE5(( "\n" )); +#endif + + return; } @@ -2099,6 +2173,8 @@ } + /* Apply the complete hinting algorithm to a CJK glyph. */ + FT_LOCAL_DEF( FT_Error ) af_cjk_hints_apply( AF_GlyphHints hints, FT_Outline* outline, @@ -2186,81 +2262,41 @@ /*************************************************************************/ - /* this corresponds to Unicode 6.0 */ + AF_DEFINE_WRITING_SYSTEM_CLASS( + af_cjk_writing_system_class, - static const AF_Script_UniRangeRec af_cjk_uniranges[] = - { - AF_UNIRANGE_REC( 0x2E80UL, 0x2EFFUL ), /* CJK Radicals Supplement */ - AF_UNIRANGE_REC( 0x2F00UL, 0x2FDFUL ), /* Kangxi Radicals */ - AF_UNIRANGE_REC( 0x2FF0UL, 0x2FFFUL ), /* Ideographic Description Characters */ - AF_UNIRANGE_REC( 0x3000UL, 0x303FUL ), /* CJK Symbols and Punctuation */ - AF_UNIRANGE_REC( 0x3040UL, 0x309FUL ), /* Hiragana */ - AF_UNIRANGE_REC( 0x30A0UL, 0x30FFUL ), /* Katakana */ - AF_UNIRANGE_REC( 0x3100UL, 0x312FUL ), /* Bopomofo */ - AF_UNIRANGE_REC( 0x3130UL, 0x318FUL ), /* Hangul Compatibility Jamo */ - AF_UNIRANGE_REC( 0x3190UL, 0x319FUL ), /* Kanbun */ - AF_UNIRANGE_REC( 0x31A0UL, 0x31BFUL ), /* Bopomofo Extended */ - AF_UNIRANGE_REC( 0x31C0UL, 0x31EFUL ), /* CJK Strokes */ - AF_UNIRANGE_REC( 0x31F0UL, 0x31FFUL ), /* Katakana Phonetic Extensions */ - AF_UNIRANGE_REC( 0x3200UL, 0x32FFUL ), /* Enclosed CJK Letters and Months */ - AF_UNIRANGE_REC( 0x3300UL, 0x33FFUL ), /* CJK Compatibility */ - AF_UNIRANGE_REC( 0x3400UL, 0x4DBFUL ), /* CJK Unified Ideographs Extension A */ - AF_UNIRANGE_REC( 0x4DC0UL, 0x4DFFUL ), /* Yijing Hexagram Symbols */ - AF_UNIRANGE_REC( 0x4E00UL, 0x9FFFUL ), /* CJK Unified Ideographs */ - AF_UNIRANGE_REC( 0xA960UL, 0xA97FUL ), /* Hangul Jamo Extended-A */ - AF_UNIRANGE_REC( 0xAC00UL, 0xD7AFUL ), /* Hangul Syllables */ - AF_UNIRANGE_REC( 0xD7B0UL, 0xD7FFUL ), /* Hangul Jamo Extended-B */ - AF_UNIRANGE_REC( 0xF900UL, 0xFAFFUL ), /* CJK Compatibility Ideographs */ - AF_UNIRANGE_REC( 0xFE10UL, 0xFE1FUL ), /* Vertical forms */ - AF_UNIRANGE_REC( 0xFE30UL, 0xFE4FUL ), /* CJK Compatibility Forms */ - AF_UNIRANGE_REC( 0xFF00UL, 0xFFEFUL ), /* Halfwidth and Fullwidth Forms */ - AF_UNIRANGE_REC( 0x1B000UL, 0x1B0FFUL ), /* Kana Supplement */ - AF_UNIRANGE_REC( 0x1D300UL, 0x1D35FUL ), /* Tai Xuan Hing Symbols */ - AF_UNIRANGE_REC( 0x1F200UL, 0x1F2FFUL ), /* Enclosed Ideographic Supplement */ - AF_UNIRANGE_REC( 0x20000UL, 0x2A6DFUL ), /* CJK Unified Ideographs Extension B */ - AF_UNIRANGE_REC( 0x2A700UL, 0x2B73FUL ), /* CJK Unified Ideographs Extension C */ - AF_UNIRANGE_REC( 0x2B740UL, 0x2B81FUL ), /* CJK Unified Ideographs Extension D */ - AF_UNIRANGE_REC( 0x2F800UL, 0x2FA1FUL ), /* CJK Compatibility Ideographs Supplement */ - AF_UNIRANGE_REC( 0UL, 0UL ) - }; - - - AF_DEFINE_SCRIPT_CLASS( af_cjk_script_class, - AF_SCRIPT_CJK, - af_cjk_uniranges, + AF_WRITING_SYSTEM_CJK, sizeof ( AF_CJKMetricsRec ), - (AF_Script_InitMetricsFunc) af_cjk_metrics_init, - (AF_Script_ScaleMetricsFunc)af_cjk_metrics_scale, - (AF_Script_DoneMetricsFunc) NULL, + (AF_WritingSystem_InitMetricsFunc) af_cjk_metrics_init, + (AF_WritingSystem_ScaleMetricsFunc)af_cjk_metrics_scale, + (AF_WritingSystem_DoneMetricsFunc) NULL, - (AF_Script_InitHintsFunc) af_cjk_hints_init, - (AF_Script_ApplyHintsFunc) af_cjk_hints_apply + (AF_WritingSystem_InitHintsFunc) af_cjk_hints_init, + (AF_WritingSystem_ApplyHintsFunc) af_cjk_hints_apply ) + #else /* !AF_CONFIG_OPTION_CJK */ - static const AF_Script_UniRangeRec af_cjk_uniranges[] = - { - AF_UNIRANGE_REC( 0UL, 0UL ) - }; + AF_DEFINE_WRITING_SYSTEM_CLASS( + af_cjk_writing_system_class, - AF_DEFINE_SCRIPT_CLASS( af_cjk_script_class, - AF_SCRIPT_CJK, - af_cjk_uniranges, + AF_WRITING_SYSTEM_CJK, sizeof ( AF_CJKMetricsRec ), - (AF_Script_InitMetricsFunc) NULL, - (AF_Script_ScaleMetricsFunc)NULL, - (AF_Script_DoneMetricsFunc) NULL, + (AF_WritingSystem_InitMetricsFunc) NULL, + (AF_WritingSystem_ScaleMetricsFunc)NULL, + (AF_WritingSystem_DoneMetricsFunc) NULL, - (AF_Script_InitHintsFunc) NULL, - (AF_Script_ApplyHintsFunc) NULL + (AF_WritingSystem_InitHintsFunc) NULL, + (AF_WritingSystem_ApplyHintsFunc) NULL ) + #endif /* !AF_CONFIG_OPTION_CJK */ diff --git a/src/autofit/afcjk.h b/src/autofit/afcjk.h index 8416c0d..4dd4f39 100644 --- a/src/autofit/afcjk.h +++ b/src/autofit/afcjk.h @@ -2,9 +2,9 @@ /* */ /* afcjk.h */ /* */ -/* Auto-fitter hinting routines for CJK script (specification). */ +/* Auto-fitter hinting routines for CJK writing system (specification). */ /* */ -/* Copyright 2006, 2007, 2011 by */ +/* Copyright 2006, 2007, 2011-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -26,39 +26,41 @@ FT_BEGIN_HEADER - /* the CJK-specific script class */ + /* the CJK-specific writing system */ - AF_DECLARE_SCRIPT_CLASS(af_cjk_script_class) + AF_DECLARE_WRITING_SYSTEM_CLASS( af_cjk_writing_system_class ) + + + /*************************************************************************/ + /*************************************************************************/ + /***** *****/ + /***** C J K G L O B A L M E T R I C S *****/ + /***** *****/ + /*************************************************************************/ + /*************************************************************************/ - /* CJK (global) metrics management */ /* * CJK glyphs tend to fill the square. So we have both vertical and * horizontal blue zones. But some glyphs have flat bounding strokes that * leave some space between neighbour glyphs. */ - enum - { - AF_CJK_BLUE_TOP, - AF_CJK_BLUE_BOTTOM, - AF_CJK_BLUE_LEFT, - AF_CJK_BLUE_RIGHT, - - AF_CJK_BLUE_MAX - }; +#define AF_CJK_IS_TOP_BLUE( b ) \ + ( (b)->properties & AF_BLUE_PROPERTY_CJK_TOP ) +#define AF_CJK_IS_HORIZ_BLUE( b ) \ + ( (b)->properties & AF_BLUE_PROPERTY_CJK_HORIZ ) +#define AF_CJK_IS_RIGHT_BLUE AF_CJK_IS_TOP_BLUE #define AF_CJK_MAX_WIDTHS 16 -#define AF_CJK_MAX_BLUES AF_CJK_BLUE_MAX enum { - AF_CJK_BLUE_ACTIVE = 1 << 0, - AF_CJK_BLUE_IS_TOP = 1 << 1, - AF_CJK_BLUE_IS_RIGHT = 1 << 2, - AF_CJK_BLUE_ADJUSTMENT = 1 << 3, /* used for scale adjustment */ - /* optimization */ + AF_CJK_BLUE_ACTIVE = 1 << 0, /* set if zone height is <= 3/4px */ + AF_CJK_BLUE_TOP = 1 << 1, /* result of AF_CJK_IS_TOP_BLUE */ + AF_CJK_BLUE_ADJUSTMENT = 1 << 2, /* used for scale adjustment */ + /* optimization */ AF_CJK_BLUE_FLAG_MAX }; @@ -77,16 +79,16 @@ FT_BEGIN_HEADER FT_Fixed scale; FT_Pos delta; - FT_UInt width_count; - AF_WidthRec widths[AF_CJK_MAX_WIDTHS]; - FT_Pos edge_distance_threshold; - FT_Pos standard_width; - FT_Bool extra_light; + FT_UInt width_count; /* number of used widths */ + AF_WidthRec widths[AF_CJK_MAX_WIDTHS]; /* widths array */ + FT_Pos edge_distance_threshold; /* used for creating edges */ + FT_Pos standard_width; /* the default stem thickness */ + FT_Bool extra_light; /* is standard width very light? */ /* used for horizontal metrics too for CJK */ FT_Bool control_overshoot; FT_UInt blue_count; - AF_CJKBlueRec blues[AF_CJK_BLUE_MAX]; + AF_CJKBlueRec blues[AF_BLUE_STRINGSET_MAX]; FT_Fixed org_scale; FT_Pos org_delta; @@ -96,13 +98,14 @@ FT_BEGIN_HEADER typedef struct AF_CJKMetricsRec_ { - AF_ScriptMetricsRec root; - FT_UInt units_per_em; - AF_CJKAxisRec axis[AF_DIMENSION_MAX]; + AF_StyleMetricsRec root; + FT_UInt units_per_em; + AF_CJKAxisRec axis[AF_DIMENSION_MAX]; } AF_CJKMetricsRec, *AF_CJKMetrics; +#ifdef AF_CONFIG_OPTION_CJK FT_LOCAL( FT_Error ) af_cjk_metrics_init( AF_CJKMetrics metrics, FT_Face face ); @@ -120,15 +123,15 @@ FT_BEGIN_HEADER FT_Outline* outline, AF_CJKMetrics metrics ); - /* Shared. called from afindic.c */ + /* shared; called from afindic.c */ FT_LOCAL( void ) af_cjk_metrics_check_digits( AF_CJKMetrics metrics, FT_Face face ); FT_LOCAL( void ) af_cjk_metrics_init_widths( AF_CJKMetrics metrics, - FT_Face face, - FT_ULong charcode ); + FT_Face face ); +#endif /* AF_CONFIG_OPTION_CJK */ /* */ diff --git a/src/autofit/afcover.h b/src/autofit/afcover.h new file mode 100644 index 0000000..d5ac969 --- /dev/null +++ b/src/autofit/afcover.h @@ -0,0 +1,105 @@ +/***************************************************************************/ +/* */ +/* afcover.h */ +/* */ +/* Auto-fitter coverages (specification only). */ +/* */ +/* Copyright 2013, 2014 by */ +/* David Turner, Robert Wilhelm, and Werner Lemberg. */ +/* */ +/* This file is part of the FreeType project, and may only be used, */ +/* modified, and distributed under the terms of the FreeType project */ +/* license, LICENSE.TXT. By continuing to use, modify, or distribute */ +/* this file you indicate that you have read the license and */ +/* understand and accept it fully. */ +/* */ +/***************************************************************************/ + + + /* This header file can be included multiple times. */ + /* Define `COVERAGE' as needed. */ + + + /* Add new coverages here. The first and second arguments are the */ + /* coverage name in lowercase and uppercase, respectively, followed */ + /* by a description string. The last four arguments are the four */ + /* characters defining the corresponding OpenType feature. */ + +#if 0 + /* XXX: It's not possible to define blue zone characters in advance. */ + COVERAGE( alternative_fractions, ALTERNATIVE_FRACTIONS, + "alternative fractions", + 'a', 'f', 'r', 'c' ) +#endif + + COVERAGE( petite_capitals_from_capitals, PETITE_CAPITALS_FROM_CAPITALS, + "petite capitals from capitals", + 'c', '2', 'c', 'p' ) + + COVERAGE( small_capitals_from_capitals, SMALL_CAPITALS_FROM_CAPITALS, + "small capitals from capitals", + 'c', '2', 's', 'c' ) + +#if 0 + /* XXX: Only digits are in this coverage, however, both normal style */ + /* and oldstyle representation forms are possible. */ + COVERAGE( denominators, DENOMINATORS, + "denominators", + 'd', 'n', 'o', 'm' ) +#endif + +#if 0 + /* XXX: It's not possible to define blue zone characters in advance. */ + COVERAGE( fractions, FRACTIONS, + "fractions", + 'f', 'r', 'a', 'c' ) +#endif + +#if 0 + /* XXX: Only digits are in this coverage, however, both normal style */ + /* and oldstyle representation forms are possible. */ + COVERAGE( numerators, NUMERATORS, + "numerators", + 'n', 'u', 'm', 'r' ) +#endif + + COVERAGE( ordinals, ORDINALS, + "ordinals", + 'o', 'r', 'd', 'n' ) + + COVERAGE( petite_capitals, PETITE_CAPITALS, + "petite capitals", + 'p', 'c', 'a', 'p' ) + + COVERAGE( ruby, RUBY, + "ruby", + 'r', 'u', 'b', 'y' ) + + COVERAGE( scientific_inferiors, SCIENTIFIC_INFERIORS, + "scientific inferiors", + 's', 'i', 'n', 'f' ) + + COVERAGE( small_capitals, SMALL_CAPITALS, + "small capitals", + 's', 'm', 'c', 'p' ) + + COVERAGE( subscript, SUBSCRIPT, + "subscript", + 's', 'u', 'b', 's' ) + + COVERAGE( superscript, SUPERSCRIPT, + "superscript", + 's', 'u', 'p', 's' ) + + COVERAGE( titling, TITLING, + "titling", + 't', 'i', 't', 'l' ) + +#if 0 + /* to be always excluded */ + COVERAGE(nalt, 'n', 'a', 'l', 't'); /* Alternate Annotation Forms (?) */ + COVERAGE(ornm, 'o', 'r', 'n', 'm'); /* Ornaments (?) */ +#endif + + +/* END */ diff --git a/src/autofit/afdummy.c b/src/autofit/afdummy.c index 4bf278c..f8702a1 100644 --- a/src/autofit/afdummy.c +++ b/src/autofit/afdummy.c @@ -5,7 +5,7 @@ /* Auto-fitter dummy routines to be used if no hinting should be */ /* performed (body). */ /* */ -/* Copyright 2003-2005, 2011 by */ +/* Copyright 2003-2005, 2011, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -23,12 +23,17 @@ static FT_Error - af_dummy_hints_init( AF_GlyphHints hints, - AF_ScriptMetrics metrics ) + af_dummy_hints_init( AF_GlyphHints hints, + AF_StyleMetrics metrics ) { - af_glyph_hints_rescale( hints, - metrics ); - return AF_Err_Ok; + af_glyph_hints_rescale( hints, metrics ); + + hints->x_scale = metrics->scaler.x_scale; + hints->y_scale = metrics->scaler.y_scale; + hints->x_delta = metrics->scaler.x_delta; + hints->y_delta = metrics->scaler.y_delta; + + return FT_Err_Ok; } @@ -36,25 +41,30 @@ af_dummy_hints_apply( AF_GlyphHints hints, FT_Outline* outline ) { - FT_UNUSED( hints ); - FT_UNUSED( outline ); + FT_Error error; + - return AF_Err_Ok; + error = af_glyph_hints_reload( hints, outline ); + if ( !error ) + af_glyph_hints_save( hints, outline ); + + return error; } - AF_DEFINE_SCRIPT_CLASS( af_dummy_script_class, - AF_SCRIPT_NONE, - NULL, + AF_DEFINE_WRITING_SYSTEM_CLASS( + af_dummy_writing_system_class, + + AF_WRITING_SYSTEM_DUMMY, - sizeof ( AF_ScriptMetricsRec ), + sizeof ( AF_StyleMetricsRec ), - (AF_Script_InitMetricsFunc) NULL, - (AF_Script_ScaleMetricsFunc)NULL, - (AF_Script_DoneMetricsFunc) NULL, + (AF_WritingSystem_InitMetricsFunc) NULL, + (AF_WritingSystem_ScaleMetricsFunc)NULL, + (AF_WritingSystem_DoneMetricsFunc) NULL, - (AF_Script_InitHintsFunc) af_dummy_hints_init, - (AF_Script_ApplyHintsFunc) af_dummy_hints_apply + (AF_WritingSystem_InitHintsFunc) af_dummy_hints_init, + (AF_WritingSystem_ApplyHintsFunc) af_dummy_hints_apply ) diff --git a/src/autofit/afdummy.h b/src/autofit/afdummy.h index 95d8f8c..ad1b0d3 100644 --- a/src/autofit/afdummy.h +++ b/src/autofit/afdummy.h @@ -5,7 +5,7 @@ /* Auto-fitter dummy routines to be used if no hinting should be */ /* performed (specification). */ /* */ -/* Copyright 2003-2005, 2011 by */ +/* Copyright 2003-2005, 2011, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -25,11 +25,9 @@ FT_BEGIN_HEADER - /* A dummy script metrics class used when no hinting should - * be performed. This is the default for non-latin glyphs! - */ + /* A dummy writing system used when no hinting should be performed. */ - AF_DECLARE_SCRIPT_CLASS( af_dummy_script_class ) + AF_DECLARE_WRITING_SYSTEM_CLASS( af_dummy_writing_system_class ) /* */ diff --git a/src/autofit/afglobal.c b/src/autofit/afglobal.c index 3e0c02d..a54c20c 100644 --- a/src/autofit/afglobal.c +++ b/src/autofit/afglobal.c @@ -4,7 +4,7 @@ /* */ /* Auto-fitter routines to compute global hinting values (body). */ /* */ -/* Copyright 2003-2011 by */ +/* Copyright 2003-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -17,129 +17,215 @@ #include "afglobal.h" -#include "afdummy.h" -#include "aflatin.h" -#include "afcjk.h" -#include "afindic.h" -#include "afpic.h" +#include "afranges.h" +#include "hbshim.h" +#include FT_INTERNAL_DEBUG_H + + + /*************************************************************************/ + /* */ + /* The macro FT_COMPONENT is used in trace mode. It is an implicit */ + /* parameter of the FT_TRACE() and FT_ERROR() macros, used to print/log */ + /* messages during execution. */ + /* */ +#undef FT_COMPONENT +#define FT_COMPONENT trace_afglobal + + + /* get writing system specific header files */ +#undef WRITING_SYSTEM +#define WRITING_SYSTEM( ws, WS ) /* empty */ +#include "afwrtsys.h" #include "aferrors.h" +#include "afpic.h" + + +#undef SCRIPT +#define SCRIPT( s, S, d, h, sc1, sc2, sc3 ) \ + AF_DEFINE_SCRIPT_CLASS( \ + af_ ## s ## _script_class, \ + AF_SCRIPT_ ## S, \ + af_ ## s ## _uniranges, \ + sc1, sc2, sc3 ) + +#include "afscript.h" + + +#undef STYLE +#define STYLE( s, S, d, ws, sc, ss, c ) \ + AF_DEFINE_STYLE_CLASS( \ + af_ ## s ## _style_class, \ + AF_STYLE_ ## S, \ + ws, \ + sc, \ + ss, \ + c ) + +#include "afstyles.h" -#ifdef FT_OPTION_AUTOFIT2 -#include "aflatin2.h" -#endif #ifndef FT_CONFIG_OPTION_PIC - /* when updating this table, don't forget to update */ - /* AF_SCRIPT_CLASSES_COUNT and autofit_module_class_pic_init */ +#undef WRITING_SYSTEM +#define WRITING_SYSTEM( ws, WS ) \ + &af_ ## ws ## _writing_system_class, - /* populate this list when you add new scripts */ - static AF_ScriptClass const af_script_classes[] = + FT_LOCAL_ARRAY_DEF( AF_WritingSystemClass ) + af_writing_system_classes[] = { - &af_dummy_script_class, -#ifdef FT_OPTION_AUTOFIT2 - &af_latin2_script_class, -#endif - &af_latin_script_class, - &af_cjk_script_class, - &af_indic_script_class, + +#include "afwrtsys.h" + + NULL /* do not remove */ + }; + + +#undef SCRIPT +#define SCRIPT( s, S, d, h, sc1, sc2, sc3 ) \ + &af_ ## s ## _script_class, + + FT_LOCAL_ARRAY_DEF( AF_ScriptClass ) + af_script_classes[] = + { + +#include "afscript.h" + + NULL /* do not remove */ + }; + + +#undef STYLE +#define STYLE( s, S, d, ws, sc, ss, c ) \ + &af_ ## s ## _style_class, + + FT_LOCAL_ARRAY_DEF( AF_StyleClass ) + af_style_classes[] = + { + +#include "afstyles.h" + NULL /* do not remove */ }; #endif /* !FT_CONFIG_OPTION_PIC */ - /* index of default script in `af_script_classes' */ -#define AF_SCRIPT_LIST_DEFAULT 2 - /* a bit mask indicating an uncovered glyph */ -#define AF_SCRIPT_LIST_NONE 0x7F - /* if this flag is set, we have an ASCII digit */ -#define AF_DIGIT 0x80 +#ifdef FT_DEBUG_LEVEL_TRACE + +#undef STYLE +#define STYLE( s, S, d, ws, sc, ss, c ) #s, - /* - * Note that glyph_scripts[] is used to map each glyph into - * an index into the `af_script_classes' array. - * - */ - typedef struct AF_FaceGlobalsRec_ + FT_LOCAL_ARRAY_DEF( char* ) + af_style_names[] = { - FT_Face face; - FT_Long glyph_count; /* same as face->num_glyphs */ - FT_Byte* glyph_scripts; - AF_ScriptMetrics metrics[AF_SCRIPT_MAX]; +#include "afstyles.h" + + }; - } AF_FaceGlobalsRec; +#endif /* FT_DEBUG_LEVEL_TRACE */ - /* Compute the script index of each glyph within a given face. */ + /* Compute the style index of each glyph within a given face. */ static FT_Error - af_face_globals_compute_script_coverage( AF_FaceGlobals globals ) + af_face_globals_compute_style_coverage( AF_FaceGlobals globals ) { - FT_Error error = AF_Err_Ok; + FT_Error error; FT_Face face = globals->face; FT_CharMap old_charmap = face->charmap; - FT_Byte* gscripts = globals->glyph_scripts; - FT_UInt ss, i; + FT_Byte* gstyles = globals->glyph_styles; + FT_UInt ss; + FT_UInt i; + FT_UInt dflt = ~0U; /* a non-valid value */ - /* the value AF_SCRIPT_LIST_NONE means `uncovered glyph' */ - FT_MEM_SET( globals->glyph_scripts, - AF_SCRIPT_LIST_NONE, + /* the value AF_STYLE_UNASSIGNED means `uncovered glyph' */ + FT_MEM_SET( globals->glyph_styles, + AF_STYLE_UNASSIGNED, globals->glyph_count ); error = FT_Select_Charmap( face, FT_ENCODING_UNICODE ); if ( error ) { - /* - * Ignore this error; we simply use the default script. - * XXX: Shouldn't we rather disable hinting? - */ - error = AF_Err_Ok; + /* + * Ignore this error; we simply use the fallback style. + * XXX: Shouldn't we rather disable hinting? + */ + error = FT_Err_Ok; goto Exit; } - /* scan each script in a Unicode charmap */ - for ( ss = 0; AF_SCRIPT_CLASSES_GET[ss]; ss++ ) + /* scan each style in a Unicode charmap */ + for ( ss = 0; AF_STYLE_CLASSES_GET[ss]; ss++ ) { - AF_ScriptClass clazz = AF_SCRIPT_CLASSES_GET[ss]; + AF_StyleClass style_class = + AF_STYLE_CLASSES_GET[ss]; + AF_ScriptClass script_class = + AF_SCRIPT_CLASSES_GET[style_class->script]; AF_Script_UniRange range; - if ( clazz->script_uni_ranges == NULL ) + if ( script_class->script_uni_ranges == NULL ) continue; /* - * Scan all unicode points in the range and set the corresponding - * glyph script index. + * Scan all Unicode points in the range and set the corresponding + * glyph style index. */ - for ( range = clazz->script_uni_ranges; range->first != 0; range++ ) + if ( style_class->coverage == AF_COVERAGE_DEFAULT ) { - FT_ULong charcode = range->first; - FT_UInt gindex; + if ( (FT_UInt)style_class->script == + globals->module->default_script ) + dflt = ss; + for ( range = script_class->script_uni_ranges; + range->first != 0; + range++ ) + { + FT_ULong charcode = range->first; + FT_UInt gindex; - gindex = FT_Get_Char_Index( face, charcode ); - if ( gindex != 0 && - gindex < (FT_ULong)globals->glyph_count && - gscripts[gindex] == AF_SCRIPT_LIST_NONE ) - gscripts[gindex] = (FT_Byte)ss; + gindex = FT_Get_Char_Index( face, charcode ); - for (;;) - { - charcode = FT_Get_Next_Char( face, charcode, &gindex ); + if ( gindex != 0 && + gindex < (FT_ULong)globals->glyph_count && + gstyles[gindex] == AF_STYLE_UNASSIGNED ) + gstyles[gindex] = (FT_Byte)ss; + + for (;;) + { + charcode = FT_Get_Next_Char( face, charcode, &gindex ); - if ( gindex == 0 || charcode > range->last ) - break; + if ( gindex == 0 || charcode > range->last ) + break; - if ( gindex < (FT_ULong)globals->glyph_count && - gscripts[gindex] == AF_SCRIPT_LIST_NONE ) - gscripts[gindex] = (FT_Byte)ss; + if ( gindex < (FT_ULong)globals->glyph_count && + gstyles[gindex] == AF_STYLE_UNASSIGNED ) + gstyles[gindex] = (FT_Byte)ss; + } } } + else + { + /* get glyphs not directly addressable by cmap */ + af_get_coverage( globals, style_class, gstyles ); + } + } + + /* handle the default OpenType features of the default script ... */ + af_get_coverage( globals, AF_STYLE_CLASSES_GET[dflt], gstyles ); + + /* ... and the remaining default OpenType features */ + for ( ss = 0; AF_STYLE_CLASSES_GET[ss]; ss++ ) + { + AF_StyleClass style_class = AF_STYLE_CLASSES_GET[ss]; + + + if ( ss != dflt && style_class->coverage == AF_COVERAGE_DEFAULT ) + af_get_coverage( globals, style_class, gstyles ); } /* mark ASCII digits */ @@ -149,28 +235,68 @@ if ( gindex != 0 && gindex < (FT_ULong)globals->glyph_count ) - gscripts[gindex] |= AF_DIGIT; + gstyles[gindex] |= AF_DIGIT; } Exit: /* - * By default, all uncovered glyphs are set to the latin script. + * By default, all uncovered glyphs are set to the fallback style. * XXX: Shouldn't we disable hinting or do something similar? */ + if ( globals->module->fallback_style != AF_STYLE_UNASSIGNED ) { FT_Long nn; for ( nn = 0; nn < globals->glyph_count; nn++ ) { - if ( ( gscripts[nn] & ~AF_DIGIT ) == AF_SCRIPT_LIST_NONE ) + if ( ( gstyles[nn] & ~AF_DIGIT ) == AF_STYLE_UNASSIGNED ) { - gscripts[nn] &= ~AF_SCRIPT_LIST_NONE; - gscripts[nn] |= AF_SCRIPT_LIST_DEFAULT; + gstyles[nn] &= ~AF_STYLE_UNASSIGNED; + gstyles[nn] |= globals->module->fallback_style; } } } +#ifdef FT_DEBUG_LEVEL_TRACE + + FT_TRACE4(( "\n" + "style coverage\n" + "==============\n" + "\n" )); + + for ( ss = 0; AF_STYLE_CLASSES_GET[ss]; ss++ ) + { + AF_StyleClass style_class = AF_STYLE_CLASSES_GET[ss]; + FT_UInt count = 0; + FT_Long idx; + + + FT_TRACE4(( "%s:\n", af_style_names[style_class->style] )); + + for ( idx = 0; idx < globals->glyph_count; idx++ ) + { + if ( ( gstyles[idx] & ~AF_DIGIT ) == style_class->style ) + { + if ( !( count % 10 ) ) + FT_TRACE4(( " " )); + + FT_TRACE4(( " %d", idx )); + count++; + + if ( !( count % 10 ) ) + FT_TRACE4(( "\n" )); + } + } + + if ( !count ) + FT_TRACE4(( " (none)\n" )); + if ( count % 10 ) + FT_TRACE4(( "\n" )); + } + +#endif /* FT_DEBUG_LEVEL_TRACE */ + FT_Set_Charmap( face, old_charmap ); return error; } @@ -178,7 +304,8 @@ FT_LOCAL_DEF( FT_Error ) af_face_globals_new( FT_Face face, - AF_FaceGlobals *aglobals ) + AF_FaceGlobals *aglobals, + AF_Module module ) { FT_Error error; FT_Memory memory; @@ -187,21 +314,29 @@ memory = face->memory; - if ( !FT_ALLOC( globals, sizeof ( *globals ) + - face->num_glyphs * sizeof ( FT_Byte ) ) ) - { - globals->face = face; - globals->glyph_count = face->num_glyphs; - globals->glyph_scripts = (FT_Byte*)( globals + 1 ); + if ( FT_ALLOC( globals, sizeof ( *globals ) + + face->num_glyphs * sizeof ( FT_Byte ) ) ) + goto Exit; - error = af_face_globals_compute_script_coverage( globals ); - if ( error ) - { - af_face_globals_free( globals ); - globals = NULL; - } + globals->face = face; + globals->glyph_count = face->num_glyphs; + globals->glyph_styles = (FT_Byte*)( globals + 1 ); + globals->module = module; + +#ifdef FT_CONFIG_OPTION_USE_HARFBUZZ + globals->hb_font = hb_ft_font_create( face, NULL ); +#endif + + error = af_face_globals_compute_style_coverage( globals ); + if ( error ) + { + af_face_globals_free( globals ); + globals = NULL; } + else + globals->increase_x_height = AF_PROP_INCREASE_X_HEIGHT_MAX; + Exit: *aglobals = globals; return error; } @@ -216,25 +351,31 @@ FT_UInt nn; - for ( nn = 0; nn < AF_SCRIPT_MAX; nn++ ) + for ( nn = 0; nn < AF_STYLE_MAX; nn++ ) { if ( globals->metrics[nn] ) { - AF_ScriptClass clazz = AF_SCRIPT_CLASSES_GET[nn]; - + AF_StyleClass style_class = + AF_STYLE_CLASSES_GET[nn]; + AF_WritingSystemClass writing_system_class = + AF_WRITING_SYSTEM_CLASSES_GET[style_class->writing_system]; - FT_ASSERT( globals->metrics[nn]->clazz == clazz ); - if ( clazz->script_metrics_done ) - clazz->script_metrics_done( globals->metrics[nn] ); + if ( writing_system_class->style_metrics_done ) + writing_system_class->style_metrics_done( globals->metrics[nn] ); FT_FREE( globals->metrics[nn] ); } } - globals->glyph_count = 0; - globals->glyph_scripts = NULL; /* no need to free this one! */ - globals->face = NULL; +#ifdef FT_CONFIG_OPTION_USE_HARFBUZZ + hb_font_destroy( globals->hb_font ); + globals->hb_font = NULL; +#endif + + globals->glyph_count = 0; + globals->glyph_styles = NULL; /* no need to free this one! */ + globals->face = NULL; FT_FREE( globals ); } @@ -242,60 +383,64 @@ FT_LOCAL_DEF( FT_Error ) - af_face_globals_get_metrics( AF_FaceGlobals globals, - FT_UInt gindex, - FT_UInt options, - AF_ScriptMetrics *ametrics ) + af_face_globals_get_metrics( AF_FaceGlobals globals, + FT_UInt gindex, + FT_UInt options, + AF_StyleMetrics *ametrics ) { - AF_ScriptMetrics metrics = NULL; - FT_UInt gidx; - AF_ScriptClass clazz; - FT_UInt script = options & 15; - const FT_Offset script_max = sizeof ( AF_SCRIPT_CLASSES_GET ) / - sizeof ( AF_SCRIPT_CLASSES_GET[0] ); - FT_Error error = AF_Err_Ok; + AF_StyleMetrics metrics = NULL; + + AF_Style style = (AF_Style)options; + AF_WritingSystemClass writing_system_class; + AF_StyleClass style_class; + + FT_Error error = FT_Err_Ok; if ( gindex >= (FT_ULong)globals->glyph_count ) { - error = AF_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Exit; } - gidx = script; - if ( gidx == 0 || gidx + 1 >= script_max ) - gidx = globals->glyph_scripts[gindex] & AF_SCRIPT_LIST_NONE; + /* if we have a forced style (via `options'), use it, */ + /* otherwise look into `glyph_styles' array */ + if ( style == AF_STYLE_NONE_DFLT || style + 1 >= AF_STYLE_MAX ) + style = (AF_Style)( globals->glyph_styles[gindex] & + AF_STYLE_UNASSIGNED ); - clazz = AF_SCRIPT_CLASSES_GET[gidx]; - if ( script == 0 ) - script = clazz->script; + style_class = AF_STYLE_CLASSES_GET[style]; + writing_system_class = AF_WRITING_SYSTEM_CLASSES_GET + [style_class->writing_system]; - metrics = globals->metrics[clazz->script]; + metrics = globals->metrics[style]; if ( metrics == NULL ) { - /* create the global metrics object when needed */ + /* create the global metrics object if necessary */ FT_Memory memory = globals->face->memory; - if ( FT_ALLOC( metrics, clazz->script_metrics_size ) ) + if ( FT_ALLOC( metrics, writing_system_class->style_metrics_size ) ) goto Exit; - metrics->clazz = clazz; + metrics->style_class = style_class; + metrics->globals = globals; - if ( clazz->script_metrics_init ) + if ( writing_system_class->style_metrics_init ) { - error = clazz->script_metrics_init( metrics, globals->face ); + error = writing_system_class->style_metrics_init( metrics, + globals->face ); if ( error ) { - if ( clazz->script_metrics_done ) - clazz->script_metrics_done( metrics ); + if ( writing_system_class->style_metrics_done ) + writing_system_class->style_metrics_done( metrics ); FT_FREE( metrics ); goto Exit; } } - globals->metrics[clazz->script] = metrics; + globals->metrics[style] = metrics; } Exit: @@ -310,7 +455,7 @@ FT_UInt gindex ) { if ( gindex < (FT_ULong)globals->glyph_count ) - return (FT_Bool)( globals->glyph_scripts[gindex] & AF_DIGIT ); + return (FT_Bool)( globals->glyph_styles[gindex] & AF_DIGIT ); return (FT_Bool)0; } diff --git a/src/autofit/afglobal.h b/src/autofit/afglobal.h index cc6860b..38d8d69 100644 --- a/src/autofit/afglobal.h +++ b/src/autofit/afglobal.h @@ -5,7 +5,7 @@ /* Auto-fitter routines to compute global hinting values */ /* (specification). */ /* */ -/* Copyright 2003-2005, 2007, 2009, 2011 by */ +/* Copyright 2003-2005, 2007, 2009, 2011-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -22,11 +22,66 @@ #include "aftypes.h" +#include "afmodule.h" +#include "hbshim.h" FT_BEGIN_HEADER + FT_LOCAL_ARRAY( AF_WritingSystemClass ) + af_writing_system_classes[]; + + +#undef SCRIPT +#define SCRIPT( s, S, d, h, sc1, sc2, sc3 ) \ + AF_DECLARE_SCRIPT_CLASS( af_ ## s ## _script_class ) + +#include "afscript.h" + + FT_LOCAL_ARRAY( AF_ScriptClass ) + af_script_classes[]; + + +#undef STYLE +#define STYLE( s, S, d, ws, sc, ss, c ) \ + AF_DECLARE_STYLE_CLASS( af_ ## s ## _style_class ) + +#include "afstyles.h" + + FT_LOCAL_ARRAY( AF_StyleClass ) + af_style_classes[]; + + +#ifdef FT_DEBUG_LEVEL_TRACE + FT_LOCAL_ARRAY( char* ) + af_style_names[]; +#endif + + + /* + * Default values and flags for both autofitter globals (found in + * AF_ModuleRec) and face globals (in AF_FaceGlobalsRec). + */ + + /* index of fallback style in `af_style_classes' */ +#ifdef AF_CONFIG_OPTION_CJK +#define AF_STYLE_FALLBACK AF_STYLE_HANI_DFLT +#else +#define AF_STYLE_FALLBACK AF_STYLE_NONE_DFLT +#endif + /* default script for OpenType; ignored if HarfBuzz isn't used */ +#define AF_SCRIPT_DEFAULT AF_SCRIPT_LATN + /* a bit mask indicating an uncovered glyph */ +#define AF_STYLE_UNASSIGNED 0x7F + /* if this flag is set, we have an ASCII digit */ +#define AF_DIGIT 0x80 + + /* `increase-x-height' property */ +#define AF_PROP_INCREASE_X_HEIGHT_MIN 6 +#define AF_PROP_INCREASE_X_HEIGHT_MAX 0 + + /************************************************************************/ /************************************************************************/ /***** *****/ @@ -37,21 +92,45 @@ FT_BEGIN_HEADER /* - * model the global hints data for a given face, decomposed into - * script-specific items + * Note that glyph_styles[] maps each glyph to an index into the + * `af_style_classes' array. + * */ - typedef struct AF_FaceGlobalsRec_* AF_FaceGlobals; + typedef struct AF_FaceGlobalsRec_ + { + FT_Face face; + FT_Long glyph_count; /* same as face->num_glyphs */ + FT_Byte* glyph_styles; + +#ifdef FT_CONFIG_OPTION_USE_HARFBUZZ + hb_font_t* hb_font; +#endif + + /* per-face auto-hinter properties */ + FT_UInt increase_x_height; + AF_StyleMetrics metrics[AF_STYLE_MAX]; + + AF_Module module; /* to access global properties */ + + } AF_FaceGlobalsRec; + + + /* + * model the global hints data for a given face, decomposed into + * style-specific items + */ FT_LOCAL( FT_Error ) af_face_globals_new( FT_Face face, - AF_FaceGlobals *aglobals ); + AF_FaceGlobals *aglobals, + AF_Module module ); FT_LOCAL( FT_Error ) - af_face_globals_get_metrics( AF_FaceGlobals globals, - FT_UInt gindex, - FT_UInt options, - AF_ScriptMetrics *ametrics ); + af_face_globals_get_metrics( AF_FaceGlobals globals, + FT_UInt gindex, + FT_UInt options, + AF_StyleMetrics *ametrics ); FT_LOCAL( void ) af_face_globals_free( AF_FaceGlobals globals ); diff --git a/src/autofit/afhints.c b/src/autofit/afhints.c index f51066f..f3cc50f 100644 --- a/src/autofit/afhints.c +++ b/src/autofit/afhints.c @@ -4,7 +4,7 @@ /* */ /* Auto-fitter hinting routines (body). */ /* */ -/* Copyright 2003-2007, 2009-2011 by */ +/* Copyright 2003-2007, 2009-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -19,6 +19,17 @@ #include "afhints.h" #include "aferrors.h" #include FT_INTERNAL_CALC_H +#include FT_INTERNAL_DEBUG_H + + + /*************************************************************************/ + /* */ + /* The macro FT_COMPONENT is used in trace mode. It is an implicit */ + /* parameter of the FT_TRACE() and FT_ERROR() macros, used to print/log */ + /* messages during execution. */ + /* */ +#undef FT_COMPONENT +#define FT_COMPONENT trace_afhints /* Get new segment for given axis. */ @@ -28,7 +39,7 @@ FT_Memory memory, AF_Segment *asegment ) { - FT_Error error = AF_Err_Ok; + FT_Error error = FT_Err_Ok; AF_Segment segment = NULL; @@ -41,7 +52,7 @@ if ( old_max >= big_max ) { - error = AF_Err_Out_Of_Memory; + error = FT_THROW( Out_Of_Memory ); goto Exit; } @@ -63,16 +74,17 @@ } - /* Get new edge for given axis, direction, and position. */ + /* Get new edge for given axis, direction, and position, */ + /* without initializing the edge itself. */ FT_LOCAL( FT_Error ) af_axis_hints_new_edge( AF_AxisHints axis, FT_Int fpos, AF_Direction dir, FT_Memory memory, - AF_Edge *aedge ) + AF_Edge *anedge ) { - FT_Error error = AF_Err_Ok; + FT_Error error = FT_Err_Ok; AF_Edge edge = NULL; AF_Edge edges; @@ -86,7 +98,7 @@ if ( old_max >= big_max ) { - error = AF_Err_Out_Of_Memory; + error = FT_THROW( Out_Of_Memory ); goto Exit; } @@ -119,12 +131,8 @@ axis->num_edges++; - FT_ZERO( edge ); - edge->fpos = (FT_Short)fpos; - edge->dir = (FT_Char)dir; - Exit: - *aedge = edge; + *anedge = edge; return error; } @@ -133,6 +141,17 @@ #include FT_CONFIG_STANDARD_LIBRARY_H + /* The dump functions are used in the `ftgrid' demo program, too. */ +#define AF_DUMP( varformat ) \ + do \ + { \ + if ( to_stdout ) \ + printf varformat; \ + else \ + FT_TRACE7( varformat ); \ + } while ( 0 ) + + static const char* af_dir_str( AF_Direction dir ) { @@ -161,43 +180,37 @@ } -#define AF_INDEX_NUM( ptr, base ) ( (ptr) ? ( (ptr) - (base) ) : -1 ) +#define AF_INDEX_NUM( ptr, base ) (int)( (ptr) ? ( (ptr) - (base) ) : -1 ) #ifdef __cplusplus extern "C" { #endif void - af_glyph_hints_dump_points( AF_GlyphHints hints ) + af_glyph_hints_dump_points( AF_GlyphHints hints, + FT_Bool to_stdout ) { AF_Point points = hints->points; AF_Point limit = points + hints->num_points; AF_Point point; - printf( "Table of points:\n" ); - printf( " [ index | xorg | yorg | xscale | yscale" - " | xfit | yfit | flags ]\n" ); + AF_DUMP(( "Table of points:\n" + " [ index | xorg | yorg | xscale | yscale" + " | xfit | yfit | flags ]\n" )); for ( point = points; point < limit; point++ ) - { - printf( " [ %5d | %5d | %5d | %6.2f | %6.2f" - " | %5.2f | %5.2f | %c%c%c%c%c%c ]\n", - point - points, - point->fx, - point->fy, - point->ox / 64.0, - point->oy / 64.0, - point->x / 64.0, - point->y / 64.0, - ( point->flags & AF_FLAG_WEAK_INTERPOLATION ) ? 'w' : ' ', - ( point->flags & AF_FLAG_INFLECTION ) ? 'i' : ' ', - ( point->flags & AF_FLAG_EXTREMA_X ) ? '<' : ' ', - ( point->flags & AF_FLAG_EXTREMA_Y ) ? 'v' : ' ', - ( point->flags & AF_FLAG_ROUND_X ) ? '(' : ' ', - ( point->flags & AF_FLAG_ROUND_Y ) ? 'u' : ' '); - } - printf( "\n" ); + AF_DUMP(( " [ %5d | %5d | %5d | %6.2f | %6.2f" + " | %5.2f | %5.2f | %c ]\n", + AF_INDEX_NUM( point, points ), + point->fx, + point->fy, + point->ox / 64.0, + point->oy / 64.0, + point->x / 64.0, + point->y / 64.0, + ( point->flags & AF_FLAG_WEAK_INTERPOLATION ) ? 'w' : ' ')); + AF_DUMP(( "\n" )); } #ifdef __cplusplus } @@ -226,7 +239,7 @@ if ( pos == 0 ) return "normal"; - temp[pos] = 0; + temp[pos] = '\0'; return temp; } @@ -238,7 +251,8 @@ extern "C" { #endif void - af_glyph_hints_dump_segments( AF_GlyphHints hints ) + af_glyph_hints_dump_segments( AF_GlyphHints hints, + FT_Bool to_stdout ) { FT_Int dimension; @@ -246,30 +260,41 @@ for ( dimension = 1; dimension >= 0; dimension-- ) { AF_AxisHints axis = &hints->axis[dimension]; + AF_Point points = hints->points; + AF_Edge edges = axis->edges; AF_Segment segments = axis->segments; AF_Segment limit = segments + axis->num_segments; AF_Segment seg; - printf ( "Table of %s segments:\n", - dimension == AF_DIMENSION_HORZ ? "vertical" : "horizontal" ); - printf ( " [ index | pos | dir | link | serif |" - " height | extra | flags ]\n" ); + AF_DUMP(( "Table of %s segments:\n", + dimension == AF_DIMENSION_HORZ ? "vertical" + : "horizontal" )); + if ( axis->num_segments ) + AF_DUMP(( " [ index | pos | dir | from" + " | to | link | serif | edge" + " | height | extra | flags ]\n" )); + else + AF_DUMP(( " (none)\n" )); for ( seg = segments; seg < limit; seg++ ) - { - printf ( " [ %5d | %5.2g | %5s | %4d | %5d | %6d | %5d | %11s ]\n", - seg - segments, - dimension == AF_DIMENSION_HORZ ? (int)seg->first->ox / 64.0 - : (int)seg->first->oy / 64.0, - af_dir_str( (AF_Direction)seg->dir ), - AF_INDEX_NUM( seg->link, segments ), - AF_INDEX_NUM( seg->serif, segments ), - seg->height, - seg->height - ( seg->max_coord - seg->min_coord ), - af_edge_flags_to_string( (AF_Edge_Flags)seg->flags ) ); - } - printf( "\n" ); + AF_DUMP(( " [ %5d | %5.2g | %5s | %4d" + " | %4d | %4d | %5d | %4d" + " | %6d | %5d | %11s ]\n", + AF_INDEX_NUM( seg, segments ), + dimension == AF_DIMENSION_HORZ + ? (int)seg->first->ox / 64.0 + : (int)seg->first->oy / 64.0, + af_dir_str( (AF_Direction)seg->dir ), + AF_INDEX_NUM( seg->first, points ), + AF_INDEX_NUM( seg->last, points ), + AF_INDEX_NUM( seg->link, segments ), + AF_INDEX_NUM( seg->serif, segments ), + AF_INDEX_NUM( seg->edge, edges ), + seg->height, + seg->height - ( seg->max_coord - seg->min_coord ), + af_edge_flags_to_string( (AF_Edge_Flags)seg->flags ) )); + AF_DUMP(( "\n" )); } } #ifdef __cplusplus @@ -296,7 +321,7 @@ axis = &hints->axis[dim]; *num_segments = axis->num_segments; - return AF_Err_Ok; + return FT_Err_Ok; } #ifdef __cplusplus } @@ -312,7 +337,9 @@ af_glyph_hints_get_segment_offset( AF_GlyphHints hints, FT_Int dimension, FT_Int idx, - FT_Pos* offset ) + FT_Pos *offset, + FT_Bool *is_blue, + FT_Pos *blue_offset ) { AF_Dimension dim; AF_AxisHints axis; @@ -320,20 +347,29 @@ if ( !offset ) - return AF_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); dim = ( dimension == 0 ) ? AF_DIMENSION_HORZ : AF_DIMENSION_VERT; axis = &hints->axis[dim]; if ( idx < 0 || idx >= axis->num_segments ) - return AF_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); + + seg = &axis->segments[idx]; + *offset = ( dim == AF_DIMENSION_HORZ ) ? seg->first->ox + : seg->first->oy; + if ( seg->edge ) + *is_blue = (FT_Bool)( seg->edge->blue_edge != 0 ); + else + *is_blue = FALSE; - seg = &axis->segments[idx]; - *offset = (dim == AF_DIMENSION_HORZ) ? seg->first->ox - : seg->first->oy; + if ( *is_blue ) + *blue_offset = seg->edge->blue_edge->cur; + else + *blue_offset = 0; - return AF_Err_Ok; + return FT_Err_Ok; } #ifdef __cplusplus } @@ -346,7 +382,8 @@ extern "C" { #endif void - af_glyph_hints_dump_edges( AF_GlyphHints hints ) + af_glyph_hints_dump_edges( AF_GlyphHints hints, + FT_Bool to_stdout ) { FT_Int dimension; @@ -363,92 +400,35 @@ * note: AF_DIMENSION_HORZ corresponds to _vertical_ edges * since they have a constant X coordinate. */ - printf ( "Table of %s edges:\n", - dimension == AF_DIMENSION_HORZ ? "vertical" : "horizontal" ); - printf ( " [ index | pos | dir | link |" - " serif | blue | opos | pos | flags ]\n" ); + AF_DUMP(( "Table of %s edges:\n", + dimension == AF_DIMENSION_HORZ ? "vertical" + : "horizontal" )); + if ( axis->num_edges ) + AF_DUMP(( " [ index | pos | dir | link" + " | serif | blue | opos | pos | flags ]\n" )); + else + AF_DUMP(( " (none)\n" )); for ( edge = edges; edge < limit; edge++ ) - { - printf ( " [ %5d | %5.2g | %5s | %4d |" - " %5d | %c | %5.2f | %5.2f | %11s ]\n", - edge - edges, - (int)edge->opos / 64.0, - af_dir_str( (AF_Direction)edge->dir ), - AF_INDEX_NUM( edge->link, edges ), - AF_INDEX_NUM( edge->serif, edges ), - edge->blue_edge ? 'y' : 'n', - edge->opos / 64.0, - edge->pos / 64.0, - af_edge_flags_to_string( (AF_Edge_Flags)edge->flags ) ); - } - printf( "\n" ); + AF_DUMP(( " [ %5d | %5.2g | %5s | %4d" + " | %5d | %c | %5.2f | %5.2f | %11s ]\n", + AF_INDEX_NUM( edge, edges ), + (int)edge->opos / 64.0, + af_dir_str( (AF_Direction)edge->dir ), + AF_INDEX_NUM( edge->link, edges ), + AF_INDEX_NUM( edge->serif, edges ), + edge->blue_edge ? 'y' : 'n', + edge->opos / 64.0, + edge->pos / 64.0, + af_edge_flags_to_string( (AF_Edge_Flags)edge->flags ) )); + AF_DUMP(( "\n" )); } } #ifdef __cplusplus } #endif -#else /* !FT_DEBUG_AUTOFIT */ - - /* these empty stubs are only used to link the `ftgrid' test program */ - /* if debugging is disabled */ - -#ifdef __cplusplus - extern "C" { -#endif - - void - af_glyph_hints_dump_points( AF_GlyphHints hints ) - { - FT_UNUSED( hints ); - } - - - void - af_glyph_hints_dump_segments( AF_GlyphHints hints ) - { - FT_UNUSED( hints ); - } - - - FT_Error - af_glyph_hints_get_num_segments( AF_GlyphHints hints, - FT_Int dimension, - FT_Int* num_segments ) - { - FT_UNUSED( hints ); - FT_UNUSED( dimension ); - FT_UNUSED( num_segments ); - - return 0; - } - - - FT_Error - af_glyph_hints_get_segment_offset( AF_GlyphHints hints, - FT_Int dimension, - FT_Int idx, - FT_Pos* offset ) - { - FT_UNUSED( hints ); - FT_UNUSED( dimension ); - FT_UNUSED( idx ); - FT_UNUSED( offset ); - - return 0; - } - - - void - af_glyph_hints_dump_edges( AF_GlyphHints hints ) - { - FT_UNUSED( hints ); - } - -#ifdef __cplusplus - } -#endif +#undef AF_DUMP #endif /* !FT_DEBUG_AUTOFIT */ @@ -494,8 +474,8 @@ } } - /* return no direction if arm lengths differ too much */ - /* (value 14 is heuristic) */ + /* return no direction if arm lengths differ too much */ + /* (value 14 is heuristic, corresponding to approx. 4.1 degrees) */ ss *= 14; if ( FT_ABS( ll ) <= FT_ABS( ss ) ) dir = AF_DIR_NONE; @@ -516,48 +496,48 @@ FT_LOCAL_DEF( void ) af_glyph_hints_done( AF_GlyphHints hints ) { - if ( hints && hints->memory ) - { - FT_Memory memory = hints->memory; - int dim; + FT_Memory memory = hints->memory; + int dim; - /* - * note that we don't need to free the segment and edge - * buffers since they are really within the hints->points array - */ - for ( dim = 0; dim < AF_DIMENSION_MAX; dim++ ) - { - AF_AxisHints axis = &hints->axis[dim]; + if ( !( hints && hints->memory ) ) + return; + /* + * note that we don't need to free the segment and edge + * buffers since they are really within the hints->points array + */ + for ( dim = 0; dim < AF_DIMENSION_MAX; dim++ ) + { + AF_AxisHints axis = &hints->axis[dim]; - axis->num_segments = 0; - axis->max_segments = 0; - FT_FREE( axis->segments ); - axis->num_edges = 0; - axis->max_edges = 0; - FT_FREE( axis->edges ); - } + axis->num_segments = 0; + axis->max_segments = 0; + FT_FREE( axis->segments ); - FT_FREE( hints->contours ); - hints->max_contours = 0; - hints->num_contours = 0; + axis->num_edges = 0; + axis->max_edges = 0; + FT_FREE( axis->edges ); + } - FT_FREE( hints->points ); - hints->num_points = 0; - hints->max_points = 0; + FT_FREE( hints->contours ); + hints->max_contours = 0; + hints->num_contours = 0; - hints->memory = NULL; - } + FT_FREE( hints->points ); + hints->num_points = 0; + hints->max_points = 0; + + hints->memory = NULL; } /* Reset metrics. */ FT_LOCAL_DEF( void ) - af_glyph_hints_rescale( AF_GlyphHints hints, - AF_ScriptMetrics metrics ) + af_glyph_hints_rescale( AF_GlyphHints hints, + AF_StyleMetrics metrics ) { hints->metrics = metrics; hints->scaler_flags = metrics->scaler.flags; @@ -571,7 +551,7 @@ af_glyph_hints_reload( AF_GlyphHints hints, FT_Outline* outline ) { - FT_Error error = AF_Err_Ok; + FT_Error error = FT_Err_Ok; AF_Point points; FT_UInt old_max, new_max; FT_Fixed x_scale = hints->x_scale; @@ -663,6 +643,9 @@ for ( point = points; point < point_limit; point++, vec++, tag++ ) { + point->in_dir = (FT_Char)AF_DIR_NONE; + point->out_dir = (FT_Char)AF_DIR_NONE; + point->fx = (FT_Short)vec->x; point->fy = (FT_Short)vec->y; point->ox = point->x = FT_MulFix( vec->x, x_scale ) + x_delta; @@ -710,60 +693,228 @@ } } - /* compute directions of in & out vectors */ { - AF_Point first = points; - AF_Point prev = NULL; - FT_Pos in_x = 0; - FT_Pos in_y = 0; - AF_Direction in_dir = AF_DIR_NONE; + /* + * Compute directions of `in' and `out' vectors. + * + * Note that distances between points that are very near to each + * other are accumulated. In other words, the auto-hinter + * prepends the small vectors between near points to the first + * non-near vector. All intermediate points are tagged as + * weak; the directions are adjusted also to be equal to the + * accumulated one. + */ + + /* value 20 in `near_limit' is heuristic */ + FT_UInt units_per_em = hints->metrics->scaler.face->units_per_EM; + FT_Int near_limit = 20 * units_per_em / 2048; + FT_Int near_limit2 = 2 * near_limit - 1; + + AF_Point* contour; + AF_Point* contour_limit = hints->contours + hints->num_contours; + + + for ( contour = hints->contours; contour < contour_limit; contour++ ) + { + AF_Point first = *contour; + AF_Point next, prev, curr; + FT_Pos out_x, out_y; + + FT_Bool is_first; - for ( point = points; point < point_limit; point++ ) - { - AF_Point next; - FT_Pos out_x, out_y; + /* since the first point of a contour could be part of a */ + /* series of near points, go backwards to find the first */ + /* non-near point and adjust `first' */ - if ( point == first ) + point = first; + prev = first->prev; + + while ( prev != first ) { - prev = first->prev; - in_x = first->fx - prev->fx; - in_y = first->fy - prev->fy; - in_dir = af_direction_compute( in_x, in_y ); - first = prev + 1; + out_x = point->fx - prev->fx; + out_y = point->fy - prev->fy; + + /* + * We use Taxicab metrics to measure the vector length. + * + * Note that the accumulated distances so far could have the + * opposite direction of the distance measured here. For this + * reason we use `near_limit2' for the comparison to get a + * non-near point even in the worst case. + */ + if ( FT_ABS( out_x ) + FT_ABS( out_y ) >= near_limit2 ) + break; + + point = prev; + prev = prev->prev; } - point->in_dir = (FT_Char)in_dir; + /* adjust first point */ + first = point; + + /* now loop over all points of the contour to get */ + /* `in' and `out' vector directions */ - next = point->next; - out_x = next->fx - point->fx; - out_y = next->fy - point->fy; + curr = first; - in_dir = af_direction_compute( out_x, out_y ); - point->out_dir = (FT_Char)in_dir; + /* + * We abuse the `u' and `v' fields to store index deltas to the + * next and previous non-near point, respectively. + * + * To avoid problems with not having non-near points, we point to + * `first' by default as the next non-near point. + * + */ + curr->u = (FT_Pos)( first - curr ); + first->v = -curr->u; - /* check for weak points */ + out_x = 0; + out_y = 0; - if ( point->flags & ( AF_FLAG_CONIC | AF_FLAG_CUBIC ) ) + is_first = 1; + + for ( point = first; + point != first || is_first; + point = point->next ) { + AF_Direction out_dir; + + + is_first = 0; + + next = point->next; + + out_x += next->fx - point->fx; + out_y += next->fy - point->fy; + + if ( FT_ABS( out_x ) + FT_ABS( out_y ) < near_limit ) + { + next->flags |= AF_FLAG_WEAK_INTERPOLATION; + continue; + } + + curr->u = (FT_Pos)( next - curr ); + next->v = -curr->u; + + out_dir = af_direction_compute( out_x, out_y ); + + /* adjust directions for all points inbetween; */ + /* the loop also updates position of `curr' */ + curr->out_dir = (FT_Char)out_dir; + for ( curr = curr->next; curr != next; curr = curr->next ) + { + curr->in_dir = (FT_Char)out_dir; + curr->out_dir = (FT_Char)out_dir; + } + next->in_dir = (FT_Char)out_dir; + + curr->u = (FT_Pos)( first - curr ); + first->v = -curr->u; + + out_x = 0; + out_y = 0; + } + } + + /* + * The next step is to `simplify' an outline's topology so that we + * can identify local extrema more reliably: A series of + * non-horizontal or non-vertical vectors pointing into the same + * quadrant are handled as a single, long vector. From a + * topological point of the view, the intermediate points are of no + * interest and thus tagged as weak. + */ + + for ( point = points; point < point_limit; point++ ) + { + if ( point->flags & AF_FLAG_WEAK_INTERPOLATION ) + continue; + + if ( point->in_dir == AF_DIR_NONE && + point->out_dir == AF_DIR_NONE ) + { + /* check whether both vectors point into the same quadrant */ + + FT_Pos in_x, in_y; + FT_Pos out_x, out_y; + + AF_Point next_u = point + point->u; + AF_Point prev_v = point + point->v; + + + in_x = point->fx - prev_v->fx; + in_y = point->fy - prev_v->fy; + + out_x = next_u->fx - point->fx; + out_y = next_u->fy - point->fy; + + if ( ( in_x ^ out_x ) >= 0 && ( in_y ^ out_y ) >= 0 ) + { + /* yes, so tag current point as weak */ + /* and update index deltas */ + + point->flags |= AF_FLAG_WEAK_INTERPOLATION; + + prev_v->u = (FT_Pos)( next_u - prev_v ); + next_u->v = -prev_v->u; + } + } + } + + /* + * Finally, check for remaining weak points. Everything else not + * collected in edges so far is then implicitly classified as strong + * points. + */ + + for ( point = points; point < point_limit; point++ ) + { + if ( point->flags & AF_FLAG_WEAK_INTERPOLATION ) + continue; + + if ( point->flags & AF_FLAG_CONTROL ) + { + /* control points are always weak */ Is_Weak_Point: point->flags |= AF_FLAG_WEAK_INTERPOLATION; } else if ( point->out_dir == point->in_dir ) { if ( point->out_dir != AF_DIR_NONE ) + { + /* current point lies on a horizontal or */ + /* vertical segment (but doesn't start or end it) */ goto Is_Weak_Point; + } - if ( ft_corner_is_flat( in_x, in_y, out_x, out_y ) ) - goto Is_Weak_Point; + { + AF_Point next_u = point + point->u; + AF_Point prev_v = point + point->v; + + + if ( ft_corner_is_flat( point->fx - prev_v->fx, + point->fy - prev_v->fy, + next_u->fx - point->fx, + next_u->fy - point->fy ) ) + { + /* either the `in' or the `out' vector is much more */ + /* dominant than the other one, so tag current point */ + /* as weak and update index deltas */ + + prev_v->u = (FT_Pos)( next_u - prev_v ); + next_u->v = -prev_v->u; + + goto Is_Weak_Point; + } + } } else if ( point->in_dir == -point->out_dir ) + { + /* current point forms a spike */ goto Is_Weak_Point; - - in_x = out_x; - in_y = out_y; - prev = point; + } } } } @@ -920,8 +1071,7 @@ /* if this point is candidate to weak interpolation, we */ /* interpolate it after all strong points have been processed */ - if ( ( point->flags & AF_FLAG_WEAK_INTERPOLATION ) && - !( point->flags & AF_FLAG_INFLECTION ) ) + if ( ( point->flags & AF_FLAG_WEAK_INTERPOLATION ) ) continue; if ( dim == AF_DIMENSION_VERT ) @@ -1177,8 +1327,6 @@ } } - point = points; - for ( ; contour < contour_limit; contour++ ) { AF_Point first_touched, last_touched; @@ -1201,7 +1349,6 @@ } first_touched = point; - last_touched = point; for (;;) { diff --git a/src/autofit/afhints.h b/src/autofit/afhints.h index 1c52e0d..92101de 100644 --- a/src/autofit/afhints.h +++ b/src/autofit/afhints.h @@ -4,7 +4,7 @@ /* */ /* Auto-fitter hinting routines (specification). */ /* */ -/* Copyright 2003-2008, 2010-2011 by */ +/* Copyright 2003-2008, 2010-2012, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -27,7 +27,7 @@ FT_BEGIN_HEADER /* * The definition of outline glyph hints. These are shared by all - * script analysis routines (until now). + * writing system analysis routines (until now). */ typedef enum AF_Dimension_ @@ -62,33 +62,34 @@ FT_BEGIN_HEADER * * by David Turner and Werner Lemberg * - * http://www.tug.org/TUGboat/Articles/tb24-3/lemberg.pdf + * http://www.tug.org/TUGboat/Articles/tb24-3/lemberg.pdf + * + * with appropriate updates. * * * Segments * * `af_{cjk,latin,...}_hints_compute_segments' are the functions to - * find segments in an outline. A segment is a series of consecutive - * points that are approximately aligned along a coordinate axis. The - * analysis to do so is specific to a script. + * find segments in an outline. * - * A segment must have at least two points, except in the case of - * `fake' segments that are generated to hint metrics appropriately, - * and which consist of a single point. + * A segment is a series of at least two consecutive points that are + * approximately aligned along a coordinate axis. The analysis to do + * so is specific to a writing system. * * * Edges * + * `af_{cjk,latin,...}_hints_compute_edges' are the functions to find + * edges. + * * As soon as segments are defined, the auto-hinter groups them into * edges. An edge corresponds to a single position on the main * dimension that collects one or more segments (allowing for a small * threshold). * - * The auto-hinter first tries to grid fit edges, then to align - * segments on the edges unless it detects that they form a serif. - * - * `af_{cjk,latin,...}_hints_compute_edges' are the functions to find - * edges; they are specific to a script. + * As an example, the `latin' writing system first tries to grid-fit + * edges, then to align segments on the edges unless it detects that + * they form a serif. * * * A H @@ -107,6 +108,8 @@ FT_BEGIN_HEADER * * Stems * + * Stems are detected by `af_{cjk,latin,...}_hint_edges'. + * * Segments need to be `linked' to other ones in order to detect stems. * A stem is made of two segments that face each other in opposite * directions and that are sufficiently close to each other. Using @@ -127,17 +130,21 @@ FT_BEGIN_HEADER * The best candidate is stored in field `link' in structure * `AF_Segment'. * - * Stems are detected by `af_{cjk,latin,...}_hint_edges'. - * * In the above ASCII drawing, the best candidate for both AB and CD is * GH, while the best candidate for GH is AB. Similarly, the best * candidate for EF and GH is AB, while the best candidate for AB is * GH. * + * The detection and handling of stems is dependent on the writing + * system. + * * * Serifs * - * On the opposite, a serif has + * Serifs are detected by `af_{cjk,latin,...}_hint_edges'. + * + * In comparison to a stem, a serif (as handled by the auto-hinter + * module that takes care of the `latin' writing system) has * * best segment_1 = segment_2 && best segment_2 != segment_1 * @@ -147,8 +154,6 @@ FT_BEGIN_HEADER * The best candidate is stored in field `serif' in structure * `AF_Segment' (and `link' is set to NULL). * - * Serifs are detected by `af_{cjk,latin,...}_hint_edges'. - * * * Touched points * @@ -169,18 +174,19 @@ FT_BEGIN_HEADER * * Strong Points * - * Experience has shown that points which are not part of an edge need - * to be interpolated linearly between their two closest edges, even if - * these are not part of the contour of those particular points. - * Typical candidates for this are + * Experience has shown that points not part of an edge need to be + * interpolated linearly between their two closest edges, even if these + * are not part of the contour of those particular points. Typical + * candidates for this are * * - angle points (i.e., points where the `in' and `out' direction * differ greatly) * * - inflection points (i.e., where the `in' and `out' angles are the - * same, but the curvature changes sign) + * same, but the curvature changes sign) [currently, such points + * aren't handled specially in the auto-hinter] * - * `af_glyph_hints_align_strong_points' is the function which takes + * `af_glyph_hints_align_strong_points' is the function that takes * care of such situations; it is equivalent to the TrueType `IP' * hinting instruction. * @@ -210,23 +216,12 @@ FT_BEGIN_HEADER AF_FLAG_CUBIC = 1 << 1, AF_FLAG_CONTROL = AF_FLAG_CONIC | AF_FLAG_CUBIC, - /* point extremum flags */ - AF_FLAG_EXTREMA_X = 1 << 2, - AF_FLAG_EXTREMA_Y = 1 << 3, - - /* point roundness flags */ - AF_FLAG_ROUND_X = 1 << 4, - AF_FLAG_ROUND_Y = 1 << 5, - /* point touch flags */ - AF_FLAG_TOUCH_X = 1 << 6, - AF_FLAG_TOUCH_Y = 1 << 7, + AF_FLAG_TOUCH_X = 1 << 2, + AF_FLAG_TOUCH_Y = 1 << 3, /* candidates for weak interpolation have this flag set */ - AF_FLAG_WEAK_INTERPOLATION = 1 << 8, - - /* all inflection points in the outline have this flag set */ - AF_FLAG_INFLECTION = 1 << 9 + AF_FLAG_WEAK_INTERPOLATION = 1 << 4 } AF_Flags; @@ -234,10 +229,11 @@ FT_BEGIN_HEADER /* edge hint flags */ typedef enum AF_Edge_Flags_ { - AF_EDGE_NORMAL = 0, - AF_EDGE_ROUND = 1 << 0, - AF_EDGE_SERIF = 1 << 1, - AF_EDGE_DONE = 1 << 2 + AF_EDGE_NORMAL = 0, + AF_EDGE_ROUND = 1 << 0, + AF_EDGE_SERIF = 1 << 1, + AF_EDGE_DONE = 1 << 2, + AF_EDGE_NEUTRAL = 1 << 3 /* set if edge aligns to a neutral blue zone */ } AF_Edge_Flags; @@ -254,7 +250,7 @@ FT_BEGIN_HEADER FT_Char out_dir; /* direction of outwards vector */ FT_Pos ox, oy; /* original, scaled position */ - FT_Short fx, fy; /* original, unscaled position (font units) */ + FT_Short fx, fy; /* original, unscaled position (in font units) */ FT_Pos x, y; /* current position */ FT_Pos u, v; /* current (x,y) or (y,x) depending on context */ @@ -290,19 +286,19 @@ FT_BEGIN_HEADER typedef struct AF_EdgeRec_ { - FT_Short fpos; /* original, unscaled position (font units) */ - FT_Pos opos; /* original, scaled position */ - FT_Pos pos; /* current position */ + FT_Short fpos; /* original, unscaled position (in font units) */ + FT_Pos opos; /* original, scaled position */ + FT_Pos pos; /* current position */ FT_Byte flags; /* edge flags */ FT_Char dir; /* edge direction */ FT_Fixed scale; /* used to speed up interpolation between edges */ - AF_Width blue_edge; /* non-NULL if this is a blue edge */ - AF_Edge link; /* link edge */ - AF_Edge serif; /* primary edge for serifs */ - FT_Short num_linked; /* number of linked edges */ - FT_Int score; /* used during stem matching */ + AF_Width blue_edge; /* non-NULL if this is a blue edge */ + AF_Edge link; /* link edge */ + AF_Edge serif; /* primary edge for serifs */ + FT_Short num_linked; /* number of linked edges */ + FT_Int score; /* used during stem matching */ AF_Segment first; /* first segment in edge */ AF_Segment last; /* last segment in edge */ @@ -330,31 +326,31 @@ FT_BEGIN_HEADER typedef struct AF_GlyphHintsRec_ { - FT_Memory memory; + FT_Memory memory; - FT_Fixed x_scale; - FT_Pos x_delta; + FT_Fixed x_scale; + FT_Pos x_delta; - FT_Fixed y_scale; - FT_Pos y_delta; + FT_Fixed y_scale; + FT_Pos y_delta; - FT_Int max_points; /* number of allocated points */ - FT_Int num_points; /* number of used points */ - AF_Point points; /* points array */ + FT_Int max_points; /* number of allocated points */ + FT_Int num_points; /* number of used points */ + AF_Point points; /* points array */ - FT_Int max_contours; /* number of allocated contours */ - FT_Int num_contours; /* number of used contours */ - AF_Point* contours; /* contours array */ + FT_Int max_contours; /* number of allocated contours */ + FT_Int num_contours; /* number of used contours */ + AF_Point* contours; /* contours array */ - AF_AxisHintsRec axis[AF_DIMENSION_MAX]; + AF_AxisHintsRec axis[AF_DIMENSION_MAX]; - FT_UInt32 scaler_flags; /* copy of scaler flags */ - FT_UInt32 other_flags; /* free for script-specific */ - /* implementations */ - AF_ScriptMetrics metrics; + FT_UInt32 scaler_flags; /* copy of scaler flags */ + FT_UInt32 other_flags; /* free for style-specific */ + /* implementations */ + AF_StyleMetrics metrics; - FT_Pos xmin_delta; /* used for warping */ - FT_Pos xmax_delta; + FT_Pos xmin_delta; /* used for warping */ + FT_Pos xmax_delta; } AF_GlyphHintsRec; @@ -416,8 +412,8 @@ FT_BEGIN_HEADER FT_Memory memory ); FT_LOCAL( void ) - af_glyph_hints_rescale( AF_GlyphHints hints, - AF_ScriptMetrics metrics ); + af_glyph_hints_rescale( AF_GlyphHints hints, + AF_StyleMetrics metrics ); FT_LOCAL( FT_Error ) af_glyph_hints_reload( AF_GlyphHints hints, diff --git a/src/autofit/afindic.c b/src/autofit/afindic.c index 9c74838..197881b 100644 --- a/src/autofit/afindic.c +++ b/src/autofit/afindic.c @@ -2,9 +2,9 @@ /* */ /* afindic.c */ /* */ -/* Auto-fitter hinting routines for Indic scripts (body). */ +/* Auto-fitter hinting routines for Indic writing system (body). */ /* */ -/* Copyright 2007, 2011 by */ +/* Copyright 2007, 2011-2013 by */ /* Rahul Bhalerao <rahul.bhalerao@redhat.com>, <b.rahul.pm@gmail.com>. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -46,7 +46,7 @@ face->charmap = NULL; else { - af_cjk_metrics_init_widths( metrics, face, 0x7530 ); + af_cjk_metrics_init_widths( metrics, face ); #if 0 /* either need indic specific blue_chars[] or just skip blue zones */ af_cjk_metrics_init_blues( metrics, face, af_cjk_blue_chars ); @@ -56,7 +56,7 @@ FT_Set_Charmap( face, oldmap ); - return AF_Err_Ok; + return FT_Err_Ok; } @@ -97,58 +97,41 @@ /*************************************************************************/ - static const AF_Script_UniRangeRec af_indic_uniranges[] = - { -#if 0 - AF_UNIRANGE_REC( 0x0100UL, 0xFFFFUL ), /* why this? */ -#endif - AF_UNIRANGE_REC( 0x0900UL, 0x0DFFUL), /* Indic Range */ - AF_UNIRANGE_REC( 0x0F00UL, 0x0FFFUL), /* Tibetan */ - AF_UNIRANGE_REC( 0x1900UL, 0x194FUL), /* Limbu */ - AF_UNIRANGE_REC( 0x1B80UL, 0x1BBFUL), /* Sundanese */ - AF_UNIRANGE_REC( 0x1C80UL, 0x1CDFUL), /* Meetei Mayak */ - AF_UNIRANGE_REC( 0xA800UL, 0xA82FUL), /* Syloti Nagri */ - AF_UNIRANGE_REC( 0x11800UL, 0x118DFUL), /* Sharada */ - AF_UNIRANGE_REC( 0UL, 0UL) - }; - + AF_DEFINE_WRITING_SYSTEM_CLASS( + af_indic_writing_system_class, - AF_DEFINE_SCRIPT_CLASS( af_indic_script_class, - AF_SCRIPT_INDIC, - af_indic_uniranges, + AF_WRITING_SYSTEM_INDIC, sizeof ( AF_CJKMetricsRec ), - (AF_Script_InitMetricsFunc) af_indic_metrics_init, - (AF_Script_ScaleMetricsFunc)af_indic_metrics_scale, - (AF_Script_DoneMetricsFunc) NULL, + (AF_WritingSystem_InitMetricsFunc) af_indic_metrics_init, + (AF_WritingSystem_ScaleMetricsFunc)af_indic_metrics_scale, + (AF_WritingSystem_DoneMetricsFunc) NULL, - (AF_Script_InitHintsFunc) af_indic_hints_init, - (AF_Script_ApplyHintsFunc) af_indic_hints_apply + (AF_WritingSystem_InitHintsFunc) af_indic_hints_init, + (AF_WritingSystem_ApplyHintsFunc) af_indic_hints_apply ) + #else /* !AF_CONFIG_OPTION_INDIC */ - static const AF_Script_UniRangeRec af_indic_uniranges[] = - { - { 0, 0 } - }; + AF_DEFINE_WRITING_SYSTEM_CLASS( + af_indic_writing_system_class, - AF_DEFINE_SCRIPT_CLASS( af_indic_script_class, - AF_SCRIPT_INDIC, - af_indic_uniranges, + AF_WRITING_SYSTEM_INDIC, sizeof ( AF_CJKMetricsRec ), - (AF_Script_InitMetricsFunc) NULL, - (AF_Script_ScaleMetricsFunc)NULL, - (AF_Script_DoneMetricsFunc) NULL, + (AF_WritingSystem_InitMetricsFunc) NULL, + (AF_WritingSystem_ScaleMetricsFunc)NULL, + (AF_WritingSystem_DoneMetricsFunc) NULL, - (AF_Script_InitHintsFunc) NULL, - (AF_Script_ApplyHintsFunc) NULL + (AF_WritingSystem_InitHintsFunc) NULL, + (AF_WritingSystem_ApplyHintsFunc) NULL ) + #endif /* !AF_CONFIG_OPTION_INDIC */ diff --git a/src/autofit/afindic.h b/src/autofit/afindic.h index 662a982..9e13cf7 100644 --- a/src/autofit/afindic.h +++ b/src/autofit/afindic.h @@ -2,9 +2,10 @@ /* */ /* afindic.h */ /* */ -/* Auto-fitter hinting routines for Indic scripts (specification). */ +/* Auto-fitter hinting routines for Indic writing system */ +/* (specification). */ /* */ -/* Copyright 2007 by */ +/* Copyright 2007, 2012, 2013 by */ /* Rahul Bhalerao <rahul.bhalerao@redhat.com>, <b.rahul.pm@gmail.com>. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -25,9 +26,9 @@ FT_BEGIN_HEADER - /* the Indic-specific script class */ + /* the `indic' writing system */ - AF_DECLARE_SCRIPT_CLASS(af_indic_script_class) + AF_DECLARE_WRITING_SYSTEM_CLASS( af_indic_writing_system_class ) /* */ diff --git a/src/autofit/aflatin.c b/src/autofit/aflatin.c index 30145a2..36a3689 100644 --- a/src/autofit/aflatin.c +++ b/src/autofit/aflatin.c @@ -2,9 +2,9 @@ /* */ /* aflatin.c */ /* */ -/* Auto-fitter hinting routines for latin script (body). */ +/* Auto-fitter hinting routines for latin writing system (body). */ /* */ -/* Copyright 2003-2011 by */ +/* Copyright 2003-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -20,6 +20,8 @@ #include FT_ADVANCES_H #include FT_INTERNAL_DEBUG_H +#include "afglobal.h" +#include "afpic.h" #include "aflatin.h" #include "aferrors.h" @@ -53,29 +55,85 @@ FT_LOCAL_DEF( void ) af_latin_metrics_init_widths( AF_LatinMetrics metrics, - FT_Face face, - FT_ULong charcode ) + FT_Face face ) { /* scan the array of segments in each direction */ AF_GlyphHintsRec hints[1]; + FT_TRACE5(( "\n" + "latin standard widths computation (style `%s')\n" + "=====================================================\n" + "\n", + af_style_names[metrics->root.style_class->style] )); + af_glyph_hints_init( hints, face->memory ); metrics->axis[AF_DIMENSION_HORZ].width_count = 0; metrics->axis[AF_DIMENSION_VERT].width_count = 0; { - FT_Error error; - FT_UInt glyph_index; - int dim; - AF_LatinMetricsRec dummy[1]; - AF_Scaler scaler = &dummy->root.scaler; + FT_Error error; + FT_ULong glyph_index; + FT_Long y_offset; + int dim; + AF_LatinMetricsRec dummy[1]; + AF_Scaler scaler = &dummy->root.scaler; + +#ifdef FT_CONFIG_OPTION_PIC + AF_FaceGlobals globals = metrics->root.globals; +#endif + AF_StyleClass style_class = metrics->root.style_class; + AF_ScriptClass script_class = AF_SCRIPT_CLASSES_GET + [style_class->script]; - glyph_index = FT_Get_Char_Index( face, charcode ); - if ( glyph_index == 0 ) - goto Exit; + FT_UInt32 standard_char; + + + /* + * We check more than a single standard character to catch features + * like `c2sc' (small caps from caps) that don't contain lowercase + * letters by definition, or other features that mainly operate on + * numerals. + */ + + standard_char = script_class->standard_char1; + af_get_char_index( &metrics->root, + standard_char, + &glyph_index, + &y_offset ); + if ( !glyph_index ) + { + if ( script_class->standard_char2 ) + { + standard_char = script_class->standard_char2; + af_get_char_index( &metrics->root, + standard_char, + &glyph_index, + &y_offset ); + if ( !glyph_index ) + { + if ( script_class->standard_char3 ) + { + standard_char = script_class->standard_char3; + af_get_char_index( &metrics->root, + standard_char, + &glyph_index, + &y_offset ); + if ( !glyph_index ) + goto Exit; + } + else + goto Exit; + } + } + else + goto Exit; + } + + FT_TRACE5(( "standard character: U+%04lX (glyph index %d)\n", + standard_char, glyph_index )); error = FT_Load_Glyph( face, glyph_index, FT_LOAD_NO_SCALE ); if ( error || face->glyph->outline.n_points <= 0 ) @@ -94,7 +152,7 @@ scaler->render_mode = FT_RENDER_MODE_NORMAL; scaler->flags = 0; - af_glyph_hints_rescale( hints, (AF_ScriptMetrics)dummy ); + af_glyph_hints_rescale( hints, (AF_StyleMetrics)dummy ); error = af_glyph_hints_reload( hints, &face->glyph->outline ); if ( error ) @@ -113,7 +171,15 @@ if ( error ) goto Exit; + /* + * We assume that the glyphs selected for the stem width + * computation are `featureless' enough so that the linking + * algorithm works fine without adjustments of its scoring + * function. + */ af_latin_hints_link_segments( hints, + 0, + NULL, (AF_Dimension)dim ); seg = axhints->segments; @@ -138,46 +204,51 @@ } } - af_sort_widths( num_widths, axis->widths ); + /* this also replaces multiple almost identical stem widths */ + /* with a single one (the value 100 is heuristic) */ + af_sort_and_quantize_widths( &num_widths, axis->widths, + dummy->units_per_em / 100 ); axis->width_count = num_widths; } - Exit: + Exit: for ( dim = 0; dim < AF_DIMENSION_MAX; dim++ ) { AF_LatinAxis axis = &metrics->axis[dim]; FT_Pos stdw; - stdw = ( axis->width_count > 0 ) - ? axis->widths[0].org - : AF_LATIN_CONSTANT( metrics, 50 ); + stdw = ( axis->width_count > 0 ) ? axis->widths[0].org + : AF_LATIN_CONSTANT( metrics, 50 ); /* let's try 20% of the smallest width */ axis->edge_distance_threshold = stdw / 5; axis->standard_width = stdw; axis->extra_light = 0; - } - } - af_glyph_hints_done( hints ); - } +#ifdef FT_DEBUG_LEVEL_TRACE + { + FT_UInt i; + FT_TRACE5(( "%s widths:\n", + dim == AF_DIMENSION_VERT ? "horizontal" + : "vertical" )); -#define AF_LATIN_MAX_TEST_CHARACTERS 12 + FT_TRACE5(( " %d (standard)", axis->standard_width )); + for ( i = 1; i < axis->width_count; i++ ) + FT_TRACE5(( " %d", axis->widths[i].org )); + FT_TRACE5(( "\n" )); + } +#endif + } + } - static const char af_latin_blue_chars[AF_LATIN_MAX_BLUES] - [AF_LATIN_MAX_TEST_CHARACTERS + 1] = - { - "THEZOCQS", - "HEZLOCUS", - "fijkdbh", - "xzroesc", - "xzroesc", - "pqgjy" - }; + FT_TRACE5(( "\n" )); + + af_glyph_hints_done( hints ); + } /* Find all blue zones. Flat segments give the reference points, */ @@ -187,63 +258,122 @@ af_latin_metrics_init_blues( AF_LatinMetrics metrics, FT_Face face ) { - FT_Pos flats [AF_LATIN_MAX_TEST_CHARACTERS]; - FT_Pos rounds[AF_LATIN_MAX_TEST_CHARACTERS]; + FT_Pos flats [AF_BLUE_STRING_MAX_LEN]; + FT_Pos rounds[AF_BLUE_STRING_MAX_LEN]; + FT_Int num_flats; FT_Int num_rounds; - FT_Int bb; + AF_LatinBlue blue; FT_Error error; - AF_LatinAxis axis = &metrics->axis[AF_DIMENSION_VERT]; - FT_GlyphSlot glyph = face->glyph; + AF_LatinAxis axis = &metrics->axis[AF_DIMENSION_VERT]; + FT_Outline outline; + + AF_StyleClass sc = metrics->root.style_class; + + AF_Blue_Stringset bss = sc->blue_stringset; + const AF_Blue_StringRec* bs = &af_blue_stringsets[bss]; - /* we compute the blues simply by loading each character from the */ - /* `af_latin_blue_chars[blues]' string, then finding its top-most or */ - /* bottom-most points (depending on `AF_IS_TOP_BLUE') */ + /* we walk over the blue character strings as specified in the */ + /* style's entry in the `af_blue_stringset' array */ - FT_TRACE5(( "blue zones computation\n" )); - FT_TRACE5(( "------------------------------------------------\n" )); + FT_TRACE5(( "latin blue zones computation\n" + "============================\n" + "\n" )); - for ( bb = 0; bb < AF_LATIN_BLUE_MAX; bb++ ) + for ( ; bs->string != AF_BLUE_STRING_MAX; bs++ ) { - const char* p = af_latin_blue_chars[bb]; - const char* limit = p + AF_LATIN_MAX_TEST_CHARACTERS; + const char* p = &af_blue_strings[bs->string]; FT_Pos* blue_ref; FT_Pos* blue_shoot; - FT_TRACE5(( "blue %3d: ", bb )); +#ifdef FT_DEBUG_LEVEL_TRACE + { + FT_Bool have_flag = 0; + + + FT_TRACE5(( "blue zone %d", axis->blue_count )); + + if ( bs->properties ) + { + FT_TRACE5(( " (" )); + + if ( AF_LATIN_IS_TOP_BLUE( bs ) ) + { + FT_TRACE5(( "top" )); + have_flag = 1; + } + + if ( AF_LATIN_IS_NEUTRAL_BLUE( bs ) ) + { + if ( have_flag ) + FT_TRACE5(( ", " )); + FT_TRACE5(( "neutral" )); + have_flag = 1; + } + + if ( AF_LATIN_IS_X_HEIGHT_BLUE( bs ) ) + { + if ( have_flag ) + FT_TRACE5(( ", " )); + FT_TRACE5(( "small top" )); + have_flag = 1; + } + + if ( AF_LATIN_IS_LONG_BLUE( bs ) ) + { + if ( have_flag ) + FT_TRACE5(( ", " )); + FT_TRACE5(( "long" )); + } + + FT_TRACE5(( ")" )); + } + + FT_TRACE5(( ":\n" )); + } +#endif /* FT_DEBUG_LEVEL_TRACE */ num_flats = 0; num_rounds = 0; - for ( ; p < limit && *p; p++ ) + while ( *p ) { - FT_UInt glyph_index; + FT_ULong ch; + FT_ULong glyph_index; + FT_Long y_offset; FT_Pos best_y; /* same as points.y */ - FT_Int best_point, best_first, best_last; + FT_Int best_point, best_contour_first, best_contour_last; FT_Vector* points; FT_Bool round = 0; - FT_TRACE5(( "'%c'", *p )); + GET_UTF8_CHAR( ch, p ); /* load the character in the face -- skip unknown or empty ones */ - glyph_index = FT_Get_Char_Index( face, (FT_UInt)*p ); + af_get_char_index( &metrics->root, ch, &glyph_index, &y_offset ); if ( glyph_index == 0 ) + { + FT_TRACE5(( " U+%04lX unavailable\n", ch )); continue; + } - error = FT_Load_Glyph( face, glyph_index, FT_LOAD_NO_SCALE ); - if ( error || glyph->outline.n_points <= 0 ) + error = FT_Load_Glyph( face, glyph_index, FT_LOAD_NO_SCALE ); + outline = face->glyph->outline; + if ( error || outline.n_points <= 0 ) + { + FT_TRACE5(( " U+%04lX contains no outlines\n", ch )); continue; + } /* now compute min or max point indices and coordinates */ - points = glyph->outline.points; - best_point = -1; - best_y = 0; /* make compiler happy */ - best_first = 0; /* ditto */ - best_last = 0; /* ditto */ + points = outline.points; + best_point = -1; + best_y = 0; /* make compiler happy */ + best_contour_first = 0; /* ditto */ + best_contour_last = 0; /* ditto */ { FT_Int nn; @@ -251,23 +381,21 @@ FT_Int last = -1; - for ( nn = 0; - nn < glyph->outline.n_contours; - first = last + 1, nn++ ) + for ( nn = 0; nn < outline.n_contours; first = last + 1, nn++ ) { FT_Int old_best_point = best_point; FT_Int pp; - last = glyph->outline.contours[nn]; + last = outline.contours[nn]; /* Avoid single-point contours since they are never rasterized. */ /* In some fonts, they correspond to mark attachment points */ - /* which are way outside of the glyph's real outline. */ + /* that are way outside of the glyph's real outline. */ if ( last <= first ) continue; - if ( AF_LATIN_IS_TOP_BLUE( bb ) ) + if ( AF_LATIN_IS_TOP_BLUE( bs ) ) { for ( pp = first; pp <= last; pp++ ) if ( best_point < 0 || points[pp].y > best_y ) @@ -288,11 +416,10 @@ if ( best_point != old_best_point ) { - best_first = first; - best_last = last; + best_contour_first = first; + best_contour_last = last; } } - FT_TRACE5(( "%5d", best_y )); } /* now check whether the point belongs to a straight or round */ @@ -300,47 +427,297 @@ /* lies, then inspect its previous and next points */ if ( best_point >= 0 ) { + FT_Pos best_x = points[best_point].x; FT_Int prev, next; + FT_Int best_segment_first, best_segment_last; + FT_Int best_on_point_first, best_on_point_last; FT_Pos dist; - /* now look for the previous and next points that are not on the */ - /* same Y coordinate. Threshold the `closeness'... */ + best_segment_first = best_point; + best_segment_last = best_point; + + if ( FT_CURVE_TAG( outline.tags[best_point] ) == FT_CURVE_TAG_ON ) + { + best_on_point_first = best_point; + best_on_point_last = best_point; + } + else + { + best_on_point_first = -1; + best_on_point_last = -1; + } + + /* look for the previous and next points on the contour */ + /* that are not on the same Y coordinate, then threshold */ + /* the `closeness'... */ prev = best_point; next = prev; do { - if ( prev > best_first ) + if ( prev > best_contour_first ) prev--; else - prev = best_last; + prev = best_contour_last; - dist = points[prev].y - best_y; - if ( dist < -5 || dist > 5 ) - break; + dist = FT_ABS( points[prev].y - best_y ); + /* accept a small distance or a small angle (both values are */ + /* heuristic; value 20 corresponds to approx. 2.9 degrees) */ + if ( dist > 5 ) + if ( FT_ABS( points[prev].x - best_x ) <= 20 * dist ) + break; + + best_segment_first = prev; + + if ( FT_CURVE_TAG( outline.tags[prev] ) == FT_CURVE_TAG_ON ) + { + best_on_point_first = prev; + if ( best_on_point_last < 0 ) + best_on_point_last = prev; + } } while ( prev != best_point ); do { - if ( next < best_last ) + if ( next < best_contour_last ) next++; else - next = best_first; + next = best_contour_first; - dist = points[next].y - best_y; - if ( dist < -5 || dist > 5 ) - break; + dist = FT_ABS( points[next].y - best_y ); + if ( dist > 5 ) + if ( FT_ABS( points[next].x - best_x ) <= 20 * dist ) + break; + + best_segment_last = next; + + if ( FT_CURVE_TAG( outline.tags[next] ) == FT_CURVE_TAG_ON ) + { + best_on_point_last = next; + if ( best_on_point_first < 0 ) + best_on_point_first = next; + } } while ( next != best_point ); - /* now set the `round' flag depending on the segment's kind */ - round = FT_BOOL( - FT_CURVE_TAG( glyph->outline.tags[prev] ) != FT_CURVE_TAG_ON || - FT_CURVE_TAG( glyph->outline.tags[next] ) != FT_CURVE_TAG_ON ); + if ( AF_LATIN_IS_LONG_BLUE( bs ) ) + { + /* If this flag is set, we have an additional constraint to */ + /* get the blue zone distance: Find a segment of the topmost */ + /* (or bottommost) contour that is longer than a heuristic */ + /* threshold. This ensures that small bumps in the outline */ + /* are ignored (for example, the `vertical serifs' found in */ + /* many Hebrew glyph designs). */ + + /* If this segment is long enough, we are done. Otherwise, */ + /* search the segment next to the extremum that is long */ + /* enough, has the same direction, and a not too large */ + /* vertical distance from the extremum. Note that the */ + /* algorithm doesn't check whether the found segment is */ + /* actually the one (vertically) nearest to the extremum. */ + + /* heuristic threshold value */ + FT_Pos length_threshold = metrics->units_per_em / 25; + + + dist = FT_ABS( points[best_segment_last].x - + points[best_segment_first].x ); + + if ( dist < length_threshold && + best_segment_last - best_segment_first + 2 <= + best_contour_last - best_contour_first ) + { + /* heuristic threshold value */ + FT_Pos height_threshold = metrics->units_per_em / 4; + + FT_Int first; + FT_Int last; + FT_Bool hit; + + /* we intentionally declare these two variables */ + /* outside of the loop since various compilers emit */ + /* incorrect warning messages otherwise, talking about */ + /* `possibly uninitialized variables' */ + FT_Int p_first = 0; /* make compiler happy */ + FT_Int p_last = 0; + + FT_Bool left2right; + + + /* compute direction */ + prev = best_point; + + do + { + if ( prev > best_contour_first ) + prev--; + else + prev = best_contour_last; + + if ( points[prev].x != best_x ) + break; + + } while ( prev != best_point ); + + /* skip glyph for the degenerate case */ + if ( prev == best_point ) + continue; + + left2right = FT_BOOL( points[prev].x < points[best_point].x ); + + first = best_segment_last; + last = first; + hit = 0; + + do + { + FT_Bool l2r; + FT_Pos d; + + + if ( !hit ) + { + /* no hit; adjust first point */ + first = last; + + /* also adjust first and last on point */ + if ( FT_CURVE_TAG( outline.tags[first] ) == + FT_CURVE_TAG_ON ) + { + p_first = first; + p_last = first; + } + else + { + p_first = -1; + p_last = -1; + } + + hit = 1; + } + + if ( last < best_contour_last ) + last++; + else + last = best_contour_first; + + if ( FT_ABS( best_y - points[first].y ) > height_threshold ) + { + /* vertical distance too large */ + hit = 0; + continue; + } + + /* same test as above */ + dist = FT_ABS( points[last].y - points[first].y ); + if ( dist > 5 ) + if ( FT_ABS( points[last].x - points[first].x ) <= + 20 * dist ) + { + hit = 0; + continue; + } + + if ( FT_CURVE_TAG( outline.tags[last] ) == FT_CURVE_TAG_ON ) + { + p_last = last; + if ( p_first < 0 ) + p_first = last; + } + + l2r = FT_BOOL( points[first].x < points[last].x ); + d = FT_ABS( points[last].x - points[first].x ); + + if ( l2r == left2right && + d >= length_threshold ) + { + /* all constraints are met; update segment after finding */ + /* its end */ + do + { + if ( last < best_contour_last ) + last++; + else + last = best_contour_first; + + d = FT_ABS( points[last].y - points[first].y ); + if ( d > 5 ) + if ( FT_ABS( points[next].x - points[first].x ) <= + 20 * dist ) + { + if ( last > best_contour_first ) + last--; + else + last = best_contour_last; + break; + } + + p_last = last; + + if ( FT_CURVE_TAG( outline.tags[last] ) == + FT_CURVE_TAG_ON ) + { + p_last = last; + if ( p_first < 0 ) + p_first = last; + } + + } while ( last != best_segment_first ); + + best_y = points[first].y; + + best_segment_first = first; + best_segment_last = last; + + best_on_point_first = p_first; + best_on_point_last = p_last; + + break; + } + + } while ( last != best_segment_first ); + } + } + + /* for computing blue zones, we add the y offset as returned */ + /* by the currently used OpenType feature -- for example, */ + /* superscript glyphs might be identical to subscript glyphs */ + /* with a vertical shift */ + best_y += y_offset; + + FT_TRACE5(( " U+%04lX: best_y = %5ld", ch, best_y )); + + /* now set the `round' flag depending on the segment's kind: */ + /* */ + /* - if the horizontal distance between the first and last */ + /* `on' point is larger than upem/8 (value 8 is heuristic) */ + /* we have a flat segment */ + /* - if either the first or the last point of the segment is */ + /* an `off' point, the segment is round, otherwise it is */ + /* flat */ + if ( best_on_point_first >= 0 && + best_on_point_last >= 0 && + (FT_UInt)( FT_ABS( points[best_on_point_last].x - + points[best_on_point_first].x ) ) > + metrics->units_per_em / 8 ) + round = 0; + else + round = FT_BOOL( + FT_CURVE_TAG( outline.tags[best_segment_first] ) != + FT_CURVE_TAG_ON || + FT_CURVE_TAG( outline.tags[best_segment_last] ) != + FT_CURVE_TAG_ON ); - FT_TRACE5(( "%c ", round ? 'r' : 'f' )); + if ( round && AF_LATIN_IS_NEUTRAL_BLUE( bs ) ) + { + /* only use flat segments for a neutral blue zone */ + FT_TRACE5(( " (round, skipped)\n" )); + continue; + } + + FT_TRACE5(( " (%s)\n", round ? "round" : "flat" )); } if ( round ) @@ -349,15 +726,13 @@ flats[num_flats++] = best_y; } - FT_TRACE5(( "\n" )); - if ( num_flats == 0 && num_rounds == 0 ) { /* * we couldn't find a single glyph to compute this blue zone, * we will simply ignore it then */ - FT_TRACE5(( "empty\n" )); + FT_TRACE5(( " empty\n" )); continue; } @@ -385,7 +760,7 @@ } else { - *blue_ref = flats[num_flats / 2]; + *blue_ref = flats [num_flats / 2]; *blue_shoot = rounds[num_rounds / 2]; } @@ -399,24 +774,33 @@ FT_Bool over_ref = FT_BOOL( shoot > ref ); - if ( AF_LATIN_IS_TOP_BLUE( bb ) ^ over_ref ) + if ( AF_LATIN_IS_TOP_BLUE( bs ) ^ over_ref ) + { *blue_ref = *blue_shoot = ( shoot + ref ) / 2; + + FT_TRACE5(( " [overshoot smaller than reference," + " taking mean value]\n" )); + } } blue->flags = 0; - if ( AF_LATIN_IS_TOP_BLUE( bb ) ) + if ( AF_LATIN_IS_TOP_BLUE( bs ) ) blue->flags |= AF_LATIN_BLUE_TOP; + if ( AF_LATIN_IS_NEUTRAL_BLUE( bs ) ) + blue->flags |= AF_LATIN_BLUE_NEUTRAL; /* * The following flag is used later to adjust the y and x scales * in order to optimize the pixel grid alignment of the top of small * letters. */ - if ( bb == AF_LATIN_BLUE_SMALL_TOP ) + if ( AF_LATIN_IS_X_HEIGHT_BLUE( bs ) ) blue->flags |= AF_LATIN_BLUE_ADJUSTMENT; - FT_TRACE5(( "-- ref = %ld, shoot = %ld\n", *blue_ref, *blue_shoot )); + FT_TRACE5(( " -> reference = %ld\n" + " overshoot = %ld\n", + *blue_ref, *blue_shoot )); } FT_TRACE5(( "\n" )); @@ -439,10 +823,11 @@ /* digit `0' is 0x30 in all supported charmaps */ for ( i = 0x30; i <= 0x39; i++ ) { - FT_UInt glyph_index; + FT_ULong glyph_index; + FT_Long y_offset; - glyph_index = FT_Get_Char_Index( face, i ); + af_get_char_index( &metrics->root, i, &glyph_index, &y_offset ); if ( glyph_index == 0 ) continue; @@ -478,41 +863,20 @@ af_latin_metrics_init( AF_LatinMetrics metrics, FT_Face face ) { - FT_Error error = AF_Err_Ok; FT_CharMap oldmap = face->charmap; - FT_UInt ee; - - static const FT_Encoding latin_encodings[] = - { - FT_ENCODING_UNICODE, - FT_ENCODING_APPLE_ROMAN, - FT_ENCODING_ADOBE_STANDARD, - FT_ENCODING_ADOBE_LATIN_1, - - FT_ENCODING_NONE /* end of list */ - }; metrics->units_per_em = face->units_per_EM; - /* do we have a latin charmap in there? */ - for ( ee = 0; latin_encodings[ee] != FT_ENCODING_NONE; ee++ ) - { - error = FT_Select_Charmap( face, latin_encodings[ee] ); - if ( !error ) - break; - } - - if ( !error ) + if ( !FT_Select_Charmap( face, FT_ENCODING_UNICODE ) ) { - /* For now, compute the standard width and height from the `o'. */ - af_latin_metrics_init_widths( metrics, face, 'o' ); + af_latin_metrics_init_widths( metrics, face ); af_latin_metrics_init_blues( metrics, face ); af_latin_metrics_check_digits( metrics, face ); } FT_Set_Charmap( face, oldmap ); - return AF_Err_Ok; + return FT_Err_Ok; } @@ -569,9 +933,26 @@ if ( blue ) { - FT_Pos scaled = FT_MulFix( blue->shoot.org, scaler->y_scale ); - FT_Pos fitted = ( scaled + 40 ) & ~63; + FT_Pos scaled; + FT_Pos threshold; + FT_Pos fitted; + FT_UInt limit; + FT_UInt ppem; + + + scaled = FT_MulFix( blue->shoot.org, scaler->y_scale ); + ppem = metrics->root.scaler.face->size->metrics.x_ppem; + limit = metrics->root.globals->increase_x_height; + threshold = 40; + /* if the `increase-x-height' property is active, */ + /* we round up much more often */ + if ( limit && + ppem <= limit && + ppem >= AF_PROP_INCREASE_X_HEIGHT_MIN ) + threshold = 52; + + fitted = ( scaled + threshold ) & ~63; if ( scaled != fitted ) { @@ -584,7 +965,20 @@ else #endif if ( dim == AF_DIMENSION_VERT ) + { scale = FT_MulDiv( scale, fitted, scaled ); + + FT_TRACE5(( + "af_latin_metrics_scale_dim:" + " x height alignment (style `%s'):\n" + " " + " vertical scaling changed from %.4f to %.4f (by %d%%)\n" + "\n", + af_style_names[metrics->root.style_class->style], + axis->org_scale / 65536.0, + scale / 65536.0, + ( fitted - scaled ) * 100 / scaled )); + } } } } @@ -603,6 +997,10 @@ metrics->root.scaler.y_delta = delta; } + FT_TRACE5(( "%s widths (style `%s')\n", + dim == AF_DIMENSION_HORZ ? "horizontal" : "vertical", + af_style_names[metrics->root.style_class->style] )); + /* scale the widths */ for ( nn = 0; nn < axis->width_count; nn++ ) { @@ -611,15 +1009,31 @@ width->cur = FT_MulFix( width->org, scale ); width->fit = width->cur; + + FT_TRACE5(( " %d scaled to %.2f\n", + width->org, + width->cur / 64.0 )); } + FT_TRACE5(( "\n" )); + /* an extra-light axis corresponds to a standard width that is */ /* smaller than 5/8 pixels */ axis->extra_light = (FT_Bool)( FT_MulFix( axis->standard_width, scale ) < 32 + 8 ); +#ifdef FT_DEBUG_LEVEL_TRACE + if ( axis->extra_light ) + FT_TRACE5(( "`%s' style is extra light (at current resolution)\n" + "\n", + af_style_names[metrics->root.style_class->style] )); +#endif + if ( dim == AF_DIMENSION_VERT ) { + FT_TRACE5(( "blue zones (style `%s')\n", + af_style_names[metrics->root.style_class->style] )); + /* scale the blue zones */ for ( nn = 0; nn < axis->blue_count; nn++ ) { @@ -677,7 +1091,7 @@ if ( delta2 < 32 ) delta2 = 0; - else if ( delta < 48 ) + else if ( delta2 < 48 ) delta2 = 32; else delta2 = 64; @@ -691,6 +1105,19 @@ #endif blue->flags |= AF_LATIN_BLUE_ACTIVE; + + FT_TRACE5(( " reference %d: %d scaled to %.2f%s\n" + " overshoot %d: %d scaled to %.2f%s\n", + nn, + blue->ref.org, + blue->ref.fit / 64.0, + blue->flags & AF_LATIN_BLUE_ACTIVE ? "" + : " (inactive)", + nn, + blue->shoot.org, + blue->shoot.fit / 64.0, + blue->flags & AF_LATIN_BLUE_ACTIVE ? "" + : " (inactive)" )); } } } @@ -705,6 +1132,7 @@ { metrics->root.scaler.render_mode = scaler->render_mode; metrics->root.scaler.face = scaler->face; + metrics->root.scaler.flags = scaler->flags; af_latin_metrics_scale_dim( metrics, scaler, AF_DIMENSION_HORZ ); af_latin_metrics_scale_dim( metrics, scaler, AF_DIMENSION_VERT ); @@ -728,7 +1156,7 @@ { AF_AxisHints axis = &hints->axis[dim]; FT_Memory memory = hints->memory; - FT_Error error = AF_Err_Ok; + FT_Error error = FT_Err_Ok; AF_Segment segment = NULL; AF_SegmentRec seg0; AF_Point* contour = hints->contours; @@ -848,7 +1276,7 @@ on_edge = 0; segment = NULL; - /* fallthrough */ + /* fall through */ } } @@ -865,17 +1293,19 @@ /* this is the start of a new segment! */ segment_dir = (AF_Direction)point->out_dir; - /* clear all segment fields */ error = af_axis_hints_new_segment( axis, memory, &segment ); if ( error ) goto Exit; - segment[0] = seg0; + /* clear all segment fields */ + segment[0] = seg0; + segment->dir = (FT_Char)segment_dir; min_pos = max_pos = point->u; segment->first = point; segment->last = point; - on_edge = 1; + + on_edge = 1; } point = point->next; @@ -884,8 +1314,8 @@ } /* contours */ - /* now slightly increase the height of segments when this makes */ - /* sense -- this is used to better detect and ignore serifs */ + /* now slightly increase the height of segments if this makes */ + /* sense -- this is used to better detect and ignore serifs */ { AF_Segment segments = axis->segments; AF_Segment segments_end = segments + axis->num_segments; @@ -899,9 +1329,6 @@ FT_Pos last_v = last->v; - if ( first == last ) - continue; - if ( first_v < last_v ) { AF_Point p; @@ -940,31 +1367,44 @@ } - /* Link segments to form stems and serifs. */ + /* Link segments to form stems and serifs. If `width_count' and */ + /* `widths' are non-zero, use them to fine-tune the scoring function. */ FT_LOCAL_DEF( void ) af_latin_hints_link_segments( AF_GlyphHints hints, + FT_UInt width_count, + AF_WidthRec* widths, AF_Dimension dim ) { AF_AxisHints axis = &hints->axis[dim]; AF_Segment segments = axis->segments; AF_Segment segment_limit = segments + axis->num_segments; - FT_Pos len_threshold, len_score; + FT_Pos len_threshold, len_score, dist_score, max_width; AF_Segment seg1, seg2; + if ( width_count ) + max_width = widths[width_count - 1].org; + else + max_width = 0; + + /* a heuristic value to set up a minimum value for overlapping */ len_threshold = AF_LATIN_CONSTANT( hints->metrics, 8 ); if ( len_threshold == 0 ) len_threshold = 1; + /* a heuristic value to weight lengths */ len_score = AF_LATIN_CONSTANT( hints->metrics, 6000 ); + /* a heuristic value to weight distances (no call to */ + /* AF_LATIN_CONSTANT needed, since we work on multiples */ + /* of the stem width) */ + dist_score = 3000; + /* now compare each segment to the others */ for ( seg1 = segments; seg1 < segment_limit; seg1++ ) { - /* the fake segments are introduced to hint the metrics -- */ - /* we must never link them to anything */ - if ( seg1->dir != axis->major_dir || seg1->first == seg1->last ) + if ( seg1->dir != axis->major_dir ) continue; /* search for stems having opposite directions, */ @@ -978,10 +1418,9 @@ if ( seg1->dir + seg2->dir == 0 && pos2 > pos1 ) { /* compute distance between the two segments */ - FT_Pos dist = pos2 - pos1; - FT_Pos min = seg1->min_coord; - FT_Pos max = seg1->max_coord; - FT_Pos len, score; + FT_Pos min = seg1->min_coord; + FT_Pos max = seg1->max_coord; + FT_Pos len; if ( min < seg2->min_coord ) @@ -991,15 +1430,49 @@ max = seg2->max_coord; /* compute maximum coordinate difference of the two segments */ + /* (this is, how much they overlap) */ len = max - min; if ( len >= len_threshold ) { - /* small coordinate differences cause a higher score, and */ - /* segments with a greater distance cause a higher score also */ - score = dist + len_score / len; + /* + * The score is the sum of two demerits indicating the + * `badness' of a fit, measured along the segments' main axis + * and orthogonal to it, respectively. + * + * o The less overlapping along the main axis, the worse it + * is, causing a larger demerit. + * + * o The nearer the orthogonal distance to a stem width, the + * better it is, causing a smaller demerit. For simplicity, + * however, we only increase the demerit for values that + * exceed the largest stem width. + */ + + FT_Pos dist = pos2 - pos1; + + FT_Pos dist_demerit, score; + + + if ( max_width ) + { + /* distance demerits are based on multiples of `max_width'; */ + /* we scale by 1024 for getting more precision */ + FT_Pos delta = ( dist << 10 ) / max_width - ( 1 << 10 ); + + + if ( delta > 10000 ) + dist_demerit = 32000; + else if ( delta > 0 ) + dist_demerit = delta * delta / dist_score; + else + dist_demerit = 0; + } + else + dist_demerit = dist; /* default if no widths available */ + + score = dist_demerit + len_score / len; /* and we search for the smallest score */ - /* of the sum of the two values */ if ( score < seg1->score ) { seg1->score = score; @@ -1040,7 +1513,7 @@ AF_Dimension dim ) { AF_AxisHints axis = &hints->axis[dim]; - FT_Error error = AF_Err_Ok; + FT_Error error = FT_Err_Ok; FT_Memory memory = hints->memory; AF_LatinAxis laxis = &((AF_LatinMetrics)hints->metrics)->axis[dim]; @@ -1169,17 +1642,17 @@ } - /*********************************************************************/ - /* */ - /* Good, we will now compute each edge's properties according to */ - /* the segments found on its position. Basically, these are */ - /* */ - /* - the edge's main direction */ - /* - stem edge, serif edge or both (which defaults to stem then) */ - /* - rounded edge, straight or both (which defaults to straight) */ - /* - link for edge */ - /* */ - /*********************************************************************/ + /******************************************************************/ + /* */ + /* Good, we now compute each edge's properties according to the */ + /* segments found on its position. Basically, these are */ + /* */ + /* - the edge's main direction */ + /* - stem edge, serif edge or both (which defaults to stem then) */ + /* - rounded edge, straight or both (which defaults to straight) */ + /* - link for edge */ + /* */ + /******************************************************************/ /* first of all, set the `edge' field in each segment -- this is */ /* required in order to compute edge links */ @@ -1331,6 +1804,8 @@ FT_LOCAL_DEF( FT_Error ) af_latin_hints_detect_features( AF_GlyphHints hints, + FT_UInt width_count, + AF_WidthRec* widths, AF_Dimension dim ) { FT_Error error; @@ -1339,7 +1814,7 @@ error = af_latin_hints_compute_segments( hints, dim ); if ( !error ) { - af_latin_hints_link_segments( hints, dim ); + af_latin_hints_link_segments( hints, width_count, widths, dim ); error = af_latin_hints_compute_edges( hints, dim ); } @@ -1367,9 +1842,10 @@ /* for each horizontal edge search the blue zone which is closest */ for ( ; edge < edge_limit; edge++ ) { - FT_Int bb; - AF_Width best_blue = NULL; - FT_Pos best_dist; /* initial threshold */ + FT_UInt bb; + AF_Width best_blue = NULL; + FT_Bool best_blue_is_neutral = 0; + FT_Pos best_dist; /* initial threshold */ /* compute the initial threshold as a fraction of the EM size */ @@ -1380,27 +1856,29 @@ if ( best_dist > 64 / 2 ) best_dist = 64 / 2; - for ( bb = 0; bb < AF_LATIN_BLUE_MAX; bb++ ) + for ( bb = 0; bb < latin->blue_count; bb++ ) { AF_LatinBlue blue = latin->blues + bb; - FT_Bool is_top_blue, is_major_dir; + FT_Bool is_top_blue, is_neutral_blue, is_major_dir; /* skip inactive blue zones (i.e., those that are too large) */ if ( !( blue->flags & AF_LATIN_BLUE_ACTIVE ) ) continue; - /* if it is a top zone, check for right edges -- if it is a bottom */ - /* zone, check for left edges */ - /* */ - /* of course, that's for TrueType */ - is_top_blue = (FT_Byte)( ( blue->flags & AF_LATIN_BLUE_TOP ) != 0 ); - is_major_dir = FT_BOOL( edge->dir == axis->major_dir ); - - /* if it is a top zone, the edge must be against the major */ - /* direction; if it is a bottom zone, it must be in the major */ - /* direction */ - if ( is_top_blue ^ is_major_dir ) + /* if it is a top zone, check for right edges (against the major */ + /* direction); if it is a bottom zone, check for left edges (in */ + /* the major direction) -- this assumes the TrueType convention */ + /* for the orientation of contours */ + is_top_blue = + (FT_Byte)( ( blue->flags & AF_LATIN_BLUE_TOP ) != 0 ); + is_neutral_blue = + (FT_Byte)( ( blue->flags & AF_LATIN_BLUE_NEUTRAL ) != 0); + is_major_dir = + FT_BOOL( edge->dir == axis->major_dir ); + + /* neutral blue zones are handled for both directions */ + if ( is_top_blue ^ is_major_dir || is_neutral_blue ) { FT_Pos dist; @@ -1413,15 +1891,19 @@ dist = FT_MulFix( dist, scale ); if ( dist < best_dist ) { - best_dist = dist; - best_blue = &blue->ref; + best_dist = dist; + best_blue = &blue->ref; + best_blue_is_neutral = is_neutral_blue; } /* now compare it to the overshoot position and check whether */ /* the edge is rounded, and whether the edge is over the */ /* reference position of a top zone, or under the reference */ - /* position of a bottom zone */ - if ( edge->flags & AF_EDGE_ROUND && dist != 0 ) + /* position of a bottom zone (provided we don't have a */ + /* neutral blue zone) */ + if ( edge->flags & AF_EDGE_ROUND && + dist != 0 && + !is_neutral_blue ) { FT_Bool is_under_ref = FT_BOOL( edge->fpos < blue->ref.org ); @@ -1435,8 +1917,9 @@ dist = FT_MulFix( dist, scale ); if ( dist < best_dist ) { - best_dist = dist; - best_blue = &blue->shoot; + best_dist = dist; + best_blue = &blue->shoot; + best_blue_is_neutral = is_neutral_blue; } } } @@ -1444,7 +1927,11 @@ } if ( best_blue ) + { edge->blue_edge = best_blue; + if ( best_blue_is_neutral ) + edge->flags |= AF_EDGE_NEUTRAL; + } } } @@ -1460,7 +1947,7 @@ FT_Face face = metrics->root.scaler.face; - af_glyph_hints_rescale( hints, (AF_ScriptMetrics)metrics ); + af_glyph_hints_rescale( hints, (AF_StyleMetrics)metrics ); /* * correct x_scale and y_scale if needed, since they may have @@ -1476,9 +1963,7 @@ #if 0 /* #ifdef AF_CONFIG_OPTION_USE_WARPER */ if ( mode == FT_RENDER_MODE_LCD || mode == FT_RENDER_MODE_LCD_V ) - { metrics->root.scaler.render_mode = mode = FT_RENDER_MODE_NORMAL; - } #endif scaler_flags = hints->scaler_flags; @@ -1518,7 +2003,7 @@ hints->scaler_flags = scaler_flags; hints->other_flags = other_flags; - return AF_Err_Ok; + return FT_Err_Ok; } @@ -1589,8 +2074,8 @@ AF_Edge_Flags base_flags, AF_Edge_Flags stem_flags ) { - AF_LatinMetrics metrics = (AF_LatinMetrics) hints->metrics; - AF_LatinAxis axis = & metrics->axis[dim]; + AF_LatinMetrics metrics = (AF_LatinMetrics)hints->metrics; + AF_LatinAxis axis = &metrics->axis[dim]; FT_Pos dist = width; FT_Int sign = 0; FT_Int vertical = ( dim == AF_DIMENSION_VERT ); @@ -1722,7 +2207,7 @@ if ( delta < 0 ) delta = -delta; - if (delta >= 16) + if ( delta >= 16 ) { dist = org_dist; if ( dist < 48 ) @@ -1762,9 +2247,9 @@ stem_edge->pos = base_edge->pos + fitted_width; - FT_TRACE5(( " LINK: edge %d (opos=%.2f) linked to (%.2f)," + FT_TRACE5(( " LINK: edge %d (opos=%.2f) linked to %.2f," " dist was %.2f, now %.2f\n", - stem_edge-hints->axis[dim].edges, stem_edge->opos / 64.0, + stem_edge - hints->axis[dim].edges, stem_edge->opos / 64.0, stem_edge->pos / 64.0, dist / 64.0, fitted_width / 64.0 )); } @@ -1808,9 +2293,14 @@ AF_Edge anchor = NULL; FT_Int has_serifs = 0; +#ifdef FT_DEBUG_LEVEL_TRACE + FT_UInt num_actions = 0; +#endif + - FT_TRACE5(("%s edge hinting\n", dim == AF_DIMENSION_VERT ? "horizontal" - : "vertical")); + FT_TRACE5(( "latin %s edge hinting (style `%s')\n", + dim == AF_DIMENSION_VERT ? "horizontal" : "vertical", + af_style_names[hints->metrics->style_class->style] )); /* we begin by aligning all stems relative to the blue zone */ /* if needed -- that's only for horizontal edges */ @@ -1826,14 +2316,41 @@ if ( edge->flags & AF_EDGE_DONE ) continue; - blue = edge->blue_edge; edge1 = NULL; edge2 = edge->link; + /* + * If a stem contains both a neutral and a non-neutral blue zone, + * skip the neutral one. Otherwise, outlines with different + * directions might be incorrectly aligned at the same vertical + * position. + * + * If we have two neutral blue zones, skip one of them. + * + */ + if ( edge->blue_edge && edge2 && edge2->blue_edge ) + { + FT_Byte neutral = edge->flags & AF_EDGE_NEUTRAL; + FT_Byte neutral2 = edge2->flags & AF_EDGE_NEUTRAL; + + + if ( ( neutral && neutral2 ) || neutral2 ) + { + edge2->blue_edge = NULL; + edge2->flags &= ~AF_EDGE_NEUTRAL; + } + else if ( neutral ) + { + edge->blue_edge = NULL; + edge->flags &= ~AF_EDGE_NEUTRAL; + } + } + + blue = edge->blue_edge; if ( blue ) edge1 = edge; - /* flip edges if the other stem is aligned to a blue zone */ + /* flip edges if the other edge is aligned to a blue zone */ else if ( edge2 && edge2->blue_edge ) { blue = edge2->blue_edge; @@ -1844,10 +2361,20 @@ if ( !edge1 ) continue; - FT_TRACE5(( " BLUE: edge %d (opos=%.2f) snapped to (%.2f)," - " was (%.2f)\n", - edge1 - edges, edge1->opos / 64.0, blue->fit / 64.0, - edge1->pos / 64.0 )); +#ifdef FT_DEBUG_LEVEL_TRACE + if ( !anchor ) + FT_TRACE5(( " BLUE_ANCHOR: edge %d (opos=%.2f) snapped to %.2f," + " was %.2f (anchor=edge %d)\n", + edge1 - edges, edge1->opos / 64.0, blue->fit / 64.0, + edge1->pos / 64.0, edge - edges )); + else + FT_TRACE5(( " BLUE: edge %d (opos=%.2f) snapped to %.2f," + " was %.2f\n", + edge1 - edges, edge1->opos / 64.0, blue->fit / 64.0, + edge1->pos / 64.0 )); + + num_actions++; +#endif edge1->pos = blue->fit; edge1->flags |= AF_EDGE_DONE; @@ -1856,6 +2383,10 @@ { af_latin_align_linked_edge( hints, dim, edge1, edge2 ); edge2->flags |= AF_EDGE_DONE; + +#ifdef FT_DEBUG_LEVEL_TRACE + num_actions++; +#endif } if ( !anchor ) @@ -1886,10 +2417,14 @@ /* this should not happen, but it's better to be safe */ if ( edge2->blue_edge ) { - FT_TRACE5(( " ASSERTION FAILED for edge %d\n", edge2-edges )); + FT_TRACE5(( " ASSERTION FAILED for edge %d\n", edge2 - edges )); af_latin_align_linked_edge( hints, dim, edge2, edge ); edge->flags |= AF_EDGE_DONE; + +#ifdef FT_DEBUG_LEVEL_TRACE + num_actions++; +#endif continue; } @@ -1947,16 +2482,20 @@ else edge->pos = FT_PIX_ROUND( edge->opos ); + anchor = edge; + edge->flags |= AF_EDGE_DONE; + FT_TRACE5(( " ANCHOR: edge %d (opos=%.2f) and %d (opos=%.2f)" - " snapped to (%.2f) (%.2f)\n", + " snapped to %.2f and %.2f\n", edge - edges, edge->opos / 64.0, edge2 - edges, edge2->opos / 64.0, edge->pos / 64.0, edge2->pos / 64.0 )); - anchor = edge; - - edge->flags |= AF_EDGE_DONE; af_latin_align_linked_edge( hints, dim, edge, edge2 ); + +#ifdef FT_DEBUG_LEVEL_TRACE + num_actions += 2; +#endif } else { @@ -1989,7 +2528,7 @@ cur_pos1 = FT_PIX_ROUND( org_center ); - if (cur_len <= 64 ) + if ( cur_len <= 64 ) { u_off = 32; d_off = 32; @@ -2016,12 +2555,13 @@ edge->pos = cur_pos1 - cur_len / 2; edge2->pos = cur_pos1 + cur_len / 2; - FT_TRACE5(( " STEM: %d (opos=%.2f) to %d (opos=%.2f)" - " snapped to (%.2f) and (%.2f)\n", + FT_TRACE5(( " STEM: edge %d (opos=%.2f) linked to %d (opos=%.2f)" + " snapped to %.2f and %.2f\n", edge - edges, edge->opos / 64.0, edge2 - edges, edge2->opos / 64.0, edge->pos / 64.0, edge2->pos / 64.0 )); } + else { org_pos = anchor->pos + ( edge->opos - anchor->opos ); @@ -2046,20 +2586,29 @@ edge->pos = ( delta1 < delta2 ) ? cur_pos1 : cur_pos2; edge2->pos = edge->pos + cur_len; - FT_TRACE5(( " STEM: %d (opos=%.2f) to %d (opos=%.2f)" - " snapped to (%.2f) and (%.2f)\n", + FT_TRACE5(( " STEM: edge %d (opos=%.2f) linked to %d (opos=%.2f)" + " snapped to %.2f and %.2f\n", edge - edges, edge->opos / 64.0, edge2 - edges, edge2->opos / 64.0, edge->pos / 64.0, edge2->pos / 64.0 )); } +#ifdef FT_DEBUG_LEVEL_TRACE + num_actions++; +#endif + edge->flags |= AF_EDGE_DONE; edge2->flags |= AF_EDGE_DONE; if ( edge > edges && edge->pos < edge[-1].pos ) { - FT_TRACE5(( " BOUND: %d (pos=%.2f) to (%.2f)\n", +#ifdef FT_DEBUG_LEVEL_TRACE + FT_TRACE5(( " BOUND: edge %d (pos=%.2f) moved to %.2f\n", edge - edges, edge->pos / 64.0, edge[-1].pos / 64.0 )); + + num_actions++; +#endif + edge->pos = edge[-1].pos; } } @@ -2154,7 +2703,7 @@ { af_latin_align_serif_edge( hints, edge->serif, edge ); FT_TRACE5(( " SERIF: edge %d (opos=%.2f) serif to %d (opos=%.2f)" - " aligned to (%.2f)\n", + " aligned to %.2f\n", edge - edges, edge->opos / 64.0, edge->serif - edges, edge->serif->opos / 64.0, edge->pos / 64.0 )); @@ -2164,7 +2713,7 @@ edge->pos = FT_PIX_ROUND( edge->opos ); anchor = edge; FT_TRACE5(( " SERIF_ANCHOR: edge %d (opos=%.2f)" - " snapped to (%.2f)\n", + " snapped to %.2f\n", edge-edges, edge->opos / 64.0, edge->pos / 64.0 )); } else @@ -2191,7 +2740,7 @@ after->pos - before->pos, after->opos - before->opos ); - FT_TRACE5(( " SERIF_LINK1: edge %d (opos=%.2f) snapped to (%.2f)" + FT_TRACE5(( " SERIF_LINK1: edge %d (opos=%.2f) snapped to %.2f" " from %d (opos=%.2f)\n", edge - edges, edge->opos / 64.0, edge->pos / 64.0, @@ -2201,26 +2750,49 @@ { edge->pos = anchor->pos + ( ( edge->opos - anchor->opos + 16 ) & ~31 ); - FT_TRACE5(( " SERIF_LINK2: edge %d (opos=%.2f)" - " snapped to (%.2f)\n", + " snapped to %.2f\n", edge - edges, edge->opos / 64.0, edge->pos / 64.0 )); } } +#ifdef FT_DEBUG_LEVEL_TRACE + num_actions++; +#endif edge->flags |= AF_EDGE_DONE; if ( edge > edges && edge->pos < edge[-1].pos ) + { +#ifdef FT_DEBUG_LEVEL_TRACE + FT_TRACE5(( " BOUND: edge %d (pos=%.2f) moved to %.2f\n", + edge - edges, edge->pos / 64.0, edge[-1].pos / 64.0 )); + + num_actions++; +#endif edge->pos = edge[-1].pos; + } if ( edge + 1 < edge_limit && edge[1].flags & AF_EDGE_DONE && edge->pos > edge[1].pos ) + { +#ifdef FT_DEBUG_LEVEL_TRACE + FT_TRACE5(( " BOUND: edge %d (pos=%.2f) moved to %.2f\n", + edge - edges, edge->pos / 64.0, edge[1].pos / 64.0 )); + + num_actions++; +#endif + edge->pos = edge[1].pos; + } } } +#ifdef FT_DEBUG_LEVEL_TRACE + if ( !num_actions ) + FT_TRACE5(( " (none)\n" )); FT_TRACE5(( "\n" )); +#endif } @@ -2234,6 +2806,8 @@ FT_Error error; int dim; + AF_LatinAxis axis; + error = af_glyph_hints_reload( hints, outline ); if ( error ) @@ -2247,14 +2821,22 @@ if ( AF_HINTS_DO_HORIZONTAL( hints ) ) #endif { - error = af_latin_hints_detect_features( hints, AF_DIMENSION_HORZ ); + axis = &metrics->axis[AF_DIMENSION_HORZ]; + error = af_latin_hints_detect_features( hints, + axis->width_count, + axis->widths, + AF_DIMENSION_HORZ ); if ( error ) goto Exit; } if ( AF_HINTS_DO_VERTICAL( hints ) ) { - error = af_latin_hints_detect_features( hints, AF_DIMENSION_VERT ); + axis = &metrics->axis[AF_DIMENSION_VERT]; + error = af_latin_hints_detect_features( hints, + axis->width_count, + axis->widths, + AF_DIMENSION_VERT ); if ( error ) goto Exit; @@ -2290,6 +2872,7 @@ af_glyph_hints_align_weak_points( hints, (AF_Dimension)dim ); } } + af_glyph_hints_save( hints, outline ); Exit: @@ -2306,53 +2889,19 @@ /*************************************************************************/ - /* XXX: this should probably fine tuned to differentiate better between */ - /* scripts... */ + AF_DEFINE_WRITING_SYSTEM_CLASS( + af_latin_writing_system_class, - static const AF_Script_UniRangeRec af_latin_uniranges[] = - { - AF_UNIRANGE_REC( 0x0020UL, 0x007FUL ), /* Basic Latin (no control chars) */ - AF_UNIRANGE_REC( 0x00A0UL, 0x00FFUL ), /* Latin-1 Supplement (no control chars) */ - AF_UNIRANGE_REC( 0x0100UL, 0x017FUL ), /* Latin Extended-A */ - AF_UNIRANGE_REC( 0x0180UL, 0x024FUL ), /* Latin Extended-B */ - AF_UNIRANGE_REC( 0x0250UL, 0x02AFUL ), /* IPA Extensions */ - AF_UNIRANGE_REC( 0x02B0UL, 0x02FFUL ), /* Spacing Modifier Letters */ - AF_UNIRANGE_REC( 0x0300UL, 0x036FUL ), /* Combining Diacritical Marks */ - AF_UNIRANGE_REC( 0x0370UL, 0x03FFUL ), /* Greek and Coptic */ - AF_UNIRANGE_REC( 0x0400UL, 0x04FFUL ), /* Cyrillic */ - AF_UNIRANGE_REC( 0x0500UL, 0x052FUL ), /* Cyrillic Supplement */ - AF_UNIRANGE_REC( 0x1D00UL, 0x1D7FUL ), /* Phonetic Extensions */ - AF_UNIRANGE_REC( 0x1D80UL, 0x1DBFUL ), /* Phonetic Extensions Supplement */ - AF_UNIRANGE_REC( 0x1DC0UL, 0x1DFFUL ), /* Combining Diacritical Marks Supplement */ - AF_UNIRANGE_REC( 0x1E00UL, 0x1EFFUL ), /* Latin Extended Additional */ - AF_UNIRANGE_REC( 0x1F00UL, 0x1FFFUL ), /* Greek Extended */ - AF_UNIRANGE_REC( 0x2000UL, 0x206FUL ), /* General Punctuation */ - AF_UNIRANGE_REC( 0x2070UL, 0x209FUL ), /* Superscripts and Subscripts */ - AF_UNIRANGE_REC( 0x20A0UL, 0x20CFUL ), /* Currency Symbols */ - AF_UNIRANGE_REC( 0x2150UL, 0x218FUL ), /* Number Forms */ - AF_UNIRANGE_REC( 0x2460UL, 0x24FFUL ), /* Enclosed Alphanumerics */ - AF_UNIRANGE_REC( 0x2C60UL, 0x2C7FUL ), /* Latin Extended-C */ - AF_UNIRANGE_REC( 0x2DE0UL, 0x2DFFUL ), /* Cyrillic Extended-A */ - AF_UNIRANGE_REC( 0xA640UL, 0xA69FUL ), /* Cyrillic Extended-B */ - AF_UNIRANGE_REC( 0xA720UL, 0xA7FFUL ), /* Latin Extended-D */ - AF_UNIRANGE_REC( 0xFB00UL, 0xFB06UL ), /* Alphab. Present. Forms (Latin Ligs) */ - AF_UNIRANGE_REC( 0x1D400UL, 0x1D7FFUL ), /* Mathematical Alphanumeric Symbols */ - AF_UNIRANGE_REC( 0UL, 0UL ) - }; - - - AF_DEFINE_SCRIPT_CLASS( af_latin_script_class, - AF_SCRIPT_LATIN, - af_latin_uniranges, + AF_WRITING_SYSTEM_LATIN, sizeof ( AF_LatinMetricsRec ), - (AF_Script_InitMetricsFunc) af_latin_metrics_init, - (AF_Script_ScaleMetricsFunc)af_latin_metrics_scale, - (AF_Script_DoneMetricsFunc) NULL, + (AF_WritingSystem_InitMetricsFunc) af_latin_metrics_init, + (AF_WritingSystem_ScaleMetricsFunc)af_latin_metrics_scale, + (AF_WritingSystem_DoneMetricsFunc) NULL, - (AF_Script_InitHintsFunc) af_latin_hints_init, - (AF_Script_ApplyHintsFunc) af_latin_hints_apply + (AF_WritingSystem_InitHintsFunc) af_latin_hints_init, + (AF_WritingSystem_ApplyHintsFunc) af_latin_hints_apply ) diff --git a/src/autofit/aflatin.h b/src/autofit/aflatin.h index c5c2d13..2c0bfca 100644 --- a/src/autofit/aflatin.h +++ b/src/autofit/aflatin.h @@ -2,9 +2,10 @@ /* */ /* aflatin.h */ /* */ -/* Auto-fitter hinting routines for latin script (specification). */ +/* Auto-fitter hinting routines for latin writing system */ +/* (specification). */ /* */ -/* Copyright 2003-2007, 2009, 2011 by */ +/* Copyright 2003-2007, 2009, 2011-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -24,10 +25,9 @@ FT_BEGIN_HEADER + /* the `latin' writing system */ - /* the latin-specific script class */ - - AF_DECLARE_SCRIPT_CLASS(af_latin_script_class) + AF_DECLARE_WRITING_SYSTEM_CLASS( af_latin_writing_system_class ) /* constants are given with units_per_em == 2048 in mind */ @@ -46,40 +46,30 @@ FT_BEGIN_HEADER /* * The following declarations could be embedded in the file `aflatin.c'; - * they have been made semi-public to allow alternate script hinters to - * re-use some of them. + * they have been made semi-public to allow alternate writing system + * hinters to re-use some of them. */ - /* Latin (global) metrics management */ - - enum - { - AF_LATIN_BLUE_CAPITAL_TOP, - AF_LATIN_BLUE_CAPITAL_BOTTOM, - AF_LATIN_BLUE_SMALL_F_TOP, - AF_LATIN_BLUE_SMALL_TOP, - AF_LATIN_BLUE_SMALL_BOTTOM, - AF_LATIN_BLUE_SMALL_MINOR, - - AF_LATIN_BLUE_MAX - }; - - -#define AF_LATIN_IS_TOP_BLUE( b ) ( (b) == AF_LATIN_BLUE_CAPITAL_TOP || \ - (b) == AF_LATIN_BLUE_SMALL_F_TOP || \ - (b) == AF_LATIN_BLUE_SMALL_TOP ) +#define AF_LATIN_IS_TOP_BLUE( b ) \ + ( (b)->properties & AF_BLUE_PROPERTY_LATIN_TOP ) +#define AF_LATIN_IS_NEUTRAL_BLUE( b ) \ + ( (b)->properties & AF_BLUE_PROPERTY_LATIN_NEUTRAL ) +#define AF_LATIN_IS_X_HEIGHT_BLUE( b ) \ + ( (b)->properties & AF_BLUE_PROPERTY_LATIN_X_HEIGHT ) +#define AF_LATIN_IS_LONG_BLUE( b ) \ + ( (b)->properties & AF_BLUE_PROPERTY_LATIN_LONG ) #define AF_LATIN_MAX_WIDTHS 16 -#define AF_LATIN_MAX_BLUES AF_LATIN_BLUE_MAX enum { - AF_LATIN_BLUE_ACTIVE = 1 << 0, /* set if zone height is <= 3/4px */ - AF_LATIN_BLUE_TOP = 1 << 1, /* result of AF_LATIN_IS_TOP_BLUE */ - AF_LATIN_BLUE_ADJUSTMENT = 1 << 2, /* used for scale adjustment */ - /* optimization */ + AF_LATIN_BLUE_ACTIVE = 1 << 0, /* set if zone height is <= 3/4px */ + AF_LATIN_BLUE_TOP = 1 << 1, /* set if we have a top blue zone */ + AF_LATIN_BLUE_NEUTRAL = 1 << 2, /* set if we have neutral blue zone */ + AF_LATIN_BLUE_ADJUSTMENT = 1 << 3, /* used for scale adjustment */ + /* optimization */ AF_LATIN_BLUE_FLAG_MAX }; @@ -106,7 +96,7 @@ FT_BEGIN_HEADER /* ignored for horizontal metrics */ FT_UInt blue_count; - AF_LatinBlueRec blues[AF_LATIN_BLUE_MAX]; + AF_LatinBlueRec blues[AF_BLUE_STRINGSET_MAX]; FT_Fixed org_scale; FT_Pos org_delta; @@ -116,9 +106,9 @@ FT_BEGIN_HEADER typedef struct AF_LatinMetricsRec_ { - AF_ScriptMetricsRec root; - FT_UInt units_per_em; - AF_LatinAxisRec axis[AF_DIMENSION_MAX]; + AF_StyleMetricsRec root; + FT_UInt units_per_em; + AF_LatinAxisRec axis[AF_DIMENSION_MAX]; } AF_LatinMetricsRec, *AF_LatinMetrics; @@ -133,8 +123,7 @@ FT_BEGIN_HEADER FT_LOCAL( void ) af_latin_metrics_init_widths( AF_LatinMetrics metrics, - FT_Face face, - FT_ULong charcode ); + FT_Face face ); FT_LOCAL( void ) af_latin_metrics_check_digits( AF_LatinMetrics metrics, @@ -174,31 +163,27 @@ FT_BEGIN_HEADER /* - * This shouldn't normally be exported. However, other scripts might - * like to use this function as-is. + * The next functions shouldn't normally be exported. However, other + * writing systems might like to use these functions as-is. */ FT_LOCAL( FT_Error ) af_latin_hints_compute_segments( AF_GlyphHints hints, AF_Dimension dim ); - /* - * This shouldn't normally be exported. However, other scripts might - * want to use this function as-is. - */ FT_LOCAL( void ) af_latin_hints_link_segments( AF_GlyphHints hints, + FT_UInt width_count, + AF_WidthRec* widths, AF_Dimension dim ); - /* - * This shouldn't normally be exported. However, other scripts might - * want to use this function as-is. - */ FT_LOCAL( FT_Error ) af_latin_hints_compute_edges( AF_GlyphHints hints, AF_Dimension dim ); FT_LOCAL( FT_Error ) af_latin_hints_detect_features( AF_GlyphHints hints, + FT_UInt width_count, + AF_WidthRec* widths, AF_Dimension dim ); /* */ diff --git a/src/autofit/aflatin2.c b/src/autofit/aflatin2.c index ea6af8d..07590b3 100644 --- a/src/autofit/aflatin2.c +++ b/src/autofit/aflatin2.c @@ -2,9 +2,9 @@ /* */ /* aflatin2.c */ /* */ -/* Auto-fitter hinting routines for latin script (body). */ +/* Auto-fitter hinting routines for latin writing system (body). */ /* */ -/* Copyright 2003-2011 by */ +/* Copyright 2003-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -18,6 +18,7 @@ #include FT_ADVANCES_H +#include "afglobal.h" #include "aflatin.h" #include "aflatin2.h" #include "aferrors.h" @@ -56,8 +57,7 @@ FT_LOCAL_DEF( void ) af_latin2_metrics_init_widths( AF_LatinMetrics metrics, - FT_Face face, - FT_ULong charcode ) + FT_Face face ) { /* scan the array of segments in each direction */ AF_GlyphHintsRec hints[1]; @@ -76,7 +76,9 @@ AF_Scaler scaler = &dummy->root.scaler; - glyph_index = FT_Get_Char_Index( face, charcode ); + glyph_index = FT_Get_Char_Index( + face, + metrics->root.style_class->standard_char ); if ( glyph_index == 0 ) goto Exit; @@ -93,7 +95,7 @@ scaler->render_mode = FT_RENDER_MODE_NORMAL; scaler->flags = 0; - af_glyph_hints_rescale( hints, (AF_ScriptMetrics)dummy ); + af_glyph_hints_rescale( hints, (AF_StyleMetrics)dummy ); error = af_glyph_hints_reload( hints, &face->glyph->outline ); if ( error ) @@ -198,8 +200,8 @@ /* 'af_latin2_blue_chars[blues]' string, then compute its top-most or */ /* bottom-most points (depending on `AF_IS_TOP_BLUE') */ - FT_TRACE5(( "blue zones computation\n" )); - FT_TRACE5(( "------------------------------------------------\n" )); + FT_TRACE5(( "blue zones computation\n" + "======================\n\n" )); for ( bb = 0; bb < AF_LATIN_BLUE_MAX; bb++ ) { @@ -209,7 +211,7 @@ FT_Pos* blue_shoot; - FT_TRACE5(( "blue %3d: ", bb )); + FT_TRACE5(( "blue zone %d:\n", bb )); num_flats = 0; num_rounds = 0; @@ -222,8 +224,6 @@ FT_Bool round; - FT_TRACE5(( "'%c'", *p )); - /* load the character in the face -- skip unknown or empty ones */ glyph_index = FT_Get_Char_Index( face, (FT_UInt)*p ); if ( glyph_index == 0 ) @@ -285,13 +285,14 @@ best_last = last; } } - FT_TRACE5(( "%5d", best_y )); + FT_TRACE5(( " %c %d", *p, best_y )); } /* now check whether the point belongs to a straight or round */ /* segment; we first need to find in which contour the extremum */ /* lies, then inspect its previous and next points */ { + FT_Pos best_x = points[best_point].x; FT_Int start, end, prev, next; FT_Pos dist; @@ -302,13 +303,16 @@ do { - prev = start-1; + prev = start - 1; if ( prev < best_first ) prev = best_last; - dist = points[prev].y - best_y; - if ( dist < -5 || dist > 5 ) - break; + dist = FT_ABS( points[prev].y - best_y ); + /* accept a small distance or a small angle (both values are */ + /* heuristic; value 20 corresponds to approx. 2.9 degrees) */ + if ( dist > 5 ) + if ( FT_ABS( points[prev].x - best_x ) <= 20 * dist ) + break; start = prev; @@ -316,13 +320,14 @@ do { - next = end+1; + next = end + 1; if ( next > best_last ) next = best_first; - dist = points[next].y - best_y; - if ( dist < -5 || dist > 5 ) - break; + dist = FT_ABS( points[next].y - best_y ); + if ( dist > 5 ) + if ( FT_ABS( points[next].x - best_x ) <= 20 * dist ) + break; end = next; @@ -333,7 +338,7 @@ FT_CURVE_TAG( glyph->outline.tags[start] ) != FT_CURVE_TAG_ON || FT_CURVE_TAG( glyph->outline.tags[ end ] ) != FT_CURVE_TAG_ON ); - FT_TRACE5(( "%c ", round ? 'r' : 'f' )); + FT_TRACE5(( " (%s)\n", round ? "round" : "flat" )); } if ( round ) @@ -342,15 +347,13 @@ flats[num_flats++] = best_y; } - FT_TRACE5(( "\n" )); - if ( num_flats == 0 && num_rounds == 0 ) { /* * we couldn't find a single glyph to compute this blue zone, * we will simply ignore it then */ - FT_TRACE5(( "empty\n" )); + FT_TRACE5(( " empty\n" )); continue; } @@ -393,7 +396,13 @@ if ( AF_LATIN_IS_TOP_BLUE( bb ) ^ over_ref ) - *blue_shoot = *blue_ref = ( shoot + ref ) / 2; + { + *blue_ref = + *blue_shoot = ( shoot + ref ) / 2; + + FT_TRACE5(( " [overshoot smaller than reference," + " taking mean value]\n" )); + } } blue->flags = 0; @@ -401,14 +410,16 @@ blue->flags |= AF_LATIN_BLUE_TOP; /* - * The following flags is used later to adjust the y and x scales + * The following flag is used later to adjust the y and x scales * in order to optimize the pixel grid alignment of the top of small * letters. */ - if ( bb == AF_LATIN_BLUE_SMALL_TOP ) + if ( AF_LATIN_IS_X_HEIGHT_BLUE( bb ) ) blue->flags |= AF_LATIN_BLUE_ADJUSTMENT; - FT_TRACE5(( "-- ref = %ld, shoot = %ld\n", *blue_ref, *blue_shoot )); + FT_TRACE5(( " -> reference = %ld\n" + " overshoot = %ld\n", + *blue_ref, *blue_shoot )); } return; @@ -465,7 +476,7 @@ af_latin2_metrics_init( AF_LatinMetrics metrics, FT_Face face ) { - FT_Error error = AF_Err_Ok; + FT_Error error = FT_Err_Ok; FT_CharMap oldmap = face->charmap; FT_UInt ee; @@ -491,14 +502,13 @@ if ( !error ) { - /* For now, compute the standard width and height from the `o'. */ - af_latin2_metrics_init_widths( metrics, face, 'o' ); + af_latin2_metrics_init_widths( metrics, face ); af_latin2_metrics_init_blues( metrics, face ); af_latin2_metrics_check_digits( metrics, face ); } FT_Set_Charmap( face, oldmap ); - return AF_Err_Ok; + return FT_Err_Ok; } @@ -553,8 +563,26 @@ if ( blue ) { - FT_Pos scaled = FT_MulFix( blue->shoot.org, scaler->y_scale ); - FT_Pos fitted = ( scaled + 40 ) & ~63; + FT_Pos scaled; + FT_Pos threshold; + FT_Pos fitted; + FT_UInt limit; + FT_UInt ppem; + + + scaled = FT_MulFix( blue->shoot.org, scaler->y_scale ); + ppem = metrics->root.scaler.face->size->metrics.x_ppem; + limit = metrics->root.globals->increase_x_height; + threshold = 40; + + /* if the `increase-x-height' property is active, */ + /* we round up much more often */ + if ( limit && + ppem <= limit && + ppem >= AF_PROP_INCREASE_X_HEIGHT_MIN ) + threshold = 52; + + fitted = ( scaled + threshold ) & ~63; #if 1 if ( scaled != fitted ) @@ -658,6 +686,7 @@ { metrics->root.scaler.render_mode = scaler->render_mode; metrics->root.scaler.face = scaler->face; + metrics->root.scaler.flags = scaler->flags; af_latin2_metrics_scale_dim( metrics, scaler, AF_DIMENSION_HORZ ); af_latin2_metrics_scale_dim( metrics, scaler, AF_DIMENSION_VERT ); @@ -680,7 +709,7 @@ { AF_AxisHints axis = &hints->axis[dim]; FT_Memory memory = hints->memory; - FT_Error error = AF_Err_Ok; + FT_Error error = FT_Err_Ok; AF_Segment segment = NULL; AF_SegmentRec seg0; AF_Point* contour = hints->contours; @@ -796,17 +825,17 @@ segment->dir = first->out_dir; segment->first = first; segment->last = point; - segment->pos = (FT_Short)(( min_u + max_u ) >> 1); + segment->pos = (FT_Short)( ( min_u + max_u ) >> 1 ); segment->min_coord = (FT_Short) min_v; segment->max_coord = (FT_Short) max_v; - segment->height = (FT_Short)(max_v - min_v); + segment->height = (FT_Short)( max_v - min_v ); /* a segment is round if it doesn't have successive */ /* on-curve points. */ { AF_Point pt = first; AF_Point last = point; - AF_Flags f0 = (AF_Flags)(pt->flags & AF_FLAG_CONTROL); + AF_Flags f0 = (AF_Flags)( pt->flags & AF_FLAG_CONTROL ); AF_Flags f1; @@ -815,7 +844,7 @@ for ( ; pt != last; f0 = f1 ) { pt = pt->next; - f1 = (AF_Flags)(pt->flags & AF_FLAG_CONTROL); + f1 = (AF_Flags)( pt->flags & AF_FLAG_CONTROL ); if ( !f0 && !f1 ) break; @@ -832,7 +861,7 @@ break; /* jump to the start of the next segment, if any */ - while ( FT_ABS(point->out_dir) != major_dir ) + while ( FT_ABS( point->out_dir ) != major_dir ) { point = point->next; @@ -861,9 +890,6 @@ FT_Pos last_v = last->v; - if ( first == last ) - continue; - if ( first_v < last_v ) { p = first->prev; @@ -900,16 +926,17 @@ FT_UInt count = axis->num_segments; FT_UInt ii, jj; - for (ii = 0; ii < count; ii++) + for ( ii = 0; ii < count; ii++ ) { if ( segments[ii].dir > 0 ) { - for (jj = ii+1; jj < count; jj++) + for ( jj = ii + 1; jj < count; jj++ ) { if ( segments[jj].dir < 0 ) { AF_SegmentRec tmp; + tmp = segments[ii]; segments[ii] = segments[jj]; segments[jj] = tmp; @@ -954,7 +981,7 @@ #ifdef AF_SORT_SEGMENTS for ( seg1 = segments; seg1 < segment_mid; seg1++ ) { - if ( seg1->dir != axis->major_dir || seg1->first == seg1->last ) + if ( seg1->dir != axis->major_dir ) continue; for ( seg2 = segment_mid; seg2 < segment_limit; seg2++ ) @@ -962,9 +989,7 @@ /* now compare each segment to the others */ for ( seg1 = segments; seg1 < segment_limit; seg1++ ) { - /* the fake segments are introduced to hint the metrics -- */ - /* we must never link them to anything */ - if ( seg1->dir != axis->major_dir || seg1->first == seg1->last ) + if ( seg1->dir != axis->major_dir ) continue; for ( seg2 = segments; seg2 < segment_limit; seg2++ ) @@ -1036,7 +1061,7 @@ AF_Dimension dim ) { AF_AxisHints axis = &hints->axis[dim]; - FT_Error error = AF_Err_Ok; + FT_Error error = FT_Err_Ok; FT_Memory memory = hints->memory; AF_LatinAxis laxis = &((AF_LatinMetrics)hints->metrics)->axis[dim]; @@ -1070,7 +1095,7 @@ if ( dim == AF_DIMENSION_HORZ ) { if ( laxis->width_count > 0 ) - segment_length_threshold = (laxis->standard_width * 10 ) >> 4; + segment_length_threshold = ( laxis->standard_width * 10 ) >> 4; else segment_length_threshold = FT_DivFix( 64, hints->y_scale ); } @@ -1116,10 +1141,11 @@ { FT_Pos dist = seg->serif->pos - seg->pos; - if (dist < 0) + + if ( dist < 0 ) dist = -dist; - if (dist >= laxis->standard_width >> 1) + if ( dist >= laxis->standard_width >> 1 ) { /* unlink this serif, it is too distant from its reference stem */ seg->serif = NULL; @@ -1163,9 +1189,10 @@ edge->first = seg; edge->last = seg; - edge->fpos = seg->pos; edge->dir = seg->dir; - edge->opos = edge->pos = FT_MulFix( seg->pos, scale ); + edge->fpos = seg->pos; + edge->opos = FT_MulFix( seg->pos, scale ); + edge->pos = edge->opos; seg->edge_next = seg; } else @@ -1417,7 +1444,7 @@ compare = &blue->ref; dist = edge->fpos - compare->org; - if (dist < 0) + if ( dist < 0 ) dist = -dist; dist = FT_MulFix( dist, scale ); @@ -1470,7 +1497,7 @@ FT_Face face = metrics->root.scaler.face; - af_glyph_hints_rescale( hints, (AF_ScriptMetrics)metrics ); + af_glyph_hints_rescale( hints, (AF_StyleMetrics)metrics ); /* * correct x_scale and y_scale if needed, since they may have @@ -1521,8 +1548,8 @@ * In `light' hinting mode we disable horizontal hinting completely. * We also do it if the face is italic. */ - if ( mode == FT_RENDER_MODE_LIGHT || - (face->style_flags & FT_STYLE_FLAG_ITALIC) != 0 ) + if ( mode == FT_RENDER_MODE_LIGHT || + ( face->style_flags & FT_STYLE_FLAG_ITALIC ) != 0 ) scaler_flags |= AF_SCALER_FLAG_NO_HORIZONTAL; hints->scaler_flags = scaler_flags; @@ -1603,8 +1630,8 @@ FT_Int sign = 0; FT_Int vertical = ( dim == AF_DIMENSION_VERT ); + FT_UNUSED( base_flags ); - FT_UNUSED(base_flags); if ( !AF_LATIN_HINTS_DO_STEM_ADJUST( hints ) || axis->extra_light ) @@ -1734,7 +1761,7 @@ if ( delta < 0 ) delta = -delta; - if (delta >= 16) + if ( delta >= 16 ) { dist = org_dist; if ( dist < 48 ) @@ -1788,7 +1815,7 @@ { FT_UNUSED( hints ); - serif->pos = base->pos + (serif->opos - base->opos); + serif->pos = base->pos + ( serif->opos - base->opos ); } @@ -1870,9 +1897,10 @@ { anchor = edge; - anchor_drift = (anchor->pos - anchor->opos); - if (edge2) - anchor_drift = (anchor_drift + (edge2->pos - edge2->opos)) >> 1; + anchor_drift = ( anchor->pos - anchor->opos ); + if ( edge2 ) + anchor_drift = ( anchor_drift + + ( edge2->pos - edge2->opos ) ) >> 1; } } } @@ -1964,8 +1992,8 @@ edge2->flags |= AF_EDGE_DONE; - anchor_drift = ( (anchor->pos - anchor->opos) + - (edge2->pos - edge2->opos)) >> 1; + anchor_drift = ( ( anchor->pos - anchor->opos ) + + ( edge2->pos - edge2->opos ) ) >> 1; FT_TRACE5(( "DRIFT: %.2f\n", anchor_drift/64.0 )); } @@ -1984,8 +2012,8 @@ (AF_Edge_Flags)edge->flags, (AF_Edge_Flags)edge2->flags ); - org_left = org_pos + ((org_len - cur_len) >> 1); - org_right = org_pos + ((org_len + cur_len) >> 1); + org_left = org_pos + ( ( org_len - cur_len ) >> 1 ); + org_right = org_pos + ( ( org_len + cur_len ) >> 1 ); FT_TRACE5(( "ALIGN: left=%.2f right=%.2f ", org_left / 64.0, org_right / 64.0 )); @@ -2013,13 +2041,13 @@ } /* if the span is within a single pixel, don't touch it */ - if ( FT_PIX_FLOOR(org_left) == FT_PIX_CEIL(org_right) ) + if ( FT_PIX_FLOOR( org_left ) == FT_PIX_CEIL( org_right ) ) { FT_TRACE5(( "single pixel stem\n" )); goto AlignStem; } - if (cur_len <= 96) + if ( cur_len <= 96 ) { /* we want to avoid the absolute worst case which is * when the left and right edges of the span each represent @@ -2027,43 +2055,43 @@ * to 25/75%, since this is much more pleasant to the eye with * very acceptable distortion */ - FT_Pos frac_left = (org_left) & 63; - FT_Pos frac_right = (org_right) & 63; + FT_Pos frac_left = org_left & 63; + FT_Pos frac_right = org_right & 63; if ( frac_left >= 22 && frac_left <= 42 && frac_right >= 22 && frac_right <= 42 ) { org = frac_left; - fit = (org <= 32) ? 16 : 48; - delta = FT_ABS(fit - org); + fit = ( org <= 32 ) ? 16 : 48; + delta = FT_ABS( fit - org ); displacements[count] = fit - org; scores[count++] = delta; - FT_TRACE5(( "dispA=%.2f (%d) ", (fit - org) / 64.0, delta )); + FT_TRACE5(( "dispA=%.2f (%d) ", ( fit - org ) / 64.0, delta )); org = frac_right; - fit = (org <= 32) ? 16 : 48; - delta = FT_ABS(fit - org); + fit = ( org <= 32 ) ? 16 : 48; + delta = FT_ABS( fit - org ); displacements[count] = fit - org; scores[count++] = delta; - FT_TRACE5(( "dispB=%.2f (%d) ", (fit - org) / 64.0, delta )); + FT_TRACE5(( "dispB=%.2f (%d) ", ( fit - org ) / 64.0, delta )); } } /* snapping the left edge to the grid */ org = org_left; - fit = FT_PIX_ROUND(org); - delta = FT_ABS(fit - org); + fit = FT_PIX_ROUND( org ); + delta = FT_ABS( fit - org ); displacements[count] = fit - org; scores[count++] = delta; - FT_TRACE5(( "dispC=%.2f (%d) ", (fit - org) / 64.0, delta )); + FT_TRACE5(( "dispC=%.2f (%d) ", ( fit - org ) / 64.0, delta )); /* snapping the right edge to the grid */ org = org_right; - fit = FT_PIX_ROUND(org); - delta = FT_ABS(fit - org); + fit = FT_PIX_ROUND( org ); + delta = FT_ABS( fit - org ); displacements[count] = fit - org; scores[count++] = delta; - FT_TRACE5(( "dispD=%.2f (%d) ", (fit - org) / 64.0, delta )); + FT_TRACE5(( "dispD=%.2f (%d) ", ( fit - org ) / 64.0, delta )); /* now find the best displacement */ { @@ -2071,9 +2099,9 @@ FT_Pos best_disp = displacements[0]; FT_UInt nn; - for (nn = 1; nn < count; nn++) + for ( nn = 1; nn < count; nn++ ) { - if (scores[nn] < best_score) + if ( scores[nn] < best_score ) { best_score = scores[nn]; best_disp = displacements[nn]; @@ -2086,7 +2114,7 @@ } AlignStem: - edge->pos = cur_center - (cur_len >> 1); + edge->pos = cur_center - ( cur_len >> 1 ); edge2->pos = edge->pos + cur_len; FT_TRACE5(( "STEM1: %d (opos=%.2f) to %d (opos=%.2f)" @@ -2348,26 +2376,19 @@ /*************************************************************************/ - static const AF_Script_UniRangeRec af_latin2_uniranges[] = - { - AF_UNIRANGE_REC( 32UL, 127UL ), /* TODO: Add new Unicode ranges here! */ - AF_UNIRANGE_REC( 160UL, 255UL ), - AF_UNIRANGE_REC( 0UL, 0UL ) - }; - + AF_DEFINE_WRITING_SYSTEM_CLASS( + af_latin2_writing_system_class, - AF_DEFINE_SCRIPT_CLASS( af_latin2_script_class, - AF_SCRIPT_LATIN2, - af_latin2_uniranges, + AF_WRITING_SYSTEM_LATIN2, sizeof ( AF_LatinMetricsRec ), - (AF_Script_InitMetricsFunc) af_latin2_metrics_init, - (AF_Script_ScaleMetricsFunc)af_latin2_metrics_scale, - (AF_Script_DoneMetricsFunc) NULL, + (AF_WritingSystem_InitMetricsFunc) af_latin2_metrics_init, + (AF_WritingSystem_ScaleMetricsFunc)af_latin2_metrics_scale, + (AF_WritingSystem_DoneMetricsFunc) NULL, - (AF_Script_InitHintsFunc) af_latin2_hints_init, - (AF_Script_ApplyHintsFunc) af_latin2_hints_apply + (AF_WritingSystem_InitHintsFunc) af_latin2_hints_init, + (AF_WritingSystem_ApplyHintsFunc) af_latin2_hints_apply ) diff --git a/src/autofit/aflatin2.h b/src/autofit/aflatin2.h index 925c621..b5d252a 100644 --- a/src/autofit/aflatin2.h +++ b/src/autofit/aflatin2.h @@ -2,9 +2,10 @@ /* */ /* aflatin2.h */ /* */ -/* Auto-fitter hinting routines for latin script (specification). */ +/* Auto-fitter hinting routines for latin writing system */ +/* (specification). */ /* */ -/* Copyright 2003, 2004, 2005, 2006, 2007 by */ +/* Copyright 2003-2007, 2012, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -25,9 +26,10 @@ FT_BEGIN_HEADER - /* the latin-specific script class */ + /* the `latin' writing system */ + + AF_DECLARE_WRITING_SYSTEM_CLASS( af_latin2_writing_system_class ) - AF_DECLARE_SCRIPT_CLASS(af_latin2_script_class) /* */ diff --git a/src/autofit/afloader.c b/src/autofit/afloader.c index 34ef9d8..fb15c87 100644 --- a/src/autofit/afloader.c +++ b/src/autofit/afloader.c @@ -4,7 +4,7 @@ /* */ /* Auto-fitter glyph loading routines (body). */ /* */ -/* Copyright 2003-2009, 2011-2012 by */ +/* Copyright 2003-2009, 2011-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -16,18 +16,23 @@ /***************************************************************************/ +#include "afglobal.h" #include "afloader.h" #include "afhints.h" -#include "afglobal.h" #include "aferrors.h" +#include "afmodule.h" +#include "afpic.h" /* Initialize glyph loader. */ FT_LOCAL_DEF( FT_Error ) - af_loader_init( AF_Loader loader, - FT_Memory memory ) + af_loader_init( AF_Module module ) { + AF_Loader loader = module->loader; + FT_Memory memory = module->root.library->memory; + + FT_ZERO( loader ); af_glyph_hints_init( &loader->hints, memory ); @@ -41,10 +46,11 @@ /* Reset glyph loader and compute globals if necessary. */ FT_LOCAL_DEF( FT_Error ) - af_loader_reset( AF_Loader loader, + af_loader_reset( AF_Module module, FT_Face face ) { - FT_Error error = AF_Err_Ok; + FT_Error error = FT_Err_Ok; + AF_Loader loader = module->loader; loader->face = face; @@ -54,7 +60,7 @@ if ( loader->globals == NULL ) { - error = af_face_globals_new( face, &loader->globals ); + error = af_face_globals_new( face, &loader->globals, module ); if ( !error ) { face->autohint.data = @@ -71,8 +77,11 @@ /* Finalize glyph loader. */ FT_LOCAL_DEF( void ) - af_loader_done( AF_Loader loader ) + af_loader_done( AF_Module module ) { + AF_Loader loader = module->loader; + + af_glyph_hints_done( &loader->hints ); loader->face = NULL; @@ -100,13 +109,15 @@ FT_Error error; FT_Face face = loader->face; FT_GlyphLoader gloader = loader->gloader; - AF_ScriptMetrics metrics = loader->metrics; + AF_StyleMetrics metrics = loader->metrics; AF_GlyphHints hints = &loader->hints; FT_GlyphSlot slot = face->glyph; FT_Slot_Internal internal = slot->internal; + FT_Int32 flags; - error = FT_Load_Glyph( face, glyph_index, load_flags ); + flags = load_flags | FT_LOAD_LINEAR_DESIGN; + error = FT_Load_Glyph( face, glyph_index, flags ); if ( error ) goto Exit; @@ -120,14 +131,10 @@ loader->trans_delta = internal->glyph_delta; inverse = loader->trans_matrix; - FT_Matrix_Invert( &inverse ); - FT_Vector_Transform( &loader->trans_delta, &inverse ); + if ( !FT_Matrix_Invert( &inverse ) ) + FT_Vector_Transform( &loader->trans_delta, &inverse ); } - /* set linear metrics */ - slot->linearHoriAdvance = slot->metrics.horiAdvance; - slot->linearVertAdvance = slot->metrics.vertAdvance; - switch ( slot->format ) { case FT_GLYPH_FORMAT_OUTLINE: @@ -137,8 +144,8 @@ loader->trans_delta.x, loader->trans_delta.y ); - /* copy the outline points in the loader's current */ - /* extra points which is used to keep original glyph coordinates */ + /* copy the outline points in the loader's current */ + /* extra points which are used to keep original glyph coordinates */ error = FT_GLYPHLOADER_CHECK_POINTS( gloader, slot->outline.n_points + 4, slot->outline.n_contours ); @@ -174,10 +181,20 @@ /* now load the slot image into the auto-outline and run the */ /* automatic hinting process */ - if ( metrics->clazz->script_hints_apply ) - metrics->clazz->script_hints_apply( hints, - &gloader->current.outline, - metrics ); + { +#ifdef FT_CONFIG_OPTION_PIC + AF_FaceGlobals globals = loader->globals; +#endif + AF_StyleClass style_class = metrics->style_class; + AF_WritingSystemClass writing_system_class = + AF_WRITING_SYSTEM_CLASSES_GET[style_class->writing_system]; + + + if ( writing_system_class->style_hints_apply ) + writing_system_class->style_hints_apply( hints, + &gloader->current.outline, + metrics ); + } /* we now need to adjust the metrics according to the change in */ /* width/positioning that occurred during the hinting process */ @@ -301,12 +318,7 @@ /* recompute subglyph pointer */ subglyph = gloader->base.subglyphs + num_base_subgs + nn; - if ( subglyph->flags & FT_SUBGLYPH_FLAG_USE_MY_METRICS ) - { - pp1 = loader->pp1; - pp2 = loader->pp2; - } - else + if ( !( subglyph->flags & FT_SUBGLYPH_FLAG_USE_MY_METRICS ) ) { loader->pp1 = pp1; loader->pp2 = pp2; @@ -343,14 +355,14 @@ if ( start_point + k >= num_base_points || l >= (FT_UInt)num_new_points ) { - error = AF_Err_Invalid_Composite; + error = FT_THROW( Invalid_Composite ); goto Exit; } l += num_base_points; - /* for now, only use the current point coordinates; */ - /* we may consider another approach in the near future */ + /* for now, only use the current point coordinates; */ + /* we eventually may consider another approach */ p1 = gloader->base.outline.points + start_point + k; p2 = gloader->base.outline.points + start_point + l; @@ -381,7 +393,7 @@ default: /* we don't support other formats (yet?) */ - error = AF_Err_Unimplemented_Feature; + error = FT_THROW( Unimplemented_Feature ); } Hint_Metrics: @@ -484,18 +496,19 @@ /* Load a glyph. */ FT_LOCAL_DEF( FT_Error ) - af_loader_load_glyph( AF_Loader loader, + af_loader_load_glyph( AF_Module module, FT_Face face, FT_UInt gindex, FT_Int32 load_flags ) { FT_Error error; - FT_Size size = face->size; + FT_Size size = face->size; + AF_Loader loader = module->loader; AF_ScalerRec scaler; if ( !size ) - return AF_Err_Invalid_Argument; + return FT_THROW( Invalid_Size_Handle ); FT_ZERO( &scaler ); @@ -508,37 +521,45 @@ scaler.render_mode = FT_LOAD_TARGET_MODE( load_flags ); scaler.flags = 0; /* XXX: fix this */ - error = af_loader_reset( loader, face ); + error = af_loader_reset( module, face ); if ( !error ) { - AF_ScriptMetrics metrics; - FT_UInt options = 0; + AF_StyleMetrics metrics; + FT_UInt options = AF_STYLE_NONE_DFLT; #ifdef FT_OPTION_AUTOFIT2 - /* XXX: undocumented hook to activate the latin2 hinter */ + /* XXX: undocumented hook to activate the latin2 writing system */ if ( load_flags & ( 1UL << 20 ) ) - options = 2; + options = AF_STYLE_LTN2_DFLT; #endif error = af_face_globals_get_metrics( loader->globals, gindex, options, &metrics ); if ( !error ) { +#ifdef FT_CONFIG_OPTION_PIC + AF_FaceGlobals globals = loader->globals; +#endif + AF_StyleClass style_class = metrics->style_class; + AF_WritingSystemClass writing_system_class = + AF_WRITING_SYSTEM_CLASSES_GET[style_class->writing_system]; + + loader->metrics = metrics; - if ( metrics->clazz->script_metrics_scale ) - metrics->clazz->script_metrics_scale( metrics, &scaler ); + if ( writing_system_class->style_metrics_scale ) + writing_system_class->style_metrics_scale( metrics, &scaler ); else metrics->scaler = scaler; load_flags |= FT_LOAD_NO_SCALE | FT_LOAD_IGNORE_TRANSFORM; load_flags &= ~FT_LOAD_RENDER; - if ( metrics->clazz->script_hints_init ) + if ( writing_system_class->style_hints_init ) { - error = metrics->clazz->script_hints_init( &loader->hints, - metrics ); + error = writing_system_class->style_hints_init( &loader->hints, + metrics ); if ( error ) goto Exit; } diff --git a/src/autofit/afloader.h b/src/autofit/afloader.h index eec0e92..9601e24 100644 --- a/src/autofit/afloader.h +++ b/src/autofit/afloader.h @@ -4,7 +4,7 @@ /* */ /* Auto-fitter glyph loading routines (specification). */ /* */ -/* Copyright 2003-2005, 2011-2012 by */ +/* Copyright 2003-2005, 2011-2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -25,13 +25,26 @@ FT_BEGIN_HEADER - typedef struct AF_LoaderRec_ + typedef struct AF_ModuleRec_* AF_Module; + + /* + * The autofitter module's (global) data structure to communicate with + * actual fonts. If necessary, `local' data like the current face, the + * current face's auto-hint data, or the current glyph's parameters + * relevant to auto-hinting are `swapped in'. Cf. functions like + * `af_loader_reset' and `af_loader_load_g'. + */ + + typedef struct AF_LoaderRec_ { - FT_Face face; /* current face */ - AF_FaceGlobals globals; /* current face globals */ - FT_GlyphLoader gloader; /* glyph loader */ + /* current face data */ + FT_Face face; + AF_FaceGlobals globals; + + /* current glyph data */ + FT_GlyphLoader gloader; AF_GlyphHintsRec hints; - AF_ScriptMetrics metrics; + AF_StyleMetrics metrics; FT_Bool transformed; FT_Matrix trans_matrix; FT_Vector trans_delta; @@ -43,21 +56,20 @@ FT_BEGIN_HEADER FT_LOCAL( FT_Error ) - af_loader_init( AF_Loader loader, - FT_Memory memory ); + af_loader_init( AF_Module module ); FT_LOCAL( FT_Error ) - af_loader_reset( AF_Loader loader, + af_loader_reset( AF_Module module, FT_Face face ); FT_LOCAL( void ) - af_loader_done( AF_Loader loader ); + af_loader_done( AF_Module module ); FT_LOCAL( FT_Error ) - af_loader_load_glyph( AF_Loader loader, + af_loader_load_glyph( AF_Module module, FT_Face face, FT_UInt gindex, FT_Int32 load_flags ); diff --git a/src/autofit/afmodule.c b/src/autofit/afmodule.c index 20b6218..641e03e 100644 --- a/src/autofit/afmodule.c +++ b/src/autofit/afmodule.c @@ -4,7 +4,7 @@ /* */ /* Auto-fitter module implementation (body). */ /* */ -/* Copyright 2003-2006, 2009, 2011 by */ +/* Copyright 2003-2006, 2009, 2011-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -16,8 +16,10 @@ /***************************************************************************/ +#include "afglobal.h" #include "afmodule.h" #include "afloader.h" +#include "aferrors.h" #include "afpic.h" #ifdef FT_DEBUG_AUTOFIT @@ -28,66 +30,280 @@ #endif #include FT_INTERNAL_OBJECTS_H +#include FT_INTERNAL_DEBUG_H +#include FT_AUTOHINTER_H +#include FT_SERVICE_PROPERTIES_H - typedef struct FT_AutofitterRec_ + /*************************************************************************/ + /* */ + /* The macro FT_COMPONENT is used in trace mode. It is an implicit */ + /* parameter of the FT_TRACE() and FT_ERROR() macros, used to print/log */ + /* messages during execution. */ + /* */ +#undef FT_COMPONENT +#define FT_COMPONENT trace_afmodule + + + static FT_Error + af_property_get_face_globals( FT_Face face, + AF_FaceGlobals* aglobals, + AF_Module module ) + { + FT_Error error = FT_Err_Ok; + AF_FaceGlobals globals; + + + if ( !face ) + return FT_THROW( Invalid_Face_Handle ); + + globals = (AF_FaceGlobals)face->autohint.data; + if ( !globals ) + { + /* trigger computation of the global style data */ + /* in case it hasn't been done yet */ + error = af_face_globals_new( face, &globals, module ); + if ( !error ) + { + face->autohint.data = + (FT_Pointer)globals; + face->autohint.finalizer = + (FT_Generic_Finalizer)af_face_globals_free; + } + } + + if ( !error ) + *aglobals = globals; + + return error; + } + + + static FT_Error + af_property_set( FT_Module ft_module, + const char* property_name, + const void* value ) + { + FT_Error error = FT_Err_Ok; + AF_Module module = (AF_Module)ft_module; + + + if ( !ft_strcmp( property_name, "fallback-script" ) ) + { + FT_UInt* fallback_script = (FT_UInt*)value; + + FT_UInt ss; + + + /* We translate the fallback script to a fallback style that uses */ + /* `fallback-script' as its script and `AF_COVERAGE_NONE' as its */ + /* coverage value. */ + for ( ss = 0; AF_STYLE_CLASSES_GET[ss]; ss++ ) + { + AF_StyleClass style_class = AF_STYLE_CLASSES_GET[ss]; + + + if ( (FT_UInt)style_class->script == *fallback_script && + style_class->coverage == AF_COVERAGE_DEFAULT ) + { + module->fallback_style = ss; + break; + } + } + + if ( !AF_STYLE_CLASSES_GET[ss] ) + { + FT_TRACE0(( "af_property_set: Invalid value %d for property `%s'\n", + fallback_script, property_name )); + return FT_THROW( Invalid_Argument ); + } + + return error; + } + else if ( !ft_strcmp( property_name, "default-script" ) ) + { + FT_UInt* default_script = (FT_UInt*)value; + + + module->default_script = *default_script; + + return error; + } + else if ( !ft_strcmp( property_name, "increase-x-height" ) ) + { + FT_Prop_IncreaseXHeight* prop = (FT_Prop_IncreaseXHeight*)value; + AF_FaceGlobals globals; + + + error = af_property_get_face_globals( prop->face, &globals, module ); + if ( !error ) + globals->increase_x_height = prop->limit; + + return error; + } + + FT_TRACE0(( "af_property_set: missing property `%s'\n", + property_name )); + return FT_THROW( Missing_Property ); + } + + + static FT_Error + af_property_get( FT_Module ft_module, + const char* property_name, + void* value ) + { + FT_Error error = FT_Err_Ok; + AF_Module module = (AF_Module)ft_module; + FT_UInt fallback_style = module->fallback_style; + FT_UInt default_script = module->default_script; + + + if ( !ft_strcmp( property_name, "glyph-to-script-map" ) ) + { + FT_Prop_GlyphToScriptMap* prop = (FT_Prop_GlyphToScriptMap*)value; + AF_FaceGlobals globals; + + + error = af_property_get_face_globals( prop->face, &globals, module ); + if ( !error ) + prop->map = globals->glyph_styles; + + return error; + } + else if ( !ft_strcmp( property_name, "fallback-script" ) ) + { + FT_UInt* val = (FT_UInt*)value; + + AF_StyleClass style_class = AF_STYLE_CLASSES_GET[fallback_style]; + + + *val = style_class->script; + + return error; + } + else if ( !ft_strcmp( property_name, "default-script" ) ) + { + FT_UInt* val = (FT_UInt*)value; + + + *val = default_script; + + return error; + } + else if ( !ft_strcmp( property_name, "increase-x-height" ) ) + { + FT_Prop_IncreaseXHeight* prop = (FT_Prop_IncreaseXHeight*)value; + AF_FaceGlobals globals; + + + error = af_property_get_face_globals( prop->face, &globals, module ); + if ( !error ) + prop->limit = globals->increase_x_height; + + return error; + } + + + FT_TRACE0(( "af_property_get: missing property `%s'\n", + property_name )); + return FT_THROW( Missing_Property ); + } + + + FT_DEFINE_SERVICE_PROPERTIESREC( + af_service_properties, + (FT_Properties_SetFunc)af_property_set, + (FT_Properties_GetFunc)af_property_get ) + + + FT_DEFINE_SERVICEDESCREC1( + af_services, + FT_SERVICE_ID_PROPERTIES, &AF_SERVICE_PROPERTIES_GET ) + + + FT_CALLBACK_DEF( FT_Module_Interface ) + af_get_interface( FT_Module module, + const char* module_interface ) { - FT_ModuleRec root; - AF_LoaderRec loader[1]; + /* AF_SERVICES_GET dereferences `library' in PIC mode */ +#ifdef FT_CONFIG_OPTION_PIC + FT_Library library; + + + if ( !module ) + return NULL; + library = module->library; + if ( !library ) + return NULL; +#else + FT_UNUSED( module ); +#endif - } FT_AutofitterRec, *FT_Autofitter; + return ft_service_list_lookup( AF_SERVICES_GET, module_interface ); + } FT_CALLBACK_DEF( FT_Error ) - af_autofitter_init( FT_Autofitter module ) + af_autofitter_init( FT_Module ft_module ) /* AF_Module */ { - return af_loader_init( module->loader, module->root.library->memory ); + AF_Module module = (AF_Module)ft_module; + + + module->fallback_style = AF_STYLE_FALLBACK; + module->default_script = AF_SCRIPT_DEFAULT; + + return af_loader_init( module ); } FT_CALLBACK_DEF( void ) - af_autofitter_done( FT_Autofitter module ) + af_autofitter_done( FT_Module ft_module ) /* AF_Module */ { - af_loader_done( module->loader ); + AF_Module module = (AF_Module)ft_module; + + + af_loader_done( module ); } FT_CALLBACK_DEF( FT_Error ) - af_autofitter_load_glyph( FT_Autofitter module, - FT_GlyphSlot slot, - FT_Size size, - FT_UInt glyph_index, - FT_Int32 load_flags ) + af_autofitter_load_glyph( AF_Module module, + FT_GlyphSlot slot, + FT_Size size, + FT_UInt glyph_index, + FT_Int32 load_flags ) { FT_UNUSED( size ); - return af_loader_load_glyph( module->loader, slot->face, + return af_loader_load_glyph( module, slot->face, glyph_index, load_flags ); } - FT_DEFINE_AUTOHINTER_SERVICE( - af_autofitter_service, - NULL, - NULL, - NULL, - (FT_AutoHinter_GlyphLoadFunc)af_autofitter_load_glyph ) + FT_DEFINE_AUTOHINTER_INTERFACE( + af_autofitter_interface, + NULL, /* reset_face */ + NULL, /* get_global_hints */ + NULL, /* done_global_hints */ + (FT_AutoHinter_GlyphLoadFunc)af_autofitter_load_glyph ) /* load_glyph */ + FT_DEFINE_MODULE( autofit_module_class, FT_MODULE_HINTER, - sizeof ( FT_AutofitterRec ), + sizeof ( AF_ModuleRec ), "autofitter", 0x10000L, /* version 1.0 of the autofitter */ 0x20000L, /* requires FreeType 2.0 or above */ - (const void*)&AF_AF_AUTOFITTER_SERVICE_GET, + (const void*)&AF_INTERFACE_GET, (FT_Module_Constructor)af_autofitter_init, (FT_Module_Destructor) af_autofitter_done, - (FT_Module_Requester) NULL ) + (FT_Module_Requester) af_get_interface ) /* END */ diff --git a/src/autofit/afmodule.h b/src/autofit/afmodule.h index d979239..20b7b9f 100644 --- a/src/autofit/afmodule.h +++ b/src/autofit/afmodule.h @@ -4,7 +4,7 @@ /* */ /* Auto-fitter module implementation (specification). */ /* */ -/* Copyright 2003, 2004, 2005 by */ +/* Copyright 2003-2005, 2009, 2012, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -23,9 +23,31 @@ #include FT_INTERNAL_OBJECTS_H #include FT_MODULE_H +#include "afloader.h" + FT_BEGIN_HEADER + + /* + * This is the `extended' FT_Module structure which holds the + * autofitter's global data. Right before hinting a glyph, the data + * specific to the glyph's face (blue zones, stem widths, etc.) are + * loaded into `loader' (see function `af_loader_reset'). + */ + + typedef struct AF_ModuleRec_ + { + FT_ModuleRec root; + + FT_UInt fallback_style; + FT_UInt default_script; + + AF_LoaderRec loader[1]; + + } AF_ModuleRec; + + FT_DECLARE_MODULE(autofit_module_class) diff --git a/src/autofit/afpic.c b/src/autofit/afpic.c index 87074af..cb29fd7 100644 --- a/src/autofit/afpic.c +++ b/src/autofit/afpic.c @@ -4,7 +4,7 @@ /* */ /* The FreeType position independent code services for autofit module. */ /* */ -/* Copyright 2009, 2010, 2011 by */ +/* Copyright 2009-2014 by */ /* Oran Agra and Mickey Gabel. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -20,23 +20,35 @@ #include FT_FREETYPE_H #include FT_INTERNAL_OBJECTS_H #include "afpic.h" +#include "afglobal.h" #include "aferrors.h" + #ifdef FT_CONFIG_OPTION_PIC /* forward declaration of PIC init functions from afmodule.c */ - void FT_Init_Class_af_autofitter_service( - FT_Library library, - FT_AutoHinter_ServiceRec* clazz ); - - /* forward declaration of PIC init functions from script classes */ -#include "aflatin.h" -#ifdef FT_OPTION_AUTOFIT2 -#include "aflatin2.h" -#endif -#include "afcjk.h" -#include "afdummy.h" -#include "afindic.h" + FT_Error + FT_Create_Class_af_services( FT_Library library, + FT_ServiceDescRec** output_class ); + + void + FT_Destroy_Class_af_services( FT_Library library, + FT_ServiceDescRec* clazz ); + + void + FT_Init_Class_af_service_properties( FT_Service_PropertiesRec* clazz ); + + void FT_Init_Class_af_autofitter_interface( + FT_Library library, + FT_AutoHinter_InterfaceRec* clazz ); + + + /* forward declaration of PIC init functions from writing system classes */ +#undef WRITING_SYSTEM +#define WRITING_SYSTEM( ws, WS ) /* empty */ + +#include "afwrtsys.h" + void autofit_module_class_pic_free( FT_Library library ) @@ -47,7 +59,15 @@ if ( pic_container->autofit ) { - FT_FREE( pic_container->autofit ); + AFModulePIC* container = (AFModulePIC*)pic_container->autofit; + + + if ( container->af_services ) + FT_Destroy_Class_af_services( library, + container->af_services ); + container->af_services = NULL; + + FT_FREE( container ); pic_container->autofit = NULL; } } @@ -58,8 +78,8 @@ { FT_PIC_Container* pic_container = &library->pic_container; FT_UInt ss; - FT_Error error = AF_Err_Ok; - AFModulePIC* container; + FT_Error error = FT_Err_Ok; + AFModulePIC* container = NULL; FT_Memory memory = library->memory; @@ -71,39 +91,61 @@ /* initialize pointer table - */ /* this is how the module usually expects this data */ - for ( ss = 0 ; ss < AF_SCRIPT_CLASSES_REC_COUNT ; ss++ ) - { + error = FT_Create_Class_af_services( library, + &container->af_services ); + if ( error ) + goto Exit; + + FT_Init_Class_af_service_properties( &container->af_service_properties ); + + for ( ss = 0; ss < AF_WRITING_SYSTEM_MAX; ss++ ) + container->af_writing_system_classes[ss] = + &container->af_writing_system_classes_rec[ss]; + container->af_writing_system_classes[AF_WRITING_SYSTEM_MAX] = NULL; + + for ( ss = 0; ss < AF_SCRIPT_MAX; ss++ ) container->af_script_classes[ss] = &container->af_script_classes_rec[ss]; - } - container->af_script_classes[AF_SCRIPT_CLASSES_COUNT - 1] = NULL; + container->af_script_classes[AF_SCRIPT_MAX] = NULL; + + for ( ss = 0; ss < AF_STYLE_MAX; ss++ ) + container->af_style_classes[ss] = + &container->af_style_classes_rec[ss]; + container->af_style_classes[AF_STYLE_MAX] = NULL; + +#undef WRITING_SYSTEM +#define WRITING_SYSTEM( ws, WS ) \ + FT_Init_Class_af_ ## ws ## _writing_system_class( \ + &container->af_writing_system_classes_rec[ss++] ); - /* add call to initialization function when you add new scripts */ ss = 0; - FT_Init_Class_af_dummy_script_class( - &container->af_script_classes_rec[ss++] ); -#ifdef FT_OPTION_AUTOFIT2 - FT_Init_Class_af_latin2_script_class( - &container->af_script_classes_rec[ss++] ); -#endif - FT_Init_Class_af_latin_script_class( - &container->af_script_classes_rec[ss++] ); - FT_Init_Class_af_cjk_script_class( - &container->af_script_classes_rec[ss++] ); - FT_Init_Class_af_indic_script_class( - &container->af_script_classes_rec[ss++] ); - - FT_Init_Class_af_autofitter_service( - library, &container->af_autofitter_service ); - -/* Exit: */ +#include "afwrtsys.h" + +#undef SCRIPT +#define SCRIPT( s, S, d, h, sc1, sc2, sc3 ) \ + FT_Init_Class_af_ ## s ## _script_class( \ + &container->af_script_classes_rec[ss++] ); + ss = 0; +#include "afscript.h" + +#undef STYLE +#define STYLE( s, S, d, ws, sc, bss, c ) \ + FT_Init_Class_af_ ## s ## _style_class( \ + &container->af_style_classes_rec[ss++] ); + + ss = 0; +#include "afstyles.h" + + FT_Init_Class_af_autofitter_interface( + library, &container->af_autofitter_interface ); + + Exit: if ( error ) autofit_module_class_pic_free( library ); return error; } - #endif /* FT_CONFIG_OPTION_PIC */ diff --git a/src/autofit/afpic.h b/src/autofit/afpic.h index 21b0ff9..9a68b4a 100644 --- a/src/autofit/afpic.h +++ b/src/autofit/afpic.h @@ -4,7 +4,7 @@ /* */ /* The FreeType position independent code services for autofit module. */ /* */ -/* Copyright 2009, 2011 by */ +/* Copyright 2009, 2011-2013 by */ /* Oran Agra and Mickey Gabel. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -24,38 +24,67 @@ FT_BEGIN_HEADER #include FT_INTERNAL_PIC_H + #ifndef FT_CONFIG_OPTION_PIC -#define AF_SCRIPT_CLASSES_GET af_script_classes -#define AF_AF_AUTOFITTER_SERVICE_GET af_autofitter_service +#define AF_SERVICES_GET af_services +#define AF_SERVICE_PROPERTIES_GET af_service_properties + +#define AF_WRITING_SYSTEM_CLASSES_GET af_writing_system_classes +#define AF_SCRIPT_CLASSES_GET af_script_classes +#define AF_STYLE_CLASSES_GET af_style_classes +#define AF_INTERFACE_GET af_autofitter_interface #else /* FT_CONFIG_OPTION_PIC */ + /* some include files required for members of AFModulePIC */ +#include FT_SERVICE_PROPERTIES_H + #include "aftypes.h" - /* increase these when you add new scripts, */ - /* and update autofit_module_class_pic_init */ -#ifdef FT_OPTION_AUTOFIT2 -#define AF_SCRIPT_CLASSES_COUNT 6 -#else -#define AF_SCRIPT_CLASSES_COUNT 5 -#endif -#define AF_SCRIPT_CLASSES_REC_COUNT ( AF_SCRIPT_CLASSES_COUNT - 1 ) - typedef struct AFModulePIC_ + typedef struct AFModulePIC_ { - AF_ScriptClass af_script_classes[AF_SCRIPT_CLASSES_COUNT]; - AF_ScriptClassRec af_script_classes_rec[AF_SCRIPT_CLASSES_REC_COUNT]; - FT_AutoHinter_ServiceRec af_autofitter_service; + FT_ServiceDescRec* af_services; + FT_Service_PropertiesRec af_service_properties; + + AF_WritingSystemClass af_writing_system_classes + [AF_WRITING_SYSTEM_MAX + 1]; + AF_WritingSystemClassRec af_writing_system_classes_rec + [AF_WRITING_SYSTEM_MAX]; + + AF_ScriptClass af_script_classes + [AF_SCRIPT_MAX + 1]; + AF_ScriptClassRec af_script_classes_rec + [AF_SCRIPT_MAX]; + + AF_StyleClass af_style_classes + [AF_STYLE_MAX + 1]; + AF_StyleClassRec af_style_classes_rec + [AF_STYLE_MAX]; + + FT_AutoHinter_InterfaceRec af_autofitter_interface; } AFModulePIC; -#define GET_PIC( lib ) \ + +#define GET_PIC( lib ) \ ( (AFModulePIC*)((lib)->pic_container.autofit) ) -#define AF_SCRIPT_CLASSES_GET \ - ( GET_PIC( FT_FACE_LIBRARY(globals->face) )->af_script_classes ) -#define AF_AF_AUTOFITTER_SERVICE_GET \ - ( GET_PIC( library )->af_autofitter_service ) + +#define AF_SERVICES_GET \ + ( GET_PIC( library )->af_services ) +#define AF_SERVICE_PROPERTIES_GET \ + ( GET_PIC( library )->af_service_properties ) + +#define AF_WRITING_SYSTEM_CLASSES_GET \ + ( GET_PIC( FT_FACE_LIBRARY( globals->face ) )->af_writing_system_classes ) +#define AF_SCRIPT_CLASSES_GET \ + ( GET_PIC( FT_FACE_LIBRARY( globals->face ) )->af_script_classes ) +#define AF_STYLE_CLASSES_GET \ + ( GET_PIC( FT_FACE_LIBRARY( globals->face ) )->af_style_classes ) +#define AF_INTERFACE_GET \ + ( GET_PIC( library )->af_autofitter_interface ) + /* see afpic.c for the implementation */ void diff --git a/src/autofit/afranges.c b/src/autofit/afranges.c new file mode 100644 index 0000000..b2c504d --- /dev/null +++ b/src/autofit/afranges.c @@ -0,0 +1,220 @@ +/***************************************************************************/ +/* */ +/* afranges.c */ +/* */ +/* Auto-fitter Unicode script ranges (body). */ +/* */ +/* Copyright 2013, 2014 by */ +/* David Turner, Robert Wilhelm, and Werner Lemberg. */ +/* */ +/* This file is part of the FreeType project, and may only be used, */ +/* modified, and distributed under the terms of the FreeType project */ +/* license, LICENSE.TXT. By continuing to use, modify, or distribute */ +/* this file you indicate that you have read the license and */ +/* understand and accept it fully. */ +/* */ +/***************************************************************************/ + + +#include "afranges.h" + + + const AF_Script_UniRangeRec af_cyrl_uniranges[] = + { + AF_UNIRANGE_REC( 0x0400UL, 0x04FFUL ), /* Cyrillic */ + AF_UNIRANGE_REC( 0x0500UL, 0x052FUL ), /* Cyrillic Supplement */ + AF_UNIRANGE_REC( 0x2DE0UL, 0x2DFFUL ), /* Cyrillic Extended-A */ + AF_UNIRANGE_REC( 0xA640UL, 0xA69FUL ), /* Cyrillic Extended-B */ + AF_UNIRANGE_REC( 0UL, 0UL ) + }; + + /* there are some characters in the Devanagari Unicode block that are */ + /* generic to Indic scripts; we omit them so that their presence doesn't */ + /* trigger Devanagari */ + + const AF_Script_UniRangeRec af_deva_uniranges[] = + { + AF_UNIRANGE_REC( 0x0900UL, 0x093BUL ), /* Devanagari */ + /* omitting U+093C nukta */ + AF_UNIRANGE_REC( 0x093DUL, 0x0950UL ), + /* omitting U+0951 udatta, U+0952 anudatta */ + AF_UNIRANGE_REC( 0x0953UL, 0x0963UL ), + /* omitting U+0964 danda, U+0965 double danda */ + AF_UNIRANGE_REC( 0x0966UL, 0x097FUL ), + AF_UNIRANGE_REC( 0x20B9UL, 0x20B9UL ), /* (new) Rupee sign */ + AF_UNIRANGE_REC( 0UL, 0UL ) + }; + + const AF_Script_UniRangeRec af_grek_uniranges[] = + { + AF_UNIRANGE_REC( 0x0370UL, 0x03FFUL ), /* Greek and Coptic */ + AF_UNIRANGE_REC( 0x1F00UL, 0x1FFFUL ), /* Greek Extended */ + AF_UNIRANGE_REC( 0UL, 0UL ) + }; + + const AF_Script_UniRangeRec af_hebr_uniranges[] = + { + AF_UNIRANGE_REC( 0x0590UL, 0x05FFUL ), /* Hebrew */ + AF_UNIRANGE_REC( 0xFB1DUL, 0xFB4FUL ), /* Alphab. Present. Forms (Hebrew) */ + AF_UNIRANGE_REC( 0UL, 0UL ) + }; + + const AF_Script_UniRangeRec af_latn_uniranges[] = + { + AF_UNIRANGE_REC( 0x0020UL, 0x007FUL ), /* Basic Latin (no control chars) */ + AF_UNIRANGE_REC( 0x00A0UL, 0x00FFUL ), /* Latin-1 Supplement (no control chars) */ + AF_UNIRANGE_REC( 0x0100UL, 0x017FUL ), /* Latin Extended-A */ + AF_UNIRANGE_REC( 0x0180UL, 0x024FUL ), /* Latin Extended-B */ + AF_UNIRANGE_REC( 0x0250UL, 0x02AFUL ), /* IPA Extensions */ + AF_UNIRANGE_REC( 0x02B0UL, 0x02FFUL ), /* Spacing Modifier Letters */ + AF_UNIRANGE_REC( 0x0300UL, 0x036FUL ), /* Combining Diacritical Marks */ + AF_UNIRANGE_REC( 0x1D00UL, 0x1D7FUL ), /* Phonetic Extensions */ + AF_UNIRANGE_REC( 0x1D80UL, 0x1DBFUL ), /* Phonetic Extensions Supplement */ + AF_UNIRANGE_REC( 0x1DC0UL, 0x1DFFUL ), /* Combining Diacritical Marks Supplement */ + AF_UNIRANGE_REC( 0x1E00UL, 0x1EFFUL ), /* Latin Extended Additional */ + AF_UNIRANGE_REC( 0x2000UL, 0x206FUL ), /* General Punctuation */ + AF_UNIRANGE_REC( 0x2070UL, 0x209FUL ), /* Superscripts and Subscripts */ + AF_UNIRANGE_REC( 0x20A0UL, 0x20B8UL ), /* Currency Symbols ... */ + AF_UNIRANGE_REC( 0x20BAUL, 0x20CFUL ), /* ... except new Rupee sign */ + AF_UNIRANGE_REC( 0x2150UL, 0x218FUL ), /* Number Forms */ + AF_UNIRANGE_REC( 0x2460UL, 0x24FFUL ), /* Enclosed Alphanumerics */ + AF_UNIRANGE_REC( 0x2C60UL, 0x2C7FUL ), /* Latin Extended-C */ + AF_UNIRANGE_REC( 0x2E00UL, 0x2E7FUL ), /* Supplemental Punctuation */ + AF_UNIRANGE_REC( 0xA720UL, 0xA7FFUL ), /* Latin Extended-D */ + AF_UNIRANGE_REC( 0xFB00UL, 0xFB06UL ), /* Alphab. Present. Forms (Latin Ligs) */ + AF_UNIRANGE_REC( 0x1D400UL, 0x1D7FFUL ), /* Mathematical Alphanumeric Symbols */ + AF_UNIRANGE_REC( 0x1F100UL, 0x1F1FFUL ), /* Enclosed Alphanumeric Supplement */ + AF_UNIRANGE_REC( 0UL, 0UL ) + }; + + const AF_Script_UniRangeRec af_none_uniranges[] = + { + AF_UNIRANGE_REC( 0UL, 0UL ) + }; + + const AF_Script_UniRangeRec af_telu_uniranges[] = + { + AF_UNIRANGE_REC( 0x0C00UL, 0x0C7FUL ), /* Telugu */ + AF_UNIRANGE_REC( 0UL, 0UL ) + }; + +#ifdef AF_CONFIG_OPTION_INDIC + + const AF_Script_UniRangeRec af_beng_uniranges[] = + { + AF_UNIRANGE_REC( 0x0980UL, 0x09FFUL ), /* Bengali */ + AF_UNIRANGE_REC( 0UL, 0UL ) + }; + + const AF_Script_UniRangeRec af_gujr_uniranges[] = + { + AF_UNIRANGE_REC( 0x0A80UL, 0x0AFFUL ), /* Gujarati */ + AF_UNIRANGE_REC( 0UL, 0UL ) + }; + + const AF_Script_UniRangeRec af_guru_uniranges[] = + { + AF_UNIRANGE_REC( 0x0A00UL, 0x0A7FUL ), /* Gurmukhi */ + AF_UNIRANGE_REC( 0UL, 0UL ) + }; + + const AF_Script_UniRangeRec af_knda_uniranges[] = + { + AF_UNIRANGE_REC( 0x0C80UL, 0x0CFFUL ), /* Kannada */ + AF_UNIRANGE_REC( 0UL, 0UL ) + }; + + const AF_Script_UniRangeRec af_limb_uniranges[] = + { + AF_UNIRANGE_REC( 0x1900UL, 0x194FUL ), /* Limbu */ + AF_UNIRANGE_REC( 0UL, 0UL ) + }; + + const AF_Script_UniRangeRec af_mlym_uniranges[] = + { + AF_UNIRANGE_REC( 0x0D00UL, 0x0D7FUL ), /* Malayalam */ + AF_UNIRANGE_REC( 0UL, 0UL ) + }; + + const AF_Script_UniRangeRec af_orya_uniranges[] = + { + AF_UNIRANGE_REC( 0x0B00UL, 0x0B7FUL ), /* Oriya */ + AF_UNIRANGE_REC( 0UL, 0UL ) + }; + + const AF_Script_UniRangeRec af_sinh_uniranges[] = + { + AF_UNIRANGE_REC( 0x0D80UL, 0x0DFFUL ), /* Sinhala */ + AF_UNIRANGE_REC( 0UL, 0UL ) + }; + + const AF_Script_UniRangeRec af_sund_uniranges[] = + { + AF_UNIRANGE_REC( 0x1B80UL, 0x1BBFUL ), /* Sundanese */ + AF_UNIRANGE_REC( 0UL, 0UL ) + }; + + const AF_Script_UniRangeRec af_sylo_uniranges[] = + { + AF_UNIRANGE_REC( 0xA800UL, 0xA82FUL ), /* Syloti Nagri */ + AF_UNIRANGE_REC( 0UL, 0UL ) + }; + + const AF_Script_UniRangeRec af_taml_uniranges[] = + { + AF_UNIRANGE_REC( 0x0B80UL, 0x0BFFUL ), /* Tamil */ + AF_UNIRANGE_REC( 0UL, 0UL ) + }; + + const AF_Script_UniRangeRec af_tibt_uniranges[] = + { + AF_UNIRANGE_REC( 0x0F00UL, 0x0FFFUL ), /* Tibetan */ + AF_UNIRANGE_REC( 0UL, 0UL ) + }; + +#endif /* !AF_CONFIG_OPTION_INDIC */ + +#ifdef AF_CONFIG_OPTION_CJK + + /* this corresponds to Unicode 6.0 */ + + const AF_Script_UniRangeRec af_hani_uniranges[] = + { + AF_UNIRANGE_REC( 0x1100UL, 0x11FFUL ), /* Hangul Jamo */ + AF_UNIRANGE_REC( 0x2E80UL, 0x2EFFUL ), /* CJK Radicals Supplement */ + AF_UNIRANGE_REC( 0x2F00UL, 0x2FDFUL ), /* Kangxi Radicals */ + AF_UNIRANGE_REC( 0x2FF0UL, 0x2FFFUL ), /* Ideographic Description Characters */ + AF_UNIRANGE_REC( 0x3000UL, 0x303FUL ), /* CJK Symbols and Punctuation */ + AF_UNIRANGE_REC( 0x3040UL, 0x309FUL ), /* Hiragana */ + AF_UNIRANGE_REC( 0x30A0UL, 0x30FFUL ), /* Katakana */ + AF_UNIRANGE_REC( 0x3100UL, 0x312FUL ), /* Bopomofo */ + AF_UNIRANGE_REC( 0x3130UL, 0x318FUL ), /* Hangul Compatibility Jamo */ + AF_UNIRANGE_REC( 0x3190UL, 0x319FUL ), /* Kanbun */ + AF_UNIRANGE_REC( 0x31A0UL, 0x31BFUL ), /* Bopomofo Extended */ + AF_UNIRANGE_REC( 0x31C0UL, 0x31EFUL ), /* CJK Strokes */ + AF_UNIRANGE_REC( 0x31F0UL, 0x31FFUL ), /* Katakana Phonetic Extensions */ + AF_UNIRANGE_REC( 0x3200UL, 0x32FFUL ), /* Enclosed CJK Letters and Months */ + AF_UNIRANGE_REC( 0x3300UL, 0x33FFUL ), /* CJK Compatibility */ + AF_UNIRANGE_REC( 0x3400UL, 0x4DBFUL ), /* CJK Unified Ideographs Extension A */ + AF_UNIRANGE_REC( 0x4DC0UL, 0x4DFFUL ), /* Yijing Hexagram Symbols */ + AF_UNIRANGE_REC( 0x4E00UL, 0x9FFFUL ), /* CJK Unified Ideographs */ + AF_UNIRANGE_REC( 0xA960UL, 0xA97FUL ), /* Hangul Jamo Extended-A */ + AF_UNIRANGE_REC( 0xAC00UL, 0xD7AFUL ), /* Hangul Syllables */ + AF_UNIRANGE_REC( 0xD7B0UL, 0xD7FFUL ), /* Hangul Jamo Extended-B */ + AF_UNIRANGE_REC( 0xF900UL, 0xFAFFUL ), /* CJK Compatibility Ideographs */ + AF_UNIRANGE_REC( 0xFE10UL, 0xFE1FUL ), /* Vertical forms */ + AF_UNIRANGE_REC( 0xFE30UL, 0xFE4FUL ), /* CJK Compatibility Forms */ + AF_UNIRANGE_REC( 0xFF00UL, 0xFFEFUL ), /* Halfwidth and Fullwidth Forms */ + AF_UNIRANGE_REC( 0x1B000UL, 0x1B0FFUL ), /* Kana Supplement */ + AF_UNIRANGE_REC( 0x1D300UL, 0x1D35FUL ), /* Tai Xuan Hing Symbols */ + AF_UNIRANGE_REC( 0x1F200UL, 0x1F2FFUL ), /* Enclosed Ideographic Supplement */ + AF_UNIRANGE_REC( 0x20000UL, 0x2A6DFUL ), /* CJK Unified Ideographs Extension B */ + AF_UNIRANGE_REC( 0x2A700UL, 0x2B73FUL ), /* CJK Unified Ideographs Extension C */ + AF_UNIRANGE_REC( 0x2B740UL, 0x2B81FUL ), /* CJK Unified Ideographs Extension D */ + AF_UNIRANGE_REC( 0x2F800UL, 0x2FA1FUL ), /* CJK Compatibility Ideographs Supplement */ + AF_UNIRANGE_REC( 0UL, 0UL ) + }; + +#endif /* !AF_CONFIG_OPTION_CJK */ + +/* END */ diff --git a/src/autofit/afranges.h b/src/autofit/afranges.h new file mode 100644 index 0000000..fe5b2aa --- /dev/null +++ b/src/autofit/afranges.h @@ -0,0 +1,41 @@ +/***************************************************************************/ +/* */ +/* afranges.h */ +/* */ +/* Auto-fitter Unicode script ranges (specification). */ +/* */ +/* Copyright 2013, 2014 by */ +/* David Turner, Robert Wilhelm, and Werner Lemberg. */ +/* */ +/* This file is part of the FreeType project, and may only be used, */ +/* modified, and distributed under the terms of the FreeType project */ +/* license, LICENSE.TXT. By continuing to use, modify, or distribute */ +/* this file you indicate that you have read the license and */ +/* understand and accept it fully. */ +/* */ +/***************************************************************************/ + + +#ifndef __AFRANGES_H__ +#define __AFRANGES_H__ + + +#include "aftypes.h" + + +FT_BEGIN_HEADER + +#undef SCRIPT +#define SCRIPT( s, S, d, h, sc1, sc2, sc3 ) \ + extern const AF_Script_UniRangeRec af_ ## s ## _uniranges[]; + +#include "afscript.h" + + /* */ + +FT_END_HEADER + +#endif /* __AFRANGES_H__ */ + + +/* END */ diff --git a/src/autofit/afscript.h b/src/autofit/afscript.h new file mode 100644 index 0000000..efe8754 --- /dev/null +++ b/src/autofit/afscript.h @@ -0,0 +1,139 @@ +/***************************************************************************/ +/* */ +/* afscript.h */ +/* */ +/* Auto-fitter scripts (specification only). */ +/* */ +/* Copyright 2013, 2014 by */ +/* David Turner, Robert Wilhelm, and Werner Lemberg. */ +/* */ +/* This file is part of the FreeType project, and may only be used, */ +/* modified, and distributed under the terms of the FreeType project */ +/* license, LICENSE.TXT. By continuing to use, modify, or distribute */ +/* this file you indicate that you have read the license and */ +/* understand and accept it fully. */ +/* */ +/***************************************************************************/ + + + /* The following part can be included multiple times. */ + /* Define `SCRIPT' as needed. */ + + + /* Add new scripts here. The first and second arguments are the */ + /* script name in lowercase and uppercase, respectively, followed */ + /* by a description string. Then comes the corresponding HarfBuzz */ + /* script name tag, followed by a string of standard characters (to */ + /* derive the standard width and height of stems). */ + + SCRIPT( cyrl, CYRL, + "Cyrillic", + HB_SCRIPT_CYRILLIC, + 0x43E, 0x41E, 0x0 ) /* оО */ + + SCRIPT( deva, DEVA, + "Devanagari", + HB_SCRIPT_DEVANAGARI, + 0x920, 0x935, 0x91F ) /* ठ व ट */ + + SCRIPT( grek, GREK, + "Greek", + HB_SCRIPT_GREEK, + 0x3BF, 0x39F, 0x0 ) /* οΟ */ + + SCRIPT( hebr, HEBR, + "Hebrew", + HB_SCRIPT_HEBREW, + 0x5DD, 0x0, 0x0 ) /* ם */ + + SCRIPT( latn, LATN, + "Latin", + HB_SCRIPT_LATIN, + 'o', 'O', '0' ) + + SCRIPT( none, NONE, + "no script", + HB_SCRIPT_INVALID, + 0x0, 0x0, 0x0 ) + + /* there are no simple forms for letters; we thus use two digit shapes */ + SCRIPT( telu, TELU, + "Telugu", + HB_SCRIPT_TELUGU, + 0xC66, 0xC67, 0x0 ) /* ౦ ౧ */ + +#ifdef AF_CONFIG_OPTION_INDIC + + SCRIPT( beng, BENG, + "Bengali", + HB_SCRIPT_BENGALI, + 'o', 0x0, 0x0 ) /* XXX */ + + SCRIPT( gujr, GUJR, + "Gujarati", + HB_SCRIPT_GUJARATI, + 'o', 0x0, 0x0 ) /* XXX */ + + SCRIPT( guru, GURU, + "Gurmukhi", + HB_SCRIPT_GURMUKHI, + 'o', 0x0, 0x0 ) /* XXX */ + + SCRIPT( knda, KNDA, + "Kannada", + HB_SCRIPT_KANNADA, + 'o', 0x0, 0x0 ) /* XXX */ + + SCRIPT( limb, LIMB, + "Limbu", + HB_SCRIPT_LIMBU, + 'o', 0x0, 0x0 ) /* XXX */ + + SCRIPT( mlym, MLYM, + "Malayalam", + HB_SCRIPT_MALAYALAM, + 'o', 0x0, 0x0 ) /* XXX */ + + SCRIPT( orya, ORYA, + "Oriya", + HB_SCRIPT_ORIYA, + 'o', 0x0, 0x0 ) /* XXX */ + + SCRIPT( sinh, SINH, + "Sinhala", + HB_SCRIPT_SINHALA, + 'o', 0x0, 0x0 ) /* XXX */ + + SCRIPT( sund, SUND, + "Sundanese", + HB_SCRIPT_SUNDANESE, + 'o', 0x0, 0x0 ) /* XXX */ + + SCRIPT( sylo, SYLO, + "Syloti Nagri", + HB_SCRIPT_SYLOTI_NAGRI, + 'o', 0x0, 0x0 ) /* XXX */ + + SCRIPT( taml, TAML, + "Tamil", + HB_SCRIPT_TAMIL, + 'o', 0x0, 0x0 ) /* XXX */ + + SCRIPT( tibt, TIBT, + "Tibetan", + HB_SCRIPT_TIBETAN, + 'o', 0x0, 0x0 ) /* XXX */ + +#endif /* AF_CONFIG_OPTION_INDIC */ + +#ifdef AF_CONFIG_OPTION_CJK + + SCRIPT( hani, HANI, + "CJKV ideographs", + HB_SCRIPT_HAN, + 0x7530, 0x56D7, 0x0 ) /* 田囗 */ + +#endif /* AF_CONFIG_OPTION_CJK */ + + +/* END */ diff --git a/src/autofit/afstyles.h b/src/autofit/afstyles.h new file mode 100644 index 0000000..f14d354 --- /dev/null +++ b/src/autofit/afstyles.h @@ -0,0 +1,164 @@ +/***************************************************************************/ +/* */ +/* afstyles.h */ +/* */ +/* Auto-fitter styles (specification only). */ +/* */ +/* Copyright 2013, 2014 by */ +/* David Turner, Robert Wilhelm, and Werner Lemberg. */ +/* */ +/* This file is part of the FreeType project, and may only be used, */ +/* modified, and distributed under the terms of the FreeType project */ +/* license, LICENSE.TXT. By continuing to use, modify, or distribute */ +/* this file you indicate that you have read the license and */ +/* understand and accept it fully. */ +/* */ +/***************************************************************************/ + + + /* The following part can be included multiple times. */ + /* Define `STYLE' as needed. */ + + + /* Add new styles here. The first and second arguments are the */ + /* style name in lowercase and uppercase, respectively, followed */ + /* by a description string. The next arguments are the */ + /* corresponding writing system, script, blue stringset, and */ + /* coverage. */ + /* */ + /* Note that styles using `AF_COVERAGE_DEFAULT' should always */ + /* come after styles with other coverages. */ + /* */ + /* Example: */ + /* */ + /* STYLE( cyrl_dflt, CYRL_DFLT, */ + /* "Cyrillic default style", */ + /* AF_WRITING_SYSTEM_LATIN, */ + /* AF_SCRIPT_CYRL, */ + /* AF_BLUE_STRINGSET_CYRL, */ + /* AF_COVERAGE_DEFAULT ) */ + +#undef STYLE_LATIN +#define STYLE_LATIN( s, S, f, F, ds, df, C ) \ + STYLE( s ## _ ## f, S ## _ ## F, \ + ds " " df " style", \ + AF_WRITING_SYSTEM_LATIN, \ + AF_SCRIPT_ ## S, \ + AF_BLUE_STRINGSET_ ## S, \ + AF_COVERAGE_ ## C ) + +#undef META_STYLE_LATIN +#define META_STYLE_LATIN( s, S, ds ) \ + STYLE_LATIN( s, S, c2cp, C2CP, ds, \ + "petite capticals from capitals", \ + PETITE_CAPITALS_FROM_CAPITALS ) \ + STYLE_LATIN( s, S, c2sc, C2SC, ds, \ + "small capticals from capitals", \ + SMALL_CAPITALS_FROM_CAPITALS ) \ + STYLE_LATIN( s, S, ordn, ORDN, ds, \ + "ordinals", \ + ORDINALS ) \ + STYLE_LATIN( s, S, pcap, PCAP, ds, \ + "petite capitals", \ + PETITE_CAPITALS ) \ + STYLE_LATIN( s, S, sinf, SINF, ds, \ + "scientific inferiors", \ + SCIENTIFIC_INFERIORS ) \ + STYLE_LATIN( s, S, smcp, SMCP, ds, \ + "small capitals", \ + SMALL_CAPITALS ) \ + STYLE_LATIN( s, S, subs, SUBS, ds, \ + "subscript", \ + SUBSCRIPT ) \ + STYLE_LATIN( s, S, sups, SUPS, ds, \ + "superscript", \ + SUPERSCRIPT ) \ + STYLE_LATIN( s, S, titl, TITL, ds, \ + "titling", \ + TITLING ) \ + STYLE_LATIN( s, S, dflt, DFLT, ds, \ + "default", \ + DEFAULT ) + + META_STYLE_LATIN( cyrl, CYRL, "Cyrillic" ) + + META_STYLE_LATIN( grek, GREK, "Greek" ) + + STYLE( hebr_dflt, HEBR_DFLT, + "Hebrew default style", + AF_WRITING_SYSTEM_LATIN, + AF_SCRIPT_HEBR, + AF_BLUE_STRINGSET_HEBR, + AF_COVERAGE_DEFAULT ) + META_STYLE_LATIN( latn, LATN, "Latin" ) + + STYLE( deva_dflt, DEVA_DFLT, + "Devanagari default style", + AF_WRITING_SYSTEM_LATIN, + AF_SCRIPT_DEVA, + AF_BLUE_STRINGSET_DEVA, + AF_COVERAGE_DEFAULT ) + +#ifdef FT_OPTION_AUTOFIT2 + STYLE( ltn2_dflt, LTN2_DFLT, + "Latin 2 default style", + AF_WRITING_SYSTEM_LATIN2, + AF_SCRIPT_LATN, + AF_BLUE_STRINGSET_LATN, + AF_COVERAGE_DEFAULT ) +#endif + + STYLE( none_dflt, NONE_DFLT, + "no style", + AF_WRITING_SYSTEM_DUMMY, + AF_SCRIPT_NONE, + (AF_Blue_Stringset)0, + AF_COVERAGE_DEFAULT ) + + STYLE( telu_dflt, TELU_DFLT, + "Telugu default style", + AF_WRITING_SYSTEM_LATIN, + AF_SCRIPT_TELU, + AF_BLUE_STRINGSET_TELU, + AF_COVERAGE_DEFAULT ) + +#ifdef AF_CONFIG_OPTION_INDIC + + /* no blue stringset support for the Indic writing system yet */ +#undef STYLE_DEFAULT_INDIC +#define STYLE_DEFAULT_INDIC( s, S, d ) \ + STYLE( s ## _dflt, S ## _DFLT, \ + d " default style", \ + AF_WRITING_SYSTEM_INDIC, \ + AF_SCRIPT_ ## S, \ + (AF_Blue_Stringset)0, \ + AF_COVERAGE_DEFAULT ) + + STYLE_DEFAULT_INDIC( beng, BENG, "Bengali" ) + STYLE_DEFAULT_INDIC( gujr, GUJR, "Gujarati" ) + STYLE_DEFAULT_INDIC( guru, GURU, "Gurmukhi" ) + STYLE_DEFAULT_INDIC( knda, KNDA, "Kannada" ) + STYLE_DEFAULT_INDIC( limb, LIMB, "Limbu" ) + STYLE_DEFAULT_INDIC( mlym, MLYM, "Malayalam" ) + STYLE_DEFAULT_INDIC( orya, ORYA, "Oriya" ) + STYLE_DEFAULT_INDIC( sinh, SINH, "Sinhala" ) + STYLE_DEFAULT_INDIC( sund, SUND, "Sundanese" ) + STYLE_DEFAULT_INDIC( sylo, SYLO, "Syloti Nagri" ) + STYLE_DEFAULT_INDIC( taml, TAML, "Tamil" ) + STYLE_DEFAULT_INDIC( tibt, TIBT, "Tibetan" ) + +#endif /* AF_CONFIG_OPTION_INDIC */ + +#ifdef AF_CONFIG_OPTION_CJK + + STYLE( hani_dflt, HANI_DFLT, + "CJKV ideographs default style", + AF_WRITING_SYSTEM_CJK, + AF_SCRIPT_HANI, + AF_BLUE_STRINGSET_HANI, + AF_COVERAGE_DEFAULT ) + +#endif /* AF_CONFIG_OPTION_CJK */ + + +/* END */ diff --git a/src/autofit/aftypes.h b/src/autofit/aftypes.h index 21e442c..61badd1 100644 --- a/src/autofit/aftypes.h +++ b/src/autofit/aftypes.h @@ -4,7 +4,7 @@ /* */ /* Auto-fitter types (specification only). */ /* */ -/* Copyright 2003-2009, 2011 by */ +/* Copyright 2003-2009, 2011-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -20,15 +20,12 @@ * * The auto-fitter is a complete rewrite of the old auto-hinter. * Its main feature is the ability to differentiate between different - * scripts in order to apply language-specific rules. + * writing systems and scripts in order to apply specific rules. * * The code has also been compartmentized into several entities that * should make algorithmic experimentation easier than with the old * code. * - * Finally, we get rid of the Catharon license, since this code is - * released under the FreeType one. - * *************************************************************************/ @@ -42,6 +39,8 @@ #include FT_INTERNAL_OBJECTS_H #include FT_INTERNAL_DEBUG_H +#include "afblue.h" + FT_BEGIN_HEADER @@ -87,8 +86,9 @@ extern void* _af_debug_hints; FT_Pos* table ); FT_LOCAL( void ) - af_sort_widths( FT_UInt count, - AF_Width widths ); + af_sort_and_quantize_widths( FT_UInt* count, + AF_Width widths, + FT_Pos threshold ); /*************************************************************************/ @@ -197,87 +197,124 @@ extern void* _af_debug_hints; (a)->y_delta == (b)->y_delta ) + typedef struct AF_StyleMetricsRec_* AF_StyleMetrics; + + /* This function parses an FT_Face to compute global metrics for + * a specific style. + */ + typedef FT_Error + (*AF_WritingSystem_InitMetricsFunc)( AF_StyleMetrics metrics, + FT_Face face ); + + typedef void + (*AF_WritingSystem_ScaleMetricsFunc)( AF_StyleMetrics metrics, + AF_Scaler scaler ); + + typedef void + (*AF_WritingSystem_DoneMetricsFunc)( AF_StyleMetrics metrics ); + + + typedef FT_Error + (*AF_WritingSystem_InitHintsFunc)( AF_GlyphHints hints, + AF_StyleMetrics metrics ); + + typedef void + (*AF_WritingSystem_ApplyHintsFunc)( AF_GlyphHints hints, + FT_Outline* outline, + AF_StyleMetrics metrics ); + + /*************************************************************************/ /*************************************************************************/ /***** *****/ - /***** S C R I P T S *****/ + /***** W R I T I N G S Y S T E M S *****/ /***** *****/ /*************************************************************************/ /*************************************************************************/ /* - * The list of known scripts. Each different script corresponds to the - * following information: - * - * - A set of Unicode ranges to test whether the face supports the - * script. + * For the auto-hinter, a writing system consists of multiple scripts that + * can be handled similarly *in a typographical way*; the relationship is + * not based on history. For example, both the Greek and the unrelated + * Armenian scripts share the same features like ascender, descender, + * x-height, etc. Essentially, a writing system is covered by a + * submodule of the auto-fitter; it contains * - * - A specific global analyzer that will compute global metrics - * specific to the script. + * - a specific global analyzer that computes global metrics specific to + * the script (based on script-specific characters to identify ascender + * height, x-height, etc.), * - * - A specific glyph analyzer that will compute segments and - * edges for each glyph covered by the script. + * - a specific glyph analyzer that computes segments and edges for each + * glyph covered by the script, * - * - A specific grid-fitting algorithm that will distort the - * scaled glyph outline according to the results of the glyph - * analyzer. - * - * Note that a given analyzer and/or grid-fitting algorithm can be - * used by more than one script. + * - a specific grid-fitting algorithm that distorts the scaled glyph + * outline according to the results of the glyph analyzer. */ - typedef enum AF_Script_ +#define __AFWRTSYS_H__ /* don't load header files */ +#undef WRITING_SYSTEM +#define WRITING_SYSTEM( ws, WS ) \ + AF_WRITING_SYSTEM_ ## WS, + + /* The list of known writing systems. */ + typedef enum AF_WritingSystem_ { - AF_SCRIPT_NONE = 0, - AF_SCRIPT_LATIN = 1, - AF_SCRIPT_CJK = 2, - AF_SCRIPT_INDIC = 3, -#ifdef FT_OPTION_AUTOFIT2 - AF_SCRIPT_LATIN2, -#endif - /* add new scripts here. Don't forget to update the list in */ - /* `afglobal.c'. */ +#include "afwrtsys.h" - AF_SCRIPT_MAX /* do not remove */ + AF_WRITING_SYSTEM_MAX /* do not remove */ - } AF_Script; + } AF_WritingSystem; +#undef __AFWRTSYS_H__ - typedef struct AF_ScriptClassRec_ const* AF_ScriptClass; - typedef struct AF_ScriptMetricsRec_ + typedef struct AF_WritingSystemClassRec_ { - AF_ScriptClass clazz; - AF_ScalerRec scaler; - FT_Bool digits_have_same_width; + AF_WritingSystem writing_system; - } AF_ScriptMetricsRec, *AF_ScriptMetrics; + FT_Offset style_metrics_size; + AF_WritingSystem_InitMetricsFunc style_metrics_init; + AF_WritingSystem_ScaleMetricsFunc style_metrics_scale; + AF_WritingSystem_DoneMetricsFunc style_metrics_done; + AF_WritingSystem_InitHintsFunc style_hints_init; + AF_WritingSystem_ApplyHintsFunc style_hints_apply; - /* This function parses an FT_Face to compute global metrics for - * a specific script. + } AF_WritingSystemClassRec; + + typedef const AF_WritingSystemClassRec* AF_WritingSystemClass; + + + /*************************************************************************/ + /*************************************************************************/ + /***** *****/ + /***** S C R I P T S *****/ + /***** *****/ + /*************************************************************************/ + /*************************************************************************/ + + /* + * Each script is associated with a set of Unicode ranges that gets used + * to test whether the font face supports the script. + * + * We use four-letter script tags from the OpenType specification, + * extended by `NONE', which indicates `no script'. */ - typedef FT_Error - (*AF_Script_InitMetricsFunc)( AF_ScriptMetrics metrics, - FT_Face face ); - typedef void - (*AF_Script_ScaleMetricsFunc)( AF_ScriptMetrics metrics, - AF_Scaler scaler ); +#undef SCRIPT +#define SCRIPT( s, S, d, h, sc1, sc2, sc3 ) \ + AF_SCRIPT_ ## S, - typedef void - (*AF_Script_DoneMetricsFunc)( AF_ScriptMetrics metrics ); + /* The list of known scripts. */ + typedef enum AF_Script_ + { +#include "afscript.h" - typedef FT_Error - (*AF_Script_InitHintsFunc)( AF_GlyphHints hints, - AF_ScriptMetrics metrics ); + AF_SCRIPT_MAX /* do not remove */ - typedef void - (*AF_Script_ApplyHintsFunc)( AF_GlyphHints hints, - FT_Outline* outline, - AF_ScriptMetrics metrics ); + } AF_Script; typedef struct AF_Script_UniRangeRec_ @@ -289,72 +326,300 @@ extern void* _af_debug_hints; #define AF_UNIRANGE_REC( a, b ) { (FT_UInt32)(a), (FT_UInt32)(b) } - typedef const AF_Script_UniRangeRec *AF_Script_UniRange; + typedef const AF_Script_UniRangeRec* AF_Script_UniRange; typedef struct AF_ScriptClassRec_ { - AF_Script script; - AF_Script_UniRange script_uni_ranges; /* last must be { 0, 0 } */ + AF_Script script; - FT_Offset script_metrics_size; - AF_Script_InitMetricsFunc script_metrics_init; - AF_Script_ScaleMetricsFunc script_metrics_scale; - AF_Script_DoneMetricsFunc script_metrics_done; + AF_Script_UniRange script_uni_ranges; /* last must be { 0, 0 } */ - AF_Script_InitHintsFunc script_hints_init; - AF_Script_ApplyHintsFunc script_hints_apply; + FT_UInt32 standard_char1; /* for default width and height */ + FT_UInt32 standard_char2; /* ditto */ + FT_UInt32 standard_char3; /* ditto */ } AF_ScriptClassRec; + typedef const AF_ScriptClassRec* AF_ScriptClass; + + + /*************************************************************************/ + /*************************************************************************/ + /***** *****/ + /***** C O V E R A G E S *****/ + /***** *****/ + /*************************************************************************/ + /*************************************************************************/ + + /* + * Usually, a font contains more glyphs than can be addressed by its + * character map. + * + * In the PostScript font world, encoding vectors specific to a given + * task are used to select such glyphs, and these glyphs can be often + * recognized by having a suffix in its glyph names. For example, a + * superscript glyph `A' might be called `A.sup'. Unfortunately, this + * naming scheme is not standardized and thus unusable for us. + * + * In the OpenType world, a better solution was invented, namely + * `features', which cleanly separate a character's input encoding from + * the corresponding glyph's appearance, and which don't use glyph names + * at all. For our purposes, and slightly generalized, an OpenType + * feature is a name of a mapping that maps character codes to + * non-standard glyph indices (features get used for other things also). + * For example, the `sups' feature provides superscript glyphs, thus + * mapping character codes like `A' or `B' to superscript glyph + * representation forms. How this mapping happens is completely + * uninteresting to us. + * + * For the auto-hinter, a `coverage' represents all glyphs of an OpenType + * feature collected in a set (as listed below) that can be hinted + * together. To continue the above example, superscript glyphs must not + * be hinted together with normal glyphs because the blue zones + * completely differ. + * + * Note that FreeType itself doesn't compute coverages; it only provides + * the glyphs addressable by the default Unicode character map. Instead, + * we use the HarfBuzz library (if available), which has many functions + * exactly for this purpose. + * + * AF_COVERAGE_DEFAULT is special: It should cover everything that isn't + * listed separately (including the glyphs addressable by the character + * map). In case HarfBuzz isn't available, it exactly covers the glyphs + * addressable by the character map. + * + */ + +#undef COVERAGE +#define COVERAGE( name, NAME, description, \ + tag1, tag2, tag3, tag4 ) \ + AF_COVERAGE_ ## NAME, + + + typedef enum AF_Coverage_ + { +#include "afcover.h" + + AF_COVERAGE_DEFAULT + + } AF_Coverage; + + + /*************************************************************************/ + /*************************************************************************/ + /***** *****/ + /***** S T Y L E S *****/ + /***** *****/ + /*************************************************************************/ + /*************************************************************************/ + + /* + * The topmost structure for modelling the auto-hinter glyph input data + * is a `style class', grouping everything together. + */ + +#undef STYLE +#define STYLE( s, S, d, ws, sc, ss, c ) \ + AF_STYLE_ ## S, + + /* The list of known styles. */ + typedef enum AF_Style_ + { + +#include "afstyles.h" + + AF_STYLE_MAX /* do not remove */ + + } AF_Style; + + + typedef struct AF_StyleClassRec_ + { + AF_Style style; + + AF_WritingSystem writing_system; + AF_Script script; + AF_Blue_Stringset blue_stringset; + AF_Coverage coverage; + + } AF_StyleClassRec; + + typedef const AF_StyleClassRec* AF_StyleClass; + + + /*************************************************************************/ + /*************************************************************************/ + /***** *****/ + /***** S T Y L E M E T R I C S *****/ + /***** *****/ + /*************************************************************************/ + /*************************************************************************/ + + typedef struct AF_FaceGlobalsRec_* AF_FaceGlobals; + + /* This is the main structure that combines everything. Autofit modules */ + /* specific to writing systems derive their structures from it, for */ + /* example `AF_LatinMetrics'. */ + + typedef struct AF_StyleMetricsRec_ + { + AF_StyleClass style_class; + AF_ScalerRec scaler; + FT_Bool digits_have_same_width; + + AF_FaceGlobals globals; /* to access properties */ + + } AF_StyleMetricsRec; + /* Declare and define vtables for classes */ #ifndef FT_CONFIG_OPTION_PIC +#define AF_DECLARE_WRITING_SYSTEM_CLASS( writing_system_class ) \ + FT_CALLBACK_TABLE const AF_WritingSystemClassRec \ + writing_system_class; + +#define AF_DEFINE_WRITING_SYSTEM_CLASS( \ + writing_system_class, \ + system, \ + m_size, \ + m_init, \ + m_scale, \ + m_done, \ + h_init, \ + h_apply ) \ + FT_CALLBACK_TABLE_DEF \ + const AF_WritingSystemClassRec writing_system_class = \ + { \ + system, \ + \ + m_size, \ + \ + m_init, \ + m_scale, \ + m_done, \ + \ + h_init, \ + h_apply \ + }; + + #define AF_DECLARE_SCRIPT_CLASS( script_class ) \ FT_CALLBACK_TABLE const AF_ScriptClassRec \ script_class; -#define AF_DEFINE_SCRIPT_CLASS( script_class, script_, ranges, m_size, \ - m_init, m_scale, m_done, h_init, h_apply ) \ - FT_CALLBACK_TABLE_DEF const AF_ScriptClassRec \ - script_class = \ - { \ - script_, \ - ranges, \ - \ - m_size, \ - \ - m_init, \ - m_scale, \ - m_done, \ - \ - h_init, \ - h_apply \ +#define AF_DEFINE_SCRIPT_CLASS( \ + script_class, \ + script, \ + ranges, \ + std_char1, \ + std_char2, \ + std_char3 ) \ + FT_CALLBACK_TABLE_DEF \ + const AF_ScriptClassRec script_class = \ + { \ + script, \ + ranges, \ + std_char1, \ + std_char2, \ + std_char3 \ + }; + + +#define AF_DECLARE_STYLE_CLASS( style_class ) \ + FT_CALLBACK_TABLE const AF_StyleClassRec \ + style_class; + +#define AF_DEFINE_STYLE_CLASS( \ + style_class, \ + style, \ + writing_system, \ + script, \ + blue_stringset, \ + coverage ) \ + FT_CALLBACK_TABLE_DEF \ + const AF_StyleClassRec style_class = \ + { \ + style, \ + writing_system, \ + script, \ + blue_stringset, \ + coverage \ }; #else /* FT_CONFIG_OPTION_PIC */ -#define AF_DECLARE_SCRIPT_CLASS( script_class ) \ - FT_LOCAL( void ) \ - FT_Init_Class_##script_class( AF_ScriptClassRec* ac ); - -#define AF_DEFINE_SCRIPT_CLASS( script_class, script_, ranges, m_size, \ - m_init, m_scale, m_done, h_init, h_apply ) \ - FT_LOCAL_DEF( void ) \ - FT_Init_Class_##script_class( AF_ScriptClassRec* ac ) \ - { \ - ac->script = script_; \ - ac->script_uni_ranges = ranges; \ - \ - ac->script_metrics_size = m_size; \ - \ - ac->script_metrics_init = m_init; \ - ac->script_metrics_scale = m_scale; \ - ac->script_metrics_done = m_done; \ - \ - ac->script_hints_init = h_init; \ - ac->script_hints_apply = h_apply; \ +#define AF_DECLARE_WRITING_SYSTEM_CLASS( writing_system_class ) \ + FT_LOCAL( void ) \ + FT_Init_Class_ ## writing_system_class( AF_WritingSystemClassRec* ac ); + +#define AF_DEFINE_WRITING_SYSTEM_CLASS( \ + writing_system_class, \ + system, \ + m_size, \ + m_init, \ + m_scale, \ + m_done, \ + h_init, \ + h_apply ) \ + FT_LOCAL_DEF( void ) \ + FT_Init_Class_ ## writing_system_class( AF_WritingSystemClassRec* ac ) \ + { \ + ac->writing_system = system; \ + \ + ac->style_metrics_size = m_size; \ + \ + ac->style_metrics_init = m_init; \ + ac->style_metrics_scale = m_scale; \ + ac->style_metrics_done = m_done; \ + \ + ac->style_hints_init = h_init; \ + ac->style_hints_apply = h_apply; \ + } + + +#define AF_DECLARE_SCRIPT_CLASS( script_class ) \ + FT_LOCAL( void ) \ + FT_Init_Class_ ## script_class( AF_ScriptClassRec* ac ); + +#define AF_DEFINE_SCRIPT_CLASS( \ + script_class, \ + script_, \ + ranges, \ + std_char1, \ + std_char2, \ + std_char3 ) \ + FT_LOCAL_DEF( void ) \ + FT_Init_Class_ ## script_class( AF_ScriptClassRec* ac ) \ + { \ + ac->script = script_; \ + ac->script_uni_ranges = ranges; \ + ac->standard_char1 = std_char1; \ + ac->standard_char2 = std_char2; \ + ac->standard_char3 = std_char3; \ + } + + +#define AF_DECLARE_STYLE_CLASS( style_class ) \ + FT_LOCAL( void ) \ + FT_Init_Class_ ## style_class( AF_StyleClassRec* ac ); + +#define AF_DEFINE_STYLE_CLASS( \ + style_class, \ + style_, \ + writing_system_, \ + script_, \ + blue_stringset_, \ + coverage_ ) \ + FT_LOCAL_DEF( void ) \ + FT_Init_Class_ ## style_class( AF_StyleClassRec* ac ) \ + { \ + ac->style = style_; \ + ac->writing_system = writing_system_; \ + ac->script = script_; \ + ac->blue_stringset = blue_stringset_; \ + ac->coverage = coverage_; \ } #endif /* FT_CONFIG_OPTION_PIC */ diff --git a/src/autofit/afwrtsys.h b/src/autofit/afwrtsys.h new file mode 100644 index 0000000..8aa2ed9 --- /dev/null +++ b/src/autofit/afwrtsys.h @@ -0,0 +1,52 @@ +/***************************************************************************/ +/* */ +/* afwrtsys.h */ +/* */ +/* Auto-fitter writing systems (specification only). */ +/* */ +/* Copyright 2013 by */ +/* David Turner, Robert Wilhelm, and Werner Lemberg. */ +/* */ +/* This file is part of the FreeType project, and may only be used, */ +/* modified, and distributed under the terms of the FreeType project */ +/* license, LICENSE.TXT. By continuing to use, modify, or distribute */ +/* this file you indicate that you have read the license and */ +/* understand and accept it fully. */ +/* */ +/***************************************************************************/ + + +#ifndef __AFWRTSYS_H__ +#define __AFWRTSYS_H__ + + /* Since preprocessor directives can't create other preprocessor */ + /* directives, we have to include the header files manually. */ + +#include "afdummy.h" +#include "aflatin.h" +#include "afcjk.h" +#include "afindic.h" +#ifdef FT_OPTION_AUTOFIT2 +#include "aflatin2.h" +#endif + +#endif /* __AFWRTSYS_H__ */ + + + /* The following part can be included multiple times. */ + /* Define `WRITING_SYSTEM' as needed. */ + + + /* Add new writing systems here. The arguments are the writing system */ + /* name in lowercase and uppercase, respectively. */ + + WRITING_SYSTEM( dummy, DUMMY ) + WRITING_SYSTEM( latin, LATIN ) + WRITING_SYSTEM( cjk, CJK ) + WRITING_SYSTEM( indic, INDIC ) +#ifdef FT_OPTION_AUTOFIT2 + WRITING_SYSTEM( latin2, LATIN2 ) +#endif + + +/* END */ diff --git a/src/autofit/autofit.c b/src/autofit/autofit.c index 3883a0a..e2b9934 100644 --- a/src/autofit/autofit.c +++ b/src/autofit/autofit.c @@ -4,7 +4,7 @@ /* */ /* Auto-fitter module (body). */ /* */ -/* Copyright 2003-2007, 2011 by */ +/* Copyright 2003-2007, 2011, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -20,9 +20,12 @@ #include <ft2build.h> #include "afpic.c" #include "afangles.c" +#include "afblue.c" #include "afglobal.c" #include "afhints.c" +#include "afranges.c" + #include "afdummy.c" #include "aflatin.c" #ifdef FT_OPTION_AUTOFIT2 @@ -31,6 +34,8 @@ #include "afcjk.c" #include "afindic.c" +#include "hbshim.c" + #include "afloader.c" #include "afmodule.c" diff --git a/src/autofit/hbshim.c b/src/autofit/hbshim.c new file mode 100644 index 0000000..a705cef --- /dev/null +++ b/src/autofit/hbshim.c @@ -0,0 +1,545 @@ +/***************************************************************************/ +/* */ +/* hbshim.c */ +/* */ +/* HarfBuzz interface for accessing OpenType features (body). */ +/* */ +/* Copyright 2013, 2014 by */ +/* David Turner, Robert Wilhelm, and Werner Lemberg. */ +/* */ +/* This file is part of the FreeType project, and may only be used, */ +/* modified, and distributed under the terms of the FreeType project */ +/* license, LICENSE.TXT. By continuing to use, modify, or distribute */ +/* this file you indicate that you have read the license and */ +/* understand and accept it fully. */ +/* */ +/***************************************************************************/ + + +#include <ft2build.h> +#include FT_FREETYPE_H +#include "afglobal.h" +#include "aftypes.h" +#include "hbshim.h" + +#ifdef FT_CONFIG_OPTION_USE_HARFBUZZ + + + /*************************************************************************/ + /* */ + /* The macro FT_COMPONENT is used in trace mode. It is an implicit */ + /* parameter of the FT_TRACE() and FT_ERROR() macros, used to print/log */ + /* messages during execution. */ + /* */ +#undef FT_COMPONENT +#define FT_COMPONENT trace_afharfbuzz + + + /* + * We use `sets' (in the HarfBuzz sense, which comes quite near to the + * usual mathematical meaning) to manage both lookups and glyph indices. + * + * 1. For each coverage, collect lookup IDs in a set. Note that an + * auto-hinter `coverage' is represented by one `feature', and a + * feature consists of an arbitrary number of (font specific) `lookup's + * that actually do the mapping job. Please check the OpenType + * specification for more details on features and lookups. + * + * 2. Create glyph ID sets from the corresponding lookup sets. + * + * 3. The glyph set corresponding to AF_COVERAGE_DEFAULT is computed + * with all lookups specific to the OpenType script activated. It + * relies on the order of AF_DEFINE_STYLE_CLASS entries so that + * special coverages (like `oldstyle figures') don't get overwritten. + * + */ + + + /* load coverage tags */ +#undef COVERAGE +#define COVERAGE( name, NAME, description, \ + tag1, tag2, tag3, tag4 ) \ + static const hb_tag_t name ## _coverage[] = \ + { \ + HB_TAG( tag1, tag2, tag3, tag4 ), \ + HB_TAG_NONE \ + }; + + +#include "afcover.h" + + + /* define mapping between coverage tags and AF_Coverage */ +#undef COVERAGE +#define COVERAGE( name, NAME, description, \ + tag1, tag2, tag3, tag4 ) \ + name ## _coverage, + + + static const hb_tag_t* coverages[] = + { +#include "afcover.h" + + NULL /* AF_COVERAGE_DEFAULT */ + }; + + + /* load HarfBuzz script tags */ +#undef SCRIPT +#define SCRIPT( s, S, d, h, sc1, sc2, sc3 ) h, + + + static const hb_script_t scripts[] = + { +#include "afscript.h" + }; + + + FT_Error + af_get_coverage( AF_FaceGlobals globals, + AF_StyleClass style_class, + FT_Byte* gstyles ) + { + hb_face_t* face; + + hb_set_t* gsub_lookups; /* GSUB lookups for a given script */ + hb_set_t* gsub_glyphs; /* glyphs covered by GSUB lookups */ + hb_set_t* gpos_lookups; /* GPOS lookups for a given script */ + hb_set_t* gpos_glyphs; /* glyphs covered by GPOS lookups */ + + hb_script_t script; + const hb_tag_t* coverage_tags; + hb_tag_t script_tags[] = { HB_TAG_NONE, + HB_TAG_NONE, + HB_TAG_NONE, + HB_TAG_NONE }; + + hb_codepoint_t idx; +#ifdef FT_DEBUG_LEVEL_TRACE + int count; +#endif + + + if ( !globals || !style_class || !gstyles ) + return FT_THROW( Invalid_Argument ); + + face = hb_font_get_face( globals->hb_font ); + + gsub_lookups = hb_set_create(); + gsub_glyphs = hb_set_create(); + gpos_lookups = hb_set_create(); + gpos_glyphs = hb_set_create(); + + coverage_tags = coverages[style_class->coverage]; + script = scripts[style_class->script]; + + /* Convert a HarfBuzz script tag into the corresponding OpenType */ + /* tag or tags -- some Indic scripts like Devanagari have an old */ + /* and a new set of features. */ + hb_ot_tags_from_script( script, + &script_tags[0], + &script_tags[1] ); + + /* `hb_ot_tags_from_script' usually returns HB_OT_TAG_DEFAULT_SCRIPT */ + /* as the second tag. We change that to HB_TAG_NONE except for the */ + /* default script. */ + if ( style_class->script == globals->module->default_script && + style_class->coverage == AF_COVERAGE_DEFAULT ) + { + if ( script_tags[0] == HB_TAG_NONE ) + script_tags[0] = HB_OT_TAG_DEFAULT_SCRIPT; + else + { + if ( script_tags[1] == HB_TAG_NONE ) + script_tags[1] = HB_OT_TAG_DEFAULT_SCRIPT; + else if ( script_tags[1] != HB_OT_TAG_DEFAULT_SCRIPT ) + script_tags[2] = HB_OT_TAG_DEFAULT_SCRIPT; + } + } + else + { + if ( script_tags[1] == HB_OT_TAG_DEFAULT_SCRIPT ) + script_tags[1] = HB_TAG_NONE; + } + + hb_ot_layout_collect_lookups( face, + HB_OT_TAG_GSUB, + script_tags, + NULL, + coverage_tags, + gsub_lookups ); + + if ( hb_set_is_empty( gsub_lookups ) ) + goto Exit; /* nothing to do */ + + hb_ot_layout_collect_lookups( face, + HB_OT_TAG_GPOS, + script_tags, + NULL, + coverage_tags, + gpos_lookups ); + + FT_TRACE4(( "GSUB lookups (style `%s'):\n" + " ", + af_style_names[style_class->style] )); + +#ifdef FT_DEBUG_LEVEL_TRACE + count = 0; +#endif + + for ( idx = -1; hb_set_next( gsub_lookups, &idx ); ) + { +#ifdef FT_DEBUG_LEVEL_TRACE + FT_TRACE4(( " %d", idx )); + count++; +#endif + + /* get output coverage of GSUB feature */ + hb_ot_layout_lookup_collect_glyphs( face, + HB_OT_TAG_GSUB, + idx, + NULL, + NULL, + NULL, + gsub_glyphs ); + } + +#ifdef FT_DEBUG_LEVEL_TRACE + if ( !count ) + FT_TRACE4(( " (none)" )); + FT_TRACE4(( "\n\n" )); +#endif + + FT_TRACE4(( "GPOS lookups (style `%s'):\n" + " ", + af_style_names[style_class->style] )); + +#ifdef FT_DEBUG_LEVEL_TRACE + count = 0; +#endif + + for ( idx = -1; hb_set_next( gpos_lookups, &idx ); ) + { +#ifdef FT_DEBUG_LEVEL_TRACE + FT_TRACE4(( " %d", idx )); + count++; +#endif + + /* get input coverage of GPOS feature */ + hb_ot_layout_lookup_collect_glyphs( face, + HB_OT_TAG_GPOS, + idx, + NULL, + gpos_glyphs, + NULL, + NULL ); + } + +#ifdef FT_DEBUG_LEVEL_TRACE + if ( !count ) + FT_TRACE4(( " (none)" )); + FT_TRACE4(( "\n\n" )); +#endif + + /* + * We now check whether we can construct blue zones, using glyphs + * covered by the feature only. In case there is not a single zone + * (this is, not a single character is covered), we skip this coverage. + * + */ + if ( style_class->coverage != AF_COVERAGE_DEFAULT ) + { + AF_Blue_Stringset bss = style_class->blue_stringset; + const AF_Blue_StringRec* bs = &af_blue_stringsets[bss]; + + FT_Bool found = 0; + + + for ( ; bs->string != AF_BLUE_STRING_MAX; bs++ ) + { + const char* p = &af_blue_strings[bs->string]; + + + while ( *p ) + { + hb_codepoint_t ch; + + + GET_UTF8_CHAR( ch, p ); + + for ( idx = -1; hb_set_next( gsub_lookups, &idx ); ) + { + hb_codepoint_t gidx = FT_Get_Char_Index( globals->face, ch ); + + + if ( hb_ot_layout_lookup_would_substitute( face, idx, + &gidx, 1, 1 ) ) + { + found = 1; + break; + } + } + } + } + + if ( !found ) + { + FT_TRACE4(( " no blue characters found; style skipped\n" )); + goto Exit; + } + } + + /* + * Various OpenType features might use the same glyphs at different + * vertical positions; for example, superscript and subscript glyphs + * could be the same. However, the auto-hinter is completely + * agnostic of OpenType features after the feature analysis has been + * completed: The engine then simply receives a glyph index and returns a + * hinted and usually rendered glyph. + * + * Consider the superscript feature of font `pala.ttf': Some of the + * glyphs are `real', this is, they have a zero vertical offset, but + * most of them are small caps glyphs shifted up to the superscript + * position (this is, the `sups' feature is present in both the GSUB and + * GPOS tables). The code for blue zones computation actually uses a + * feature's y offset so that the `real' glyphs get correct hints. But + * later on it is impossible to decide whether a glyph index belongs to, + * say, the small caps or superscript feature. + * + * For this reason, we don't assign a style to a glyph if the current + * feature covers the glyph in both the GSUB and the GPOS tables. This + * is quite a broad condition, assuming that + * + * (a) glyphs that get used in multiple features are present in a + * feature without vertical shift, + * + * and + * + * (b) a feature's GPOS data really moves the glyph vertically. + * + * Not fulfilling condition (a) makes a font larger; it would also + * reduce the number of glyphs that could be addressed directly without + * using OpenType features, so this assumption is rather strong. + * + * Condition (b) is much weaker, and there might be glyphs which get + * missed. However, the OpenType features we are going to handle are + * primarily located in GSUB, and HarfBuzz doesn't provide an API to + * directly get the necessary information from the GPOS table. A + * possible solution might be to directly parse the GPOS table to find + * out whether a glyph gets shifted vertically, but this is something I + * would like to avoid if not really necessary. + * + * Note that we don't follow this logic for the default coverage. + * Complex scripts like Devanagari have mandatory GPOS features to + * position many glyph elements, using mark-to-base or mark-to-ligature + * tables; the number of glyphs missed due to condition (b) would be far + * too large. + * + */ + if ( style_class->coverage != AF_COVERAGE_DEFAULT ) + hb_set_subtract( gsub_glyphs, gpos_glyphs ); + +#ifdef FT_DEBUG_LEVEL_TRACE + FT_TRACE4(( " glyphs without GPOS data (`*' means already assigned)" )); + count = 0; +#endif + + for ( idx = -1; hb_set_next( gsub_glyphs, &idx ); ) + { +#ifdef FT_DEBUG_LEVEL_TRACE + if ( !( count % 10 ) ) + FT_TRACE4(( "\n" + " " )); + + FT_TRACE4(( " %d", idx )); + count++; +#endif + + /* glyph indices returned by `hb_ot_layout_lookup_collect_glyphs' */ + /* can be arbitrary: some fonts use fake indices for processing */ + /* internal to GSUB or GPOS, which is fully valid */ + if ( idx >= (hb_codepoint_t)globals->glyph_count ) + continue; + + if ( gstyles[idx] == AF_STYLE_UNASSIGNED ) + gstyles[idx] = (FT_Byte)style_class->style; +#ifdef FT_DEBUG_LEVEL_TRACE + else + FT_TRACE4(( "*" )); +#endif + } + +#ifdef FT_DEBUG_LEVEL_TRACE + if ( !count ) + FT_TRACE4(( "\n" + " (none)" )); + FT_TRACE4(( "\n\n" )); +#endif + + Exit: + hb_set_destroy( gsub_lookups ); + hb_set_destroy( gsub_glyphs ); + hb_set_destroy( gpos_lookups ); + hb_set_destroy( gpos_glyphs ); + + return FT_Err_Ok; + } + + + /* construct HarfBuzz features */ +#undef COVERAGE +#define COVERAGE( name, NAME, description, \ + tag1, tag2, tag3, tag4 ) \ + static const hb_feature_t name ## _feature[] = \ + { \ + { \ + HB_TAG( tag1, tag2, tag3, tag4 ), \ + 1, 0, (unsigned int)-1 \ + } \ + }; + + +#include "afcover.h" + + + /* define mapping between HarfBuzz features and AF_Coverage */ +#undef COVERAGE +#define COVERAGE( name, NAME, description, \ + tag1, tag2, tag3, tag4 ) \ + name ## _feature, + + + static const hb_feature_t* features[] = + { +#include "afcover.h" + + NULL /* AF_COVERAGE_DEFAULT */ + }; + + + FT_Error + af_get_char_index( AF_StyleMetrics metrics, + FT_ULong charcode, + FT_ULong *codepoint, + FT_Long *y_offset ) + { + AF_StyleClass style_class; + + const hb_feature_t* feature; + + FT_ULong in_idx, out_idx; + + + if ( !metrics ) + return FT_THROW( Invalid_Argument ); + + in_idx = FT_Get_Char_Index( metrics->globals->face, charcode ); + + style_class = metrics->style_class; + + feature = features[style_class->coverage]; + + if ( feature ) + { + FT_UInt upem = metrics->globals->face->units_per_EM; + + hb_font_t* font = metrics->globals->hb_font; + hb_buffer_t* buf = hb_buffer_create(); + + uint32_t c = (uint32_t)charcode; + + hb_glyph_info_t* ginfo; + hb_glyph_position_t* gpos; + unsigned int gcount; + + + /* we shape at a size of units per EM; this means font units */ + hb_font_set_scale( font, upem, upem ); + + /* XXX: is this sufficient for a single character of any script? */ + hb_buffer_set_direction( buf, HB_DIRECTION_LTR ); + hb_buffer_set_script( buf, scripts[style_class->script] ); + + /* we add one character to `buf' ... */ + hb_buffer_add_utf32( buf, &c, 1, 0, 1 ); + + /* ... and apply one feature */ + hb_shape( font, buf, feature, 1 ); + + ginfo = hb_buffer_get_glyph_infos( buf, &gcount ); + gpos = hb_buffer_get_glyph_positions( buf, &gcount ); + + out_idx = ginfo[0].codepoint; + + /* getting the same index indicates no substitution, */ + /* which means that the glyph isn't available in the feature */ + if ( in_idx == out_idx ) + { + *codepoint = 0; + *y_offset = 0; + } + else + { + *codepoint = out_idx; + *y_offset = gpos[0].y_offset; + } + + hb_buffer_destroy( buf ); + +#ifdef FT_DEBUG_LEVEL_TRACE + if ( gcount > 1 ) + FT_TRACE1(( "af_get_char_index:" + " input character mapped to multiple glyphs\n" )); +#endif + } + else + { + *codepoint = in_idx; + *y_offset = 0; + } + + return FT_Err_Ok; + } + + +#else /* !FT_CONFIG_OPTION_USE_HARFBUZZ */ + + + FT_Error + af_get_coverage( AF_FaceGlobals globals, + AF_StyleClass style_class, + FT_Byte* gstyles ) + { + FT_UNUSED( globals ); + FT_UNUSED( style_class ); + FT_UNUSED( gstyles ); + + return FT_Err_Ok; + } + + + FT_Error + af_get_char_index( AF_StyleMetrics metrics, + FT_ULong charcode, + FT_ULong *codepoint, + FT_Long *y_offset ) + { + FT_Face face; + + + if ( !metrics ) + return FT_THROW( Invalid_Argument ); + + face = metrics->globals->face; + + *codepoint = FT_Get_Char_Index( face, charcode ); + *y_offset = 0; + + return FT_Err_Ok; + } + + +#endif /* !FT_CONFIG_OPTION_USE_HARFBUZZ */ + + +/* END */ diff --git a/src/autofit/hbshim.h b/src/autofit/hbshim.h new file mode 100644 index 0000000..02f1513 --- /dev/null +++ b/src/autofit/hbshim.h @@ -0,0 +1,56 @@ +/***************************************************************************/ +/* */ +/* hbshim.h */ +/* */ +/* HarfBuzz interface for accessing OpenType features (specification). */ +/* */ +/* Copyright 2013 by */ +/* David Turner, Robert Wilhelm, and Werner Lemberg. */ +/* */ +/* This file is part of the FreeType project, and may only be used, */ +/* modified, and distributed under the terms of the FreeType project */ +/* license, LICENSE.TXT. By continuing to use, modify, or distribute */ +/* this file you indicate that you have read the license and */ +/* understand and accept it fully. */ +/* */ +/***************************************************************************/ + + +#ifndef __HBSHIM_H__ +#define __HBSHIM_H__ + + +#include <ft2build.h> +#include FT_FREETYPE_H + + +#ifdef FT_CONFIG_OPTION_USE_HARFBUZZ + +#include <hb.h> +#include <hb-ot.h> +#include <hb-ft.h> + +#endif + + +FT_BEGIN_HEADER + + FT_Error + af_get_coverage( AF_FaceGlobals globals, + AF_StyleClass style_class, + FT_Byte* gstyles ); + + FT_Error + af_get_char_index( AF_StyleMetrics metrics, + FT_ULong charcode, + FT_ULong *codepoint, + FT_Long *y_offset ); + + /* */ + +FT_END_HEADER + +#endif /* __HBSHIM_H__ */ + + +/* END */ diff --git a/src/autofit/rules.mk b/src/autofit/rules.mk index b76bb79..658f04e 100644 --- a/src/autofit/rules.mk +++ b/src/autofit/rules.mk @@ -3,7 +3,7 @@ # -# Copyright 2003, 2004, 2005, 2006, 2007, 2011 by +# Copyright 2003-2007, 2011, 2013 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -26,6 +26,7 @@ AUTOF_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(AUTOF_DIR)) # AUTOF driver sources (i.e., C files) # AUTOF_DRV_SRC := $(AUTOF_DIR)/afangles.c \ + $(AUTOF_DIR)/afblue.c \ $(AUTOF_DIR)/afcjk.c \ $(AUTOF_DIR)/afdummy.c \ $(AUTOF_DIR)/afglobal.c \ @@ -35,13 +36,19 @@ AUTOF_DRV_SRC := $(AUTOF_DIR)/afangles.c \ $(AUTOF_DIR)/afloader.c \ $(AUTOF_DIR)/afmodule.c \ $(AUTOF_DIR)/afpic.c \ - $(AUTOF_DIR)/afwarp.c + $(AUTOF_DIR)/afranges.c \ + $(AUTOF_DIR)/afwarp.c \ + $(AUTOF_DIR)/hbshim.c # AUTOF driver headers # AUTOF_DRV_H := $(AUTOF_DRV_SRC:%c=%h) \ + $(AUTOF_DIR)/afcover.h \ $(AUTOF_DIR)/aferrors.h \ - $(AUTOF_DIR)/aftypes.h + $(AUTOF_DIR)/afscript.h \ + $(AUTOF_DIR)/afstyles.h \ + $(AUTOF_DIR)/aftypes.h \ + $(AUTOF_DIR)/afwrtsys.h # AUTOF driver object(s) diff --git a/src/base/basepic.c b/src/base/basepic.c index d754eb1..aeb6fd5 100644 --- a/src/base/basepic.c +++ b/src/base/basepic.c @@ -4,7 +4,7 @@ /* */ /* The FreeType position independent code services for base. */ /* */ -/* Copyright 2009 by */ +/* Copyright 2009, 2012, 2013 by */ /* Oran Agra and Mickey Gabel. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -21,14 +21,22 @@ #include FT_INTERNAL_OBJECTS_H #include "basepic.h" + #ifdef FT_CONFIG_OPTION_PIC /* forward declaration of PIC init functions from ftglyph.c */ - void FT_Init_Class_ft_outline_glyph_class( FT_Glyph_Class* clazz ); - void FT_Init_Class_ft_bitmap_glyph_class( FT_Glyph_Class* clazz ); + void + FT_Init_Class_ft_outline_glyph_class( FT_Glyph_Class* clazz ); + + void + FT_Init_Class_ft_bitmap_glyph_class( FT_Glyph_Class* clazz ); - /* forward declaration of PIC init function from ftrfork.c (not modularized) */ - void FT_Init_Table_raccess_guess_table( ft_raccess_guess_rec* record ); +#ifdef FT_CONFIG_OPTION_MAC_FONTS + /* forward declaration of PIC init function from ftrfork.c */ + /* (not modularized) */ + void + FT_Init_Table_ft_raccess_guess_table( ft_raccess_guess_rec* record ); +#endif /* forward declaration of PIC init functions from ftinit.c */ FT_Error @@ -37,14 +45,18 @@ void ft_destroy_default_module_classes( FT_Library library ); + void ft_base_pic_free( FT_Library library ) { FT_PIC_Container* pic_container = &library->pic_container; - FT_Memory memory = library->memory; + FT_Memory memory = library->memory; + + if ( pic_container->base ) { - /* Destroy default module classes (in case FT_Add_Default_Modules was used) */ + /* destroy default module classes */ + /* (in case FT_Add_Default_Modules was used) */ ft_destroy_default_module_classes( library ); FT_FREE( pic_container->base ); @@ -57,12 +69,13 @@ ft_base_pic_init( FT_Library library ) { FT_PIC_Container* pic_container = &library->pic_container; - FT_Error error = FT_Err_Ok; - BasePIC* container; - FT_Memory memory = library->memory; + FT_Error error = FT_Err_Ok; + BasePIC* container = NULL; + FT_Memory memory = library->memory; + /* allocate pointer, clear and set global container pointer */ - if ( FT_ALLOC ( container, sizeof ( *container ) ) ) + if ( FT_ALLOC( container, sizeof ( *container ) ) ) return error; FT_MEM_SET( container, 0, sizeof ( *container ) ); pic_container->base = container; @@ -72,21 +85,23 @@ if ( error ) goto Exit; - /* initialize pointer table - this is how the module usually expects this data */ + /* initialize pointer table - */ + /* this is how the module usually expects this data */ FT_Init_Class_ft_outline_glyph_class( &container->ft_outline_glyph_class ); FT_Init_Class_ft_bitmap_glyph_class( &container->ft_bitmap_glyph_class ); - FT_Init_Table_raccess_guess_table( - (ft_raccess_guess_rec*)&container->ft_raccess_guess_table); +#ifdef FT_CONFIG_OPTION_MAC_FONTS + FT_Init_Table_ft_raccess_guess_table( + (ft_raccess_guess_rec*)&container->ft_raccess_guess_table ); +#endif -Exit: - if( error ) + Exit: + if ( error ) ft_base_pic_free( library ); return error; } - #endif /* FT_CONFIG_OPTION_PIC */ diff --git a/src/base/basepic.h b/src/base/basepic.h index bf90bef..329d7c8 100644 --- a/src/base/basepic.h +++ b/src/base/basepic.h @@ -25,11 +25,13 @@ FT_BEGIN_HEADER #include FT_INTERNAL_PIC_H #ifndef FT_CONFIG_OPTION_PIC -#define FT_OUTLINE_GLYPH_CLASS_GET &ft_outline_glyph_class -#define FT_BITMAP_GLYPH_CLASS_GET &ft_bitmap_glyph_class -#define FT_DEFAULT_MODULES_GET ft_default_modules + +#define FT_OUTLINE_GLYPH_CLASS_GET &ft_outline_glyph_class +#define FT_BITMAP_GLYPH_CLASS_GET &ft_bitmap_glyph_class +#define FT_DEFAULT_MODULES_GET ft_default_modules + #ifdef FT_CONFIG_OPTION_GUESSING_EMBEDDED_RFORK -#define FT_RACCESS_GUESS_TABLE_GET ft_raccess_guess_table +#define FT_RACCESS_GUESS_TABLE_GET ft_raccess_guess_table #endif #else /* FT_CONFIG_OPTION_PIC */ @@ -41,25 +43,35 @@ FT_BEGIN_HEADER #endif - typedef struct BasePIC_ + typedef struct BasePIC_ { - FT_Module_Class** default_module_classes; - FT_Glyph_Class ft_outline_glyph_class; - FT_Glyph_Class ft_bitmap_glyph_class; + FT_Module_Class** default_module_classes; + FT_Glyph_Class ft_outline_glyph_class; + FT_Glyph_Class ft_bitmap_glyph_class; + #ifdef FT_CONFIG_OPTION_GUESSING_EMBEDDED_RFORK - ft_raccess_guess_rec ft_raccess_guess_table[FT_RACCESS_N_RULES]; + ft_raccess_guess_rec ft_raccess_guess_table[FT_RACCESS_N_RULES]; #endif + } BasePIC; -#define GET_PIC(lib) ((BasePIC*)((lib)->pic_container.base)) -#define FT_OUTLINE_GLYPH_CLASS_GET (&GET_PIC(library)->ft_outline_glyph_class) -#define FT_BITMAP_GLYPH_CLASS_GET (&GET_PIC(library)->ft_bitmap_glyph_class) -#define FT_DEFAULT_MODULES_GET (GET_PIC(library)->default_module_classes) + +#define GET_PIC( lib ) ( (BasePIC*)( (lib)->pic_container.base ) ) + +#define FT_OUTLINE_GLYPH_CLASS_GET \ + ( &GET_PIC( library )->ft_outline_glyph_class ) +#define FT_BITMAP_GLYPH_CLASS_GET \ + ( &GET_PIC( library )->ft_bitmap_glyph_class ) +#define FT_DEFAULT_MODULES_GET \ + ( GET_PIC( library )->default_module_classes ) + #ifdef FT_CONFIG_OPTION_GUESSING_EMBEDDED_RFORK -#define FT_RACCESS_GUESS_TABLE_GET (GET_PIC(library)->ft_raccess_guess_table) +#define FT_RACCESS_GUESS_TABLE_GET \ + ( GET_PIC( library )->ft_raccess_guess_table ) #endif - /* see basepic.c for the implementation. */ + + /* see basepic.c for the implementation */ void ft_base_pic_free( FT_Library library ); @@ -67,7 +79,8 @@ FT_BEGIN_HEADER ft_base_pic_init( FT_Library library ); #endif /* FT_CONFIG_OPTION_PIC */ - /* */ + + /* */ FT_END_HEADER diff --git a/src/base/ftadvanc.c b/src/base/ftadvanc.c index a8bb43d..18884ef 100644 --- a/src/base/ftadvanc.c +++ b/src/base/ftadvanc.c @@ -4,7 +4,7 @@ /* */ /* Quick computation of advance widths (body). */ /* */ -/* Copyright 2008, 2009, 2011 by */ +/* Copyright 2008, 2009, 2011, 2013, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -17,6 +17,8 @@ #include <ft2build.h> +#include FT_INTERNAL_DEBUG_H + #include FT_ADVANCES_H #include FT_INTERNAL_OBJECTS_H @@ -35,7 +37,7 @@ return FT_Err_Ok; if ( face->size == NULL ) - return FT_Err_Invalid_Size_Handle; + return FT_THROW( Invalid_Size_Handle ); if ( flags & FT_LOAD_VERTICAL_LAYOUT ) scale = face->size->metrics.y_scale; @@ -76,10 +78,13 @@ if ( !face ) - return FT_Err_Invalid_Face_Handle; + return FT_THROW( Invalid_Face_Handle ); + + if ( !padvance ) + return FT_THROW( Invalid_Argument ); if ( gindex >= (FT_UInt)face->num_glyphs ) - return FT_Err_Invalid_Glyph_Index; + return FT_THROW( Invalid_Glyph_Index ); func = face->driver->clazz->get_advances; if ( func && LOAD_ADVANCE_FAST_CHECK( flags ) ) @@ -91,7 +96,7 @@ if ( !error ) return _ft_face_scale_advances( face, padvance, 1, flags ); - if ( error != FT_ERROR_BASE( FT_Err_Unimplemented_Feature ) ) + if ( FT_ERR_NEQ( error, Unimplemented_Feature ) ) return error; } @@ -114,12 +119,15 @@ if ( !face ) - return FT_Err_Invalid_Face_Handle; + return FT_THROW( Invalid_Face_Handle ); + + if ( !padvances ) + return FT_THROW( Invalid_Argument ); num = (FT_UInt)face->num_glyphs; end = start + count; if ( start >= num || end < start || end > num ) - return FT_Err_Invalid_Glyph_Index; + return FT_THROW( Invalid_Glyph_Index ); if ( count == 0 ) return FT_Err_Ok; @@ -131,14 +139,14 @@ if ( !error ) return _ft_face_scale_advances( face, padvances, count, flags ); - if ( error != FT_ERROR_BASE( FT_Err_Unimplemented_Feature ) ) + if ( FT_ERR_NEQ( error, Unimplemented_Feature ) ) return error; } error = FT_Err_Ok; if ( flags & FT_ADVANCE_FLAG_FAST_ONLY ) - return FT_Err_Unimplemented_Feature; + return FT_THROW( Unimplemented_Feature ); flags |= (FT_UInt32)FT_LOAD_ADVANCE_ONLY; for ( nn = 0; nn < count; nn++ ) diff --git a/src/base/ftbbox.c b/src/base/ftbbox.c index 4b8e911..f9a1751 100644 --- a/src/base/ftbbox.c +++ b/src/base/ftbbox.c @@ -4,7 +4,7 @@ /* */ /* FreeType bbox computation (body). */ /* */ -/* Copyright 1996-2001, 2002, 2004, 2006, 2010 by */ +/* Copyright 1996-2002, 2004, 2006, 2010, 2013, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used */ @@ -25,6 +25,8 @@ #include <ft2build.h> +#include FT_INTERNAL_DEBUG_H + #include FT_BBOX_H #include FT_IMAGE_H #include FT_OUTLINE_H @@ -40,16 +42,35 @@ } TBBox_Rec; +#define FT_UPDATE_BBOX( p, bbox ) \ + FT_BEGIN_STMNT \ + if ( p->x < bbox.xMin ) \ + bbox.xMin = p->x; \ + if ( p->x > bbox.xMax ) \ + bbox.xMax = p->x; \ + if ( p->y < bbox.yMin ) \ + bbox.yMin = p->y; \ + if ( p->y > bbox.yMax ) \ + bbox.yMax = p->y; \ + FT_END_STMNT + +#define CHECK_X( p, bbox ) \ + ( p->x < bbox.xMin || p->x > bbox.xMax ) + +#define CHECK_Y( p, bbox ) \ + ( p->y < bbox.yMin || p->y > bbox.yMax ) + + /*************************************************************************/ /* */ /* <Function> */ /* BBox_Move_To */ /* */ /* <Description> */ - /* This function is used as a `move_to' and `line_to' emitter during */ + /* This function is used as a `move_to' emitter during */ /* FT_Outline_Decompose(). It simply records the destination point */ - /* in `user->last'; no further computations are necessary since we */ - /* use the cbox as the starting bbox which must be refined. */ + /* in `user->last'. We also update bbox in case contour starts with */ + /* an implicit `on' point. */ /* */ /* <Input> */ /* to :: A pointer to the destination vector. */ @@ -64,17 +85,42 @@ BBox_Move_To( FT_Vector* to, TBBox_Rec* user ) { + FT_UPDATE_BBOX( to, user->bbox ); + user->last = *to; return 0; } -#define CHECK_X( p, bbox ) \ - ( p->x < bbox.xMin || p->x > bbox.xMax ) + /*************************************************************************/ + /* */ + /* <Function> */ + /* BBox_Line_To */ + /* */ + /* <Description> */ + /* This function is used as a `line_to' emitter during */ + /* FT_Outline_Decompose(). It simply records the destination point */ + /* in `user->last'; no further computations are necessary because */ + /* bbox already contains both explicit ends of the line segment. */ + /* */ + /* <Input> */ + /* to :: A pointer to the destination vector. */ + /* */ + /* <InOut> */ + /* user :: A pointer to the current walk context. */ + /* */ + /* <Return> */ + /* Always 0. Needed for the interface only. */ + /* */ + static int + BBox_Line_To( FT_Vector* to, + TBBox_Rec* user ) + { + user->last = *to; -#define CHECK_Y( p, bbox ) \ - ( p->y < bbox.yMin || p->y > bbox.yMax ) + return 0; + } /*************************************************************************/ @@ -83,7 +129,7 @@ /* BBox_Conic_Check */ /* */ /* <Description> */ - /* Finds the extrema of a 1-dimensional conic Bezier curve and update */ + /* Find the extrema of a 1-dimensional conic Bezier curve and update */ /* a bounding range. This version uses direct computation, as it */ /* doesn't need square roots. */ /* */ @@ -106,30 +152,19 @@ FT_Pos* min, FT_Pos* max ) { - if ( y1 <= y3 && y2 == y1 ) /* flat arc */ - goto Suite; - - if ( y1 < y3 ) - { - if ( y2 >= y1 && y2 <= y3 ) /* ascending arc */ - goto Suite; - } - else - { - if ( y2 >= y3 && y2 <= y1 ) /* descending arc */ - { - y2 = y1; - y1 = y3; - y3 = y2; - goto Suite; - } - } - - y1 = y3 = y1 - FT_MulDiv( y2 - y1, y2 - y1, y1 - 2*y2 + y3 ); - - Suite: - if ( y1 < *min ) *min = y1; - if ( y3 > *max ) *max = y3; + /* This function is only called when a control off-point is outside */ + /* the bbox that contains all on-points. It finds a local extremum */ + /* within the segment, equal to (y1*y3 - y2*y2)/(y1 - 2*y2 + y3). */ + /* Or, offsetting from y2, we get */ + + y1 -= y2; + y3 -= y2; + y2 += FT_MulDiv( y1, y3, y1 + y3 ); + + if ( y2 < *min ) + *min = y2; + if ( y2 > *max ) + *max = y2; } @@ -164,8 +199,8 @@ FT_Vector* to, TBBox_Rec* user ) { - /* we don't need to check `to' since it is always an `on' point, thus */ - /* within the bbox */ + /* in case `to' is implicit and not included in bbox yet */ + FT_UPDATE_BBOX( to, user->bbox ); if ( CHECK_X( control, user->bbox ) ) BBox_Conic_Check( user->last.x, @@ -193,9 +228,9 @@ /* BBox_Cubic_Check */ /* */ /* <Description> */ - /* Finds the extrema of a 1-dimensional cubic Bezier curve and */ - /* updates a bounding range. This version uses splitting because we */ - /* don't want to use square roots and extra accuracy. */ + /* Find the extrema of a 1-dimensional cubic Bezier curve and */ + /* update a bounding range. This version uses iterative splitting */ + /* because it is faster than the exact solution with square roots. */ /* */ /* <Input> */ /* p1 :: The start coordinate. */ @@ -211,294 +246,117 @@ /* */ /* max :: The address of the current maximum. */ /* */ - -#if 0 - - static void - BBox_Cubic_Check( FT_Pos p1, - FT_Pos p2, - FT_Pos p3, - FT_Pos p4, - FT_Pos* min, - FT_Pos* max ) + static FT_Pos + cubic_peak( FT_Pos q1, + FT_Pos q2, + FT_Pos q3, + FT_Pos q4 ) { - FT_Pos stack[32*3 + 1], *arc; - - - arc = stack; - - arc[0] = p1; - arc[1] = p2; - arc[2] = p3; - arc[3] = p4; - - do + FT_Pos peak = 0; + FT_Int shift; + + /* This function finds a peak of a cubic segment if it is above 0 */ + /* using iterative bisection of the segment, or returns 0. */ + /* The fixed-point arithmetic of bisection is inherently stable */ + /* but may loose accuracy in the two lowest bits. To compensate, */ + /* we upscale the segment if there is room. Large values may need */ + /* to be downscaled to avoid overflows during bisection. */ + /* It is called with either q2 or q3 positive, which is necessary */ + /* for the peak to exist and avoids undefined FT_MSB. */ + + shift = 27 - + FT_MSB( FT_ABS( q1 ) | FT_ABS( q2 ) | FT_ABS( q3 ) | FT_ABS( q4 ) ); + + if ( shift > 0 ) { - FT_Pos y1 = arc[0]; - FT_Pos y2 = arc[1]; - FT_Pos y3 = arc[2]; - FT_Pos y4 = arc[3]; - + /* upscaling too much just wastes time */ + if ( shift > 2 ) + shift = 2; + + q1 <<= shift; + q2 <<= shift; + q3 <<= shift; + q4 <<= shift; + } + else + { + q1 >>= -shift; + q2 >>= -shift; + q3 >>= -shift; + q4 >>= -shift; + } - if ( y1 == y4 ) + /* for a peak to exist above 0, the cubic segment must have */ + /* at least one of its control off-points above 0. */ + while ( q2 > 0 || q3 > 0 ) + { + /* determine which half contains the maximum and split */ + if ( q1 + q2 > q3 + q4 ) /* first half */ { - if ( y1 == y2 && y1 == y3 ) /* flat */ - goto Test; + q4 = q4 + q3; + q3 = q3 + q2; + q2 = q2 + q1; + q4 = q4 + q3; + q3 = q3 + q2; + q4 = ( q4 + q3 ) / 8; + q3 = q3 / 4; + q2 = q2 / 2; } - else if ( y1 < y4 ) + else /* second half */ { - if ( y2 >= y1 && y2 <= y4 && y3 >= y1 && y3 <= y4 ) /* ascending */ - goto Test; + q1 = q1 + q2; + q2 = q2 + q3; + q3 = q3 + q4; + q1 = q1 + q2; + q2 = q2 + q3; + q1 = ( q1 + q2 ) / 8; + q2 = q2 / 4; + q3 = q3 / 2; } - else + + /* check whether either end reached the maximum */ + if ( q1 == q2 && q1 >= q3 ) { - if ( y2 >= y4 && y2 <= y1 && y3 >= y4 && y3 <= y1 ) /* descending */ - { - y2 = y1; - y1 = y4; - y4 = y2; - goto Test; - } + peak = q1; + break; } + if ( q3 == q4 && q2 <= q4 ) + { + peak = q4; + break; + } + } - /* unknown direction -- split the arc in two */ - arc[6] = y4; - arc[1] = y1 = ( y1 + y2 ) / 2; - arc[5] = y4 = ( y4 + y3 ) / 2; - y2 = ( y2 + y3 ) / 2; - arc[2] = y1 = ( y1 + y2 ) / 2; - arc[4] = y4 = ( y4 + y2 ) / 2; - arc[3] = ( y1 + y4 ) / 2; - - arc += 3; - goto Suite; - - Test: - if ( y1 < *min ) *min = y1; - if ( y4 > *max ) *max = y4; - arc -= 3; - - Suite: - ; - } while ( arc >= stack ); - } - -#else - - static void - test_cubic_extrema( FT_Pos y1, - FT_Pos y2, - FT_Pos y3, - FT_Pos y4, - FT_Fixed u, - FT_Pos* min, - FT_Pos* max ) - { - /* FT_Pos a = y4 - 3*y3 + 3*y2 - y1; */ - FT_Pos b = y3 - 2*y2 + y1; - FT_Pos c = y2 - y1; - FT_Pos d = y1; - FT_Pos y; - FT_Fixed uu; - - FT_UNUSED ( y4 ); - - - /* The polynomial is */ - /* */ - /* P(x) = a*x^3 + 3b*x^2 + 3c*x + d , */ - /* */ - /* dP/dx = 3a*x^2 + 6b*x + 3c . */ - /* */ - /* However, we also have */ - /* */ - /* dP/dx(u) = 0 , */ - /* */ - /* which implies by subtraction that */ - /* */ - /* P(u) = b*u^2 + 2c*u + d . */ - - if ( u > 0 && u < 0x10000L ) - { - uu = FT_MulFix( u, u ); - y = d + FT_MulFix( c, 2*u ) + FT_MulFix( b, uu ); + if ( shift > 0 ) + peak >>= shift; + else + peak <<= -shift; - if ( y < *min ) *min = y; - if ( y > *max ) *max = y; - } + return peak; } static void - BBox_Cubic_Check( FT_Pos y1, - FT_Pos y2, - FT_Pos y3, - FT_Pos y4, + BBox_Cubic_Check( FT_Pos p1, + FT_Pos p2, + FT_Pos p3, + FT_Pos p4, FT_Pos* min, FT_Pos* max ) { - /* always compare first and last points */ - if ( y1 < *min ) *min = y1; - else if ( y1 > *max ) *max = y1; + /* This function is only called when a control off-point is outside */ + /* the bbox that contains all on-points. So at least one of the */ + /* conditions below holds and cubic_peak is called with at least one */ + /* non-zero argument. */ - if ( y4 < *min ) *min = y4; - else if ( y4 > *max ) *max = y4; + if ( p2 > *max || p3 > *max ) + *max += cubic_peak( p1 - *max, p2 - *max, p3 - *max, p4 - *max ); - /* now, try to see if there are split points here */ - if ( y1 <= y4 ) - { - /* flat or ascending arc test */ - if ( y1 <= y2 && y2 <= y4 && y1 <= y3 && y3 <= y4 ) - return; - } - else /* y1 > y4 */ - { - /* descending arc test */ - if ( y1 >= y2 && y2 >= y4 && y1 >= y3 && y3 >= y4 ) - return; - } - - /* There are some split points. Find them. */ - { - FT_Pos a = y4 - 3*y3 + 3*y2 - y1; - FT_Pos b = y3 - 2*y2 + y1; - FT_Pos c = y2 - y1; - FT_Pos d; - FT_Fixed t; - - - /* We need to solve `ax^2+2bx+c' here, without floating points! */ - /* The trick is to normalize to a different representation in order */ - /* to use our 16.16 fixed point routines. */ - /* */ - /* We compute FT_MulFix(b,b) and FT_MulFix(a,c) after normalization. */ - /* These values must fit into a single 16.16 value. */ - /* */ - /* We normalize a, b, and c to `8.16' fixed float values to ensure */ - /* that its product is held in a `16.16' value. */ - - { - FT_ULong t1, t2; - int shift = 0; - - - /* The following computation is based on the fact that for */ - /* any value `y', if `n' is the position of the most */ - /* significant bit of `abs(y)' (starting from 0 for the */ - /* least significant bit), then `y' is in the range */ - /* */ - /* -2^n..2^n-1 */ - /* */ - /* We want to shift `a', `b', and `c' concurrently in order */ - /* to ensure that they all fit in 8.16 values, which maps */ - /* to the integer range `-2^23..2^23-1'. */ - /* */ - /* Necessarily, we need to shift `a', `b', and `c' so that */ - /* the most significant bit of its absolute values is at */ - /* _most_ at position 23. */ - /* */ - /* We begin by computing `t1' as the bitwise `OR' of the */ - /* absolute values of `a', `b', `c'. */ - - t1 = (FT_ULong)( ( a >= 0 ) ? a : -a ); - t2 = (FT_ULong)( ( b >= 0 ) ? b : -b ); - t1 |= t2; - t2 = (FT_ULong)( ( c >= 0 ) ? c : -c ); - t1 |= t2; - - /* Now we can be sure that the most significant bit of `t1' */ - /* is the most significant bit of either `a', `b', or `c', */ - /* depending on the greatest integer range of the particular */ - /* variable. */ - /* */ - /* Next, we compute the `shift', by shifting `t1' as many */ - /* times as necessary to move its MSB to position 23. This */ - /* corresponds to a value of `t1' that is in the range */ - /* 0x40_0000..0x7F_FFFF. */ - /* */ - /* Finally, we shift `a', `b', and `c' by the same amount. */ - /* This ensures that all values are now in the range */ - /* -2^23..2^23, i.e., they are now expressed as 8.16 */ - /* fixed-float numbers. This also means that we are using */ - /* 24 bits of precision to compute the zeros, independently */ - /* of the range of the original polynomial coefficients. */ - /* */ - /* This algorithm should ensure reasonably accurate values */ - /* for the zeros. Note that they are only expressed with */ - /* 16 bits when computing the extrema (the zeros need to */ - /* be in 0..1 exclusive to be considered part of the arc). */ - - if ( t1 == 0 ) /* all coefficients are 0! */ - return; - - if ( t1 > 0x7FFFFFUL ) - { - do - { - shift++; - t1 >>= 1; - - } while ( t1 > 0x7FFFFFUL ); - - /* this loses some bits of precision, but we use 24 of them */ - /* for the computation anyway */ - a >>= shift; - b >>= shift; - c >>= shift; - } - else if ( t1 < 0x400000UL ) - { - do - { - shift++; - t1 <<= 1; - - } while ( t1 < 0x400000UL ); - - a <<= shift; - b <<= shift; - c <<= shift; - } - } - - /* handle a == 0 */ - if ( a == 0 ) - { - if ( b != 0 ) - { - t = - FT_DivFix( c, b ) / 2; - test_cubic_extrema( y1, y2, y3, y4, t, min, max ); - } - } - else - { - /* solve the equation now */ - d = FT_MulFix( b, b ) - FT_MulFix( a, c ); - if ( d < 0 ) - return; - - if ( d == 0 ) - { - /* there is a single split point at -b/a */ - t = - FT_DivFix( b, a ); - test_cubic_extrema( y1, y2, y3, y4, t, min, max ); - } - else - { - /* there are two solutions; we need to filter them */ - d = FT_SqrtFixed( (FT_Int32)d ); - t = - FT_DivFix( b - d, a ); - test_cubic_extrema( y1, y2, y3, y4, t, min, max ); - - t = - FT_DivFix( b + d, a ); - test_cubic_extrema( y1, y2, y3, y4, t, min, max ); - } - } - } + /* now flip the signs to update the minimum */ + if ( p2 < *min || p3 < *min ) + *min -= cubic_peak( *min - p1, *min - p2, *min - p3, *min - p4 ); } -#endif - /*************************************************************************/ /* */ @@ -534,8 +392,9 @@ FT_Vector* to, TBBox_Rec* user ) { - /* we don't need to check `to' since it is always an `on' point, thus */ - /* within the bbox */ + /* We don't need to check `to' since it is always an on-point, */ + /* thus within the bbox. Only segments with an off-point outside */ + /* the bbox can possibly reach new extreme values. */ if ( CHECK_X( control1, user->bbox ) || CHECK_X( control2, user->bbox ) ) @@ -560,31 +419,35 @@ return 0; } -FT_DEFINE_OUTLINE_FUNCS(bbox_interface, + + FT_DEFINE_OUTLINE_FUNCS(bbox_interface, (FT_Outline_MoveTo_Func) BBox_Move_To, - (FT_Outline_LineTo_Func) BBox_Move_To, + (FT_Outline_LineTo_Func) BBox_Line_To, (FT_Outline_ConicTo_Func)BBox_Conic_To, (FT_Outline_CubicTo_Func)BBox_Cubic_To, 0, 0 ) + /* documentation is in ftbbox.h */ FT_EXPORT_DEF( FT_Error ) FT_Outline_Get_BBox( FT_Outline* outline, FT_BBox *abbox ) { - FT_BBox cbox; - FT_BBox bbox; + FT_BBox cbox = { 0x7FFFFFFFL, 0x7FFFFFFFL, + -0x7FFFFFFFL, -0x7FFFFFFFL }; + FT_BBox bbox = { 0x7FFFFFFFL, 0x7FFFFFFFL, + -0x7FFFFFFFL, -0x7FFFFFFFL }; FT_Vector* vec; FT_UShort n; if ( !abbox ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); if ( !outline ) - return FT_Err_Invalid_Outline; + return FT_THROW( Invalid_Outline ); /* if outline is empty, return (0,0,0,0) */ if ( outline->n_points == 0 || outline->n_contours <= 0 ) @@ -599,32 +462,13 @@ FT_DEFINE_OUTLINE_FUNCS(bbox_interface, /* coincide, we exit immediately. */ vec = outline->points; - bbox.xMin = bbox.xMax = cbox.xMin = cbox.xMax = vec->x; - bbox.yMin = bbox.yMax = cbox.yMin = cbox.yMax = vec->y; - vec++; - for ( n = 1; n < outline->n_points; n++ ) + for ( n = 0; n < outline->n_points; n++ ) { - FT_Pos x = vec->x; - FT_Pos y = vec->y; - - - /* update control box */ - if ( x < cbox.xMin ) cbox.xMin = x; - if ( x > cbox.xMax ) cbox.xMax = x; - - if ( y < cbox.yMin ) cbox.yMin = y; - if ( y > cbox.yMax ) cbox.yMax = y; + FT_UPDATE_BBOX( vec, cbox); if ( FT_CURVE_TAG( outline->tags[n] ) == FT_CURVE_TAG_ON ) - { - /* update bbox for `on' points only */ - if ( x < bbox.xMin ) bbox.xMin = x; - if ( x > bbox.xMax ) bbox.xMax = x; - - if ( y < bbox.yMin ) bbox.yMin = y; - if ( y > bbox.yMax ) bbox.yMax = y; - } + FT_UPDATE_BBOX( vec, bbox); vec++; } diff --git a/src/base/ftbdf.c b/src/base/ftbdf.c index d29adf0..d9dcbad 100644 --- a/src/base/ftbdf.c +++ b/src/base/ftbdf.c @@ -4,7 +4,7 @@ /* */ /* FreeType API for accessing BDF-specific strings (body). */ /* */ -/* Copyright 2002, 2003, 2004 by */ +/* Copyright 2002-2004, 2013, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -17,6 +17,8 @@ #include <ft2build.h> +#include FT_INTERNAL_DEBUG_H + #include FT_INTERNAL_OBJECTS_H #include FT_SERVICE_BDF_H @@ -32,19 +34,18 @@ const char* encoding = NULL; const char* registry = NULL; + FT_Service_BDF service; - error = FT_Err_Invalid_Argument; - - if ( face ) - { - FT_Service_BDF service; + if ( !face ) + return FT_THROW( Invalid_Face_Handle ); - FT_FACE_FIND_SERVICE( face, service, BDF ); + FT_FACE_FIND_SERVICE( face, service, BDF ); - if ( service && service->get_charset_id ) - error = service->get_charset_id( face, &encoding, ®istry ); - } + if ( service && service->get_charset_id ) + error = service->get_charset_id( face, &encoding, ®istry ); + else + error = FT_THROW( Invalid_Argument ); if ( acharset_encoding ) *acharset_encoding = encoding; @@ -65,23 +66,25 @@ { FT_Error error; + FT_Service_BDF service; - error = FT_Err_Invalid_Argument; - aproperty->type = BDF_PROPERTY_TYPE_NONE; + if ( !face ) + return FT_THROW( Invalid_Face_Handle ); - if ( face ) - { - FT_Service_BDF service; + if ( !aproperty ) + return FT_THROW( Invalid_Argument ); + aproperty->type = BDF_PROPERTY_TYPE_NONE; - FT_FACE_FIND_SERVICE( face, service, BDF ); + FT_FACE_FIND_SERVICE( face, service, BDF ); - if ( service && service->get_property ) - error = service->get_property( face, prop_name, aproperty ); - } + if ( service && service->get_property ) + error = service->get_property( face, prop_name, aproperty ); + else + error = FT_THROW( Invalid_Argument ); - return error; + return error; } diff --git a/src/base/ftbitmap.c b/src/base/ftbitmap.c index 84fa322..19a1a80 100644 --- a/src/base/ftbitmap.c +++ b/src/base/ftbitmap.c @@ -4,7 +4,7 @@ /* */ /* FreeType utility functions for bitmaps (body). */ /* */ -/* Copyright 2004-2009, 2011 by */ +/* Copyright 2004-2009, 2011, 2013, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -17,6 +17,8 @@ #include <ft2build.h> +#include FT_INTERNAL_DEBUG_H + #include FT_BITMAP_H #include FT_IMAGE_H #include FT_INTERNAL_OBJECTS_H @@ -31,7 +33,8 @@ FT_EXPORT_DEF( void ) FT_Bitmap_New( FT_Bitmap *abitmap ) { - *abitmap = null_bitmap; + if ( abitmap ) + *abitmap = null_bitmap; } @@ -42,25 +45,42 @@ const FT_Bitmap *source, FT_Bitmap *target) { - FT_Memory memory = library->memory; + FT_Memory memory; FT_Error error = FT_Err_Ok; - FT_Int pitch = source->pitch; - FT_ULong size; + + FT_Int pitch; + FT_ULong size; + + FT_Int source_pitch_sign, target_pitch_sign; + if ( !library ) + return FT_THROW( Invalid_Library_Handle ); + + if ( !source || !target ) + return FT_THROW( Invalid_Argument ); + if ( source == target ) return FT_Err_Ok; + source_pitch_sign = source->pitch < 0 ? -1 : 1; + target_pitch_sign = target->pitch < 0 ? -1 : 1; + if ( source->buffer == NULL ) { *target = *source; + if ( source_pitch_sign != target_pitch_sign ) + target->pitch = -target->pitch; return FT_Err_Ok; } + memory = library->memory; + pitch = source->pitch; + if ( pitch < 0 ) pitch = -pitch; - size = (FT_ULong)( pitch * source->rows ); + size = (FT_ULong)pitch * source->rows; if ( target->buffer ) { @@ -68,9 +88,9 @@ FT_ULong target_size; - if ( target_pitch < 0 ) + if ( target_pitch < 0 ) target_pitch = -target_pitch; - target_size = (FT_ULong)( target_pitch * target->rows ); + target_size = (FT_ULong)target_pitch * target->rows; if ( target_size != size ) (void)FT_QREALLOC( target->buffer, target_size, size ); @@ -87,13 +107,35 @@ *target = *source; target->buffer = p; - FT_MEM_COPY( target->buffer, source->buffer, size ); + if ( source_pitch_sign == target_pitch_sign ) + FT_MEM_COPY( target->buffer, source->buffer, size ); + else + { + /* take care of bitmap flow */ + FT_UInt i; + FT_Byte* s = source->buffer; + FT_Byte* t = target->buffer; + + + t += pitch * ( target->rows - 1 ); + + for ( i = target->rows; i > 0; i-- ) + { + FT_ARRAY_COPY( t, s, pitch ); + + s += pitch; + t -= pitch; + } + } } return error; } + /* Enlarge `bitmap' horizontally and vertically by `xpixels' */ + /* and `ypixels', respectively. */ + static FT_Error ft_bitmap_assure_buffer( FT_Memory memory, FT_Bitmap* bitmap, @@ -104,7 +146,7 @@ int pitch; int new_pitch; FT_UInt bpp; - FT_Int i, width, height; + FT_UInt i, width, height; unsigned char* buffer = NULL; @@ -135,24 +177,24 @@ new_pitch = ( width + xpixels ); break; default: - return FT_Err_Invalid_Glyph_Format; + return FT_THROW( Invalid_Glyph_Format ); } /* if no need to allocate memory */ if ( ypixels == 0 && new_pitch <= pitch ) { /* zero the padding */ - FT_Int bit_width = pitch * 8; - FT_Int bit_last = ( width + xpixels ) * bpp; + FT_UInt bit_width = pitch * 8; + FT_UInt bit_last = ( width + xpixels ) * bpp; if ( bit_last < bit_width ) { FT_Byte* line = bitmap->buffer + ( bit_last >> 3 ); FT_Byte* end = bitmap->buffer + pitch; - FT_Int shift = bit_last & 7; + FT_UInt shift = bit_last & 7; FT_UInt mask = 0xFF00U >> shift; - FT_Int count = height; + FT_UInt count = height; for ( ; count > 0; count--, line += pitch, end += pitch ) @@ -166,19 +208,22 @@ write++; } if ( write < end ) - FT_MEM_ZERO( write, end-write ); + FT_MEM_ZERO( write, end - write ); } } return FT_Err_Ok; } + /* otherwise allocate new buffer */ if ( FT_QALLOC_MULT( buffer, new_pitch, bitmap->rows + ypixels ) ) return error; + /* new rows get added at the top of the bitmap, */ + /* thus take care of the flow direction */ if ( bitmap->pitch > 0 ) { - FT_Int len = ( width * bpp + 7 ) >> 3; + FT_UInt len = ( width * bpp + 7 ) >> 3; for ( i = 0; i < bitmap->rows; i++ ) @@ -187,7 +232,7 @@ } else { - FT_Int len = ( width * bpp + 7 ) >> 3; + FT_UInt len = ( width * bpp + 7 ) >> 3; for ( i = 0; i < bitmap->rows; i++ ) @@ -218,19 +263,20 @@ { FT_Error error; unsigned char* p; - FT_Int i, x, y, pitch; + FT_Int i, x, pitch; + FT_UInt y; FT_Int xstr, ystr; if ( !library ) - return FT_Err_Invalid_Library_Handle; + return FT_THROW( Invalid_Library_Handle ); if ( !bitmap || !bitmap->buffer ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); if ( ( ( FT_PIX_ROUND( xStrength ) >> 6 ) > FT_INT_MAX ) || ( ( FT_PIX_ROUND( yStrength ) >> 6 ) > FT_INT_MAX ) ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); xstr = (FT_Int)FT_PIX_ROUND( xStrength ) >> 6; ystr = (FT_Int)FT_PIX_ROUND( yStrength ) >> 6; @@ -238,7 +284,7 @@ if ( xstr == 0 && ystr == 0 ) return FT_Err_Ok; else if ( xstr < 0 || ystr < 0 ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); switch ( bitmap->pixel_mode ) { @@ -246,17 +292,11 @@ case FT_PIXEL_MODE_GRAY4: { FT_Bitmap tmp; - FT_Int align; - - if ( bitmap->pixel_mode == FT_PIXEL_MODE_GRAY2 ) - align = ( bitmap->width + xstr + 3 ) / 4; - else - align = ( bitmap->width + xstr + 1 ) / 2; + /* convert to 8bpp */ FT_Bitmap_New( &tmp ); - - error = FT_Bitmap_Convert( library, bitmap, &tmp, align ); + error = FT_Bitmap_Convert( library, bitmap, &tmp, 1 ); if ( error ) return error; @@ -277,12 +317,17 @@ case FT_PIXEL_MODE_LCD_V: ystr *= 3; break; + + case FT_PIXEL_MODE_BGRA: + /* We don't embolden color glyphs. */ + return FT_Err_Ok; } error = ft_bitmap_assure_buffer( library->memory, bitmap, xstr, ystr ); if ( error ) return error; + /* take care of bitmap flow */ pitch = bitmap->pitch; if ( pitch > 0 ) p = bitmap->buffer + pitch * ystr; @@ -303,7 +348,7 @@ */ for ( x = pitch - 1; x >= 0; x-- ) { - unsigned char tmp; + unsigned char tmp; tmp = p[x]; @@ -318,7 +363,7 @@ p[x] |= p[x - 1] << ( 8 - i ); #if 0 - if ( p[x] == 0xff ) + if ( p[x] == 0xFF ) break; #endif } @@ -328,12 +373,12 @@ { if ( p[x] + p[x - i] > bitmap->num_grays - 1 ) { - p[x] = (unsigned char)(bitmap->num_grays - 1); + p[x] = (unsigned char)( bitmap->num_grays - 1 ); break; } else { - p[x] = (unsigned char)(p[x] + p[x-i]); + p[x] = (unsigned char)( p[x] + p[x - i] ); if ( p[x] == bitmap->num_grays - 1 ) break; } @@ -369,6 +414,52 @@ } + static FT_Byte + ft_gray_for_premultiplied_srgb_bgra( const FT_Byte* bgra ) + { + FT_UInt a = bgra[3]; + FT_UInt l; + + + /* Short-circuit transparent color to avoid division by zero. */ + if ( !a ) + return 0; + + /* + * Luminosity for sRGB is defined using ~0.2126,0.7152,0.0722 + * coefficients for RGB channels *on the linear colors*. + * A gamma of 2.2 is fair to assume. And then, we need to + * undo the premultiplication too. + * + * http://accessibility.kde.org/hsl-adjusted.php + * + * We do the computation with integers only, applying a gamma of 2.0. + * We guarantee 32-bit arithmetic to avoid overflow but the resulting + * luminosity fits into 16 bits. + * + */ + + l = ( 4732UL /* 0.0722 * 65536 */ * bgra[0] * bgra[0] + + 46871UL /* 0.7152 * 65536 */ * bgra[1] * bgra[1] + + 13933UL /* 0.2126 * 65536 */ * bgra[2] * bgra[2] ) >> 16; + + /* + * Final transparency can be determined as follows. + * + * - If alpha is zero, we want 0. + * - If alpha is zero and luminosity is zero, we want 255. + * - If alpha is zero and luminosity is one, we want 0. + * + * So the formula is a * (1 - l) = a - l * a. + * + * We still need to undo premultiplication by dividing l by a*a. + * + */ + + return (FT_Byte)( a - l / a ); + } + + /* documentation is in ftbitmap.h */ FT_EXPORT_DEF( FT_Error ) @@ -380,9 +471,15 @@ FT_Error error = FT_Err_Ok; FT_Memory memory; + FT_Byte* s; + FT_Byte* t; + if ( !library ) - return FT_Err_Invalid_Library_Handle; + return FT_THROW( Invalid_Library_Handle ); + + if ( !source || !target ) + return FT_THROW( Invalid_Argument ); memory = library->memory; @@ -394,14 +491,17 @@ case FT_PIXEL_MODE_GRAY4: case FT_PIXEL_MODE_LCD: case FT_PIXEL_MODE_LCD_V: + case FT_PIXEL_MODE_BGRA: { - FT_Int pad; - FT_Long old_size; + FT_Int pad, old_target_pitch, target_pitch; + FT_ULong old_size; + + old_target_pitch = target->pitch; + if ( old_target_pitch < 0 ) + old_target_pitch = -old_target_pitch; - old_size = target->rows * target->pitch; - if ( old_size < 0 ) - old_size = -old_size; + old_size = target->rows * old_target_pitch; target->pixel_mode = FT_PIXEL_MODE_GRAY; target->rows = source->rows; @@ -415,30 +515,39 @@ pad = alignment - pad; } - target->pitch = source->width + pad; + target_pitch = source->width + pad; - if ( target->pitch > 0 && - (FT_ULong)target->rows > FT_ULONG_MAX / target->pitch ) - return FT_Err_Invalid_Argument; + if ( target_pitch > 0 && + (FT_ULong)target->rows > FT_ULONG_MAX / target_pitch ) + return FT_THROW( Invalid_Argument ); - if ( target->rows * target->pitch > old_size && + if ( target->rows * target_pitch > old_size && FT_QREALLOC( target->buffer, - old_size, target->rows * target->pitch ) ) + old_size, target->rows * target_pitch ) ) return error; + + target->pitch = target->pitch < 0 ? -target_pitch : target_pitch; } break; default: - error = FT_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); } + s = source->buffer; + t = target->buffer; + + /* take care of bitmap flow */ + if ( source->pitch < 0 ) + s -= source->pitch * ( source->rows - 1 ); + if ( target->pitch < 0 ) + t -= target->pitch * ( target->rows - 1 ); + switch ( source->pixel_mode ) { case FT_PIXEL_MODE_MONO: { - FT_Byte* s = source->buffer; - FT_Byte* t = target->buffer; - FT_Int i; + FT_UInt i; target->num_grays = 2; @@ -447,7 +556,7 @@ { FT_Byte* ss = s; FT_Byte* tt = t; - FT_Int j; + FT_UInt j; /* get the full bytes */ @@ -495,12 +604,8 @@ case FT_PIXEL_MODE_LCD: case FT_PIXEL_MODE_LCD_V: { - FT_Int width = source->width; - FT_Byte* s = source->buffer; - FT_Byte* t = target->buffer; - FT_Int s_pitch = source->pitch; - FT_Int t_pitch = target->pitch; - FT_Int i; + FT_Int width = source->width; + FT_UInt i; target->num_grays = 256; @@ -509,8 +614,8 @@ { FT_ARRAY_COPY( t, s, width ); - s += s_pitch; - t += t_pitch; + s += source->pitch; + t += target->pitch; } } break; @@ -518,9 +623,7 @@ case FT_PIXEL_MODE_GRAY2: { - FT_Byte* s = source->buffer; - FT_Byte* t = target->buffer; - FT_Int i; + FT_UInt i; target->num_grays = 4; @@ -529,7 +632,7 @@ { FT_Byte* ss = s; FT_Byte* tt = t; - FT_Int j; + FT_UInt j; /* get the full bytes */ @@ -570,9 +673,7 @@ case FT_PIXEL_MODE_GRAY4: { - FT_Byte* s = source->buffer; - FT_Byte* t = target->buffer; - FT_Int i; + FT_UInt i; target->num_grays = 16; @@ -581,7 +682,7 @@ { FT_Byte* ss = s; FT_Byte* tt = t; - FT_Int j; + FT_UInt j; /* get the full bytes */ @@ -607,6 +708,34 @@ break; + case FT_PIXEL_MODE_BGRA: + { + FT_UInt i; + + + target->num_grays = 256; + + for ( i = source->rows; i > 0; i-- ) + { + FT_Byte* ss = s; + FT_Byte* tt = t; + FT_UInt j; + + + for ( j = source->width; j > 0; j-- ) + { + tt[0] = ft_gray_for_premultiplied_srgb_bgra( ss ); + + ss += 4; + tt += 1; + } + + s += source->pitch; + t += target->pitch; + } + } + break; + default: ; } @@ -650,10 +779,10 @@ if ( !library ) - return FT_Err_Invalid_Library_Handle; + return FT_THROW( Invalid_Library_Handle ); if ( !bitmap ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); memory = library->memory; diff --git a/src/base/ftcalc.c b/src/base/ftcalc.c index 2aeea04..57f7968 100644 --- a/src/base/ftcalc.c +++ b/src/base/ftcalc.c @@ -4,7 +4,7 @@ /* */ /* Arithmetic computations (body). */ /* */ -/* Copyright 1996-2006, 2008, 2012 by */ +/* Copyright 1996-2006, 2008, 2012-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -34,21 +34,19 @@ #include <ft2build.h> #include FT_GLYPH_H +#include FT_TRIGONOMETRY_H #include FT_INTERNAL_CALC_H #include FT_INTERNAL_DEBUG_H #include FT_INTERNAL_OBJECTS_H -#ifdef FT_MULFIX_INLINED + +#ifdef FT_MULFIX_ASSEMBLER #undef FT_MulFix #endif -/* we need to define a 64-bits data type here */ - -#ifdef FT_LONG64 - - typedef FT_INT64 FT_Int64; +/* we need to emulate a 64-bit data type if a real one isn't available */ -#else +#ifndef FT_LONG64 typedef struct FT_Int64_ { @@ -57,7 +55,7 @@ } FT_Int64; -#endif /* FT_LONG64 */ +#endif /* !FT_LONG64 */ /*************************************************************************/ @@ -70,6 +68,16 @@ #define FT_COMPONENT trace_calc + /* transfer sign leaving a positive number */ +#define FT_MOVE_SIGN( x, s ) \ + FT_BEGIN_STMNT \ + if ( x < 0 ) \ + { \ + x = -x; \ + s = -s; \ + } \ + FT_END_STMNT + /* The following three functions are available regardless of whether */ /* FT_LONG64 is defined. */ @@ -78,8 +86,8 @@ FT_EXPORT_DEF( FT_Fixed ) FT_RoundFix( FT_Fixed a ) { - return ( a >= 0 ) ? ( a + 0x8000L ) & ~0xFFFFL - : -((-a + 0x8000L ) & ~0xFFFFL ); + return a >= 0 ? ( a + 0x8000L ) & ~0xFFFFL + : -((-a + 0x8000L ) & ~0xFFFFL ); } @@ -88,8 +96,8 @@ FT_EXPORT_DEF( FT_Fixed ) FT_CeilFix( FT_Fixed a ) { - return ( a >= 0 ) ? ( a + 0xFFFFL ) & ~0xFFFFL - : -((-a + 0xFFFFL ) & ~0xFFFFL ); + return a >= 0 ? ( a + 0xFFFFL ) & ~0xFFFFL + : -((-a + 0xFFFFL ) & ~0xFFFFL ); } @@ -98,43 +106,65 @@ FT_EXPORT_DEF( FT_Fixed ) FT_FloorFix( FT_Fixed a ) { - return ( a >= 0 ) ? a & ~0xFFFFL - : -((-a) & ~0xFFFFL ); + return a >= 0 ? a & ~0xFFFFL + : -((-a) & ~0xFFFFL ); } +#ifndef FT_MSB -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS + FT_BASE_DEF ( FT_Int ) + FT_MSB( FT_UInt32 z ) + { + FT_Int shift = 0; - /* documentation is in ftcalc.h */ - FT_EXPORT_DEF( FT_Int32 ) - FT_Sqrt32( FT_Int32 x ) - { - FT_UInt32 val, root, newroot, mask; + /* determine msb bit index in `shift' */ + if ( z & 0xFFFF0000UL ) + { + z >>= 16; + shift += 16; + } + if ( z & 0x0000FF00UL ) + { + z >>= 8; + shift += 8; + } + if ( z & 0x000000F0UL ) + { + z >>= 4; + shift += 4; + } + if ( z & 0x0000000CUL ) + { + z >>= 2; + shift += 2; + } + if ( z & 0x00000002UL ) + { + /* z >>= 1; */ + shift += 1; + } + return shift; + } - root = 0; - mask = (FT_UInt32)0x40000000UL; - val = (FT_UInt32)x; +#endif /* !FT_MSB */ - do - { - newroot = root + mask; - if ( newroot <= val ) - { - val -= newroot; - root = newroot + mask; - } - root >>= 1; - mask >>= 2; + /* documentation is in ftcalc.h */ - } while ( mask != 0 ); + FT_BASE_DEF( FT_Fixed ) + FT_Hypot( FT_Fixed x, + FT_Fixed y ) + { + FT_Vector v; - return root; - } -#endif /* FT_CONFIG_OPTION_OLD_INTERNALS */ + v.x = x; + v.y = y; + + return FT_Vector_Length( &v ); + } #ifdef FT_LONG64 @@ -147,24 +177,21 @@ FT_Long b, FT_Long c ) { - FT_Int s; + FT_Int s = 1; FT_Long d; - s = 1; - if ( a < 0 ) { a = -a; s = -1; } - if ( b < 0 ) { b = -b; s = -s; } - if ( c < 0 ) { c = -c; s = -s; } + FT_MOVE_SIGN( a, s ); + FT_MOVE_SIGN( b, s ); + FT_MOVE_SIGN( c, s ); d = (FT_Long)( c > 0 ? ( (FT_Int64)a * b + ( c >> 1 ) ) / c : 0x7FFFFFFFL ); - return ( s > 0 ) ? d : -d; + return s < 0 ? -d : d; } -#ifdef TT_USE_BYTECODE_INTERPRETER - /* documentation is in ftcalc.h */ FT_BASE_DEF( FT_Long ) @@ -172,23 +199,20 @@ FT_Long b, FT_Long c ) { - FT_Int s; + FT_Int s = 1; FT_Long d; - s = 1; - if ( a < 0 ) { a = -a; s = -1; } - if ( b < 0 ) { b = -b; s = -s; } - if ( c < 0 ) { c = -c; s = -s; } + FT_MOVE_SIGN( a, s ); + FT_MOVE_SIGN( b, s ); + FT_MOVE_SIGN( c, s ); d = (FT_Long)( c > 0 ? (FT_Int64)a * b / c : 0x7FFFFFFFL ); - return ( s > 0 ) ? d : -d; + return s < 0 ? -d : d; } -#endif /* TT_USE_BYTECODE_INTERPRETER */ - /* documentation is in freetype.h */ @@ -206,21 +230,12 @@ FT_Long c; - if ( a < 0 ) - { - a = -a; - s = -1; - } - - if ( b < 0 ) - { - b = -b; - s = -s; - } + FT_MOVE_SIGN( a, s ); + FT_MOVE_SIGN( b, s ); c = (FT_Long)( ( (FT_Int64)a * b + 0x8000L ) >> 16 ); - return ( s > 0 ) ? c : -c; + return s < 0 ? -c : c; #endif /* FT_MULFIX_ASSEMBLER */ } @@ -232,21 +247,17 @@ FT_DivFix( FT_Long a, FT_Long b ) { - FT_Int32 s; - FT_UInt32 q; + FT_Int s = 1; + FT_Long q; - s = 1; - if ( a < 0 ) { a = -a; s = -1; } - if ( b < 0 ) { b = -b; s = -s; } - if ( b == 0 ) - /* check for division by 0 */ - q = 0x7FFFFFFFL; - else - /* compute result directly */ - q = (FT_UInt32)( ( ( (FT_Int64)a << 16 ) + ( b >> 1 ) ) / b ); + FT_MOVE_SIGN( a, s ); + FT_MOVE_SIGN( b, s ); - return ( s < 0 ? -(FT_Long)q : (FT_Long)q ); + q = (FT_Long)( b > 0 ? ( ( (FT_UInt64)a << 16 ) + ( b >> 1 ) ) / b + : 0x7FFFFFFFL ); + + return s < 0 ? -q : q; } @@ -294,25 +305,30 @@ FT_Int i; - q = 0; - r = hi; - - if ( r >= y ) + if ( hi >= y ) return (FT_UInt32)0x7FFFFFFFL; - i = 32; + /* We shift as many bits as we can into the high register, perform */ + /* 32-bit division with modulo there, then work through the remaining */ + /* bits with long division. This optimization is especially noticeable */ + /* for smaller dividends that barely use the high register. */ + + i = 31 - FT_MSB( hi ); + r = ( hi << i ) | ( lo >> ( 32 - i ) ); lo <<= i; /* left 64-bit shift */ + q = r / y; + r -= q * y; /* remainder */ + + i = 32 - i; /* bits remaining in low register */ do { - r <<= 1; q <<= 1; - r |= lo >> 31; + r = ( r << 1 ) | ( lo >> 31 ); lo <<= 1; if ( r >= y ) { r -= y; q |= 1; } - lo <<= 1; } while ( --i ); return q; @@ -324,7 +340,7 @@ FT_Int64* y, FT_Int64 *z ) { - register FT_UInt32 lo, hi; + FT_UInt32 lo, hi; lo = x->lo + y->lo; @@ -335,99 +351,134 @@ } - /* documentation is in freetype.h */ - - /* The FT_MulDiv function has been optimized thanks to ideas from */ - /* Graham Asher. The trick is to optimize computation when everything */ - /* fits within 32-bits (a rather common case). */ + /* The FT_MulDiv function has been optimized thanks to ideas from */ + /* Graham Asher and Alexei Podtelezhnikov. The trick is to optimize */ + /* a rather common case when everything fits within 32-bits. */ + /* */ + /* We compute 'a*b+c/2', then divide it by 'c' (all positive values). */ + /* */ + /* The product of two positive numbers never exceeds the square of */ + /* its mean values. Therefore, we always avoid the overflow by */ + /* imposing */ + /* */ + /* (a + b) / 2 <= sqrt(X - c/2) , */ /* */ - /* we compute 'a*b+c/2', then divide it by 'c'. (positive values) */ + /* where X = 2^32 - 1, the maximum unsigned 32-bit value, and using */ + /* unsigned arithmetic. Now we replace `sqrt' with a linear function */ + /* that is smaller or equal for all values of c in the interval */ + /* [0;X/2]; it should be equal to sqrt(X) and sqrt(3X/4) at the */ + /* endpoints. Substituting the linear solution and explicit numbers */ + /* we get */ /* */ - /* 46340 is FLOOR(SQRT(2^31-1)). */ + /* a + b <= 131071.99 - c / 122291.84 . */ /* */ - /* if ( a <= 46340 && b <= 46340 ) then ( a*b <= 0x7FFEA810 ) */ + /* In practice, we should use a faster and even stronger inequality */ /* */ - /* 0x7FFFFFFF - 0x7FFEA810 = 0x157F0 */ + /* a + b <= 131071 - (c >> 16) */ /* */ - /* if ( c < 0x157F0*2 ) then ( a*b+c/2 <= 0x7FFFFFFF ) */ + /* or, alternatively, */ /* */ - /* and 2*0x157F0 = 176096 */ + /* a + b <= 129894 - (c >> 17) . */ /* */ + /* FT_MulFix, on the other hand, is optimized for a small value of */ + /* the first argument, when the second argument can be much larger. */ + /* This can be achieved by scaling the second argument and the limit */ + /* in the above inequalities. For example, */ + /* */ + /* a + (b >> 8) <= (131071 >> 4) */ + /* */ + /* covers the practical range of use. The actual test below is a bit */ + /* tighter to avoid the border case overflows. */ + /* */ + /* In the case of FT_DivFix, the exact overflow check */ + /* */ + /* a << 16 <= X - c/2 */ + /* */ + /* is scaled down by 2^16 and we use */ + /* */ + /* a <= 65535 - (c >> 17) . */ + + /* documentation is in freetype.h */ FT_EXPORT_DEF( FT_Long ) FT_MulDiv( FT_Long a, FT_Long b, FT_Long c ) { - long s; + FT_Int s = 1; /* XXX: this function does not allow 64-bit arguments */ if ( a == 0 || b == c ) return a; - s = a; a = FT_ABS( a ); - s ^= b; b = FT_ABS( b ); - s ^= c; c = FT_ABS( c ); + FT_MOVE_SIGN( a, s ); + FT_MOVE_SIGN( b, s ); + FT_MOVE_SIGN( c, s ); + + if ( c == 0 ) + a = 0x7FFFFFFFL; - if ( a <= 46340L && b <= 46340L && c <= 176095L && c > 0 ) - a = ( a * b + ( c >> 1 ) ) / c; + else if ( (FT_ULong)a + b <= 129894UL - ( c >> 17 ) ) + a = ( (FT_ULong)a * b + ( c >> 1 ) ) / c; - else if ( (FT_Int32)c > 0 ) + else { FT_Int64 temp, temp2; - ft_multo64( (FT_Int32)a, (FT_Int32)b, &temp ); + ft_multo64( a, b, &temp ); temp2.hi = 0; - temp2.lo = (FT_UInt32)(c >> 1); + temp2.lo = c >> 1; + FT_Add64( &temp, &temp2, &temp ); - a = ft_div64by32( temp.hi, temp.lo, (FT_Int32)c ); + + /* last attempt to ditch long division */ + a = temp.hi == 0 ? temp.lo / c + : ft_div64by32( temp.hi, temp.lo, c ); } - else - a = 0x7FFFFFFFL; - return ( s < 0 ? -a : a ); + return s < 0 ? -a : a; } -#ifdef TT_USE_BYTECODE_INTERPRETER - FT_BASE_DEF( FT_Long ) FT_MulDiv_No_Round( FT_Long a, FT_Long b, FT_Long c ) { - long s; + FT_Int s = 1; if ( a == 0 || b == c ) return a; - s = a; a = FT_ABS( a ); - s ^= b; b = FT_ABS( b ); - s ^= c; c = FT_ABS( c ); + FT_MOVE_SIGN( a, s ); + FT_MOVE_SIGN( b, s ); + FT_MOVE_SIGN( c, s ); + + if ( c == 0 ) + a = 0x7FFFFFFFL; - if ( a <= 46340L && b <= 46340L && c > 0 ) - a = a * b / c; + else if ( (FT_ULong)a + b <= 131071UL ) + a = (FT_ULong)a * b / c; - else if ( (FT_Int32)c > 0 ) + else { FT_Int64 temp; - ft_multo64( (FT_Int32)a, (FT_Int32)b, &temp ); - a = ft_div64by32( temp.hi, temp.lo, (FT_Int32)c ); + ft_multo64( a, b, &temp ); + + /* last attempt to ditch long division */ + a = temp.hi == 0 ? temp.lo / c + : ft_div64by32( temp.hi, temp.lo, c ); } - else - a = 0x7FFFFFFFL; - return ( s < 0 ? -a : a ); + return s < 0 ? -a : a; } -#endif /* TT_USE_BYTECODE_INTERPRETER */ - /* documentation is in freetype.h */ @@ -481,7 +532,7 @@ ua = (FT_ULong)a; ub = (FT_ULong)b; - if ( ua <= 2048 && ub <= 1048576L ) + if ( ua + ( ub >> 8 ) <= 8190UL ) ua = ( ua * ub + 0x8000U ) >> 16; else { @@ -499,20 +550,20 @@ #else /* 0 */ - FT_Long s; + FT_Int s = 1; FT_ULong ua, ub; if ( a == 0 || b == 0x10000L ) return a; - s = a; a = FT_ABS( a ); - s ^= b; b = FT_ABS( b ); + FT_MOVE_SIGN( a, s ); + FT_MOVE_SIGN( b, s ); ua = (FT_ULong)a; ub = (FT_ULong)b; - if ( ua <= 2048 && ub <= 1048576L ) + if ( ua + ( ub >> 8 ) <= 8190UL ) ua = ( ua * ub + 0x8000UL ) >> 16; else { @@ -523,7 +574,7 @@ ( ( al * ( ub & 0xFFFFUL ) + 0x8000UL ) >> 16 ); } - return ( s < 0 ? -(FT_Long)ua : (FT_Long)ua ); + return s < 0 ? -(FT_Long)ua : (FT_Long)ua; #endif /* 0 */ @@ -536,23 +587,24 @@ FT_DivFix( FT_Long a, FT_Long b ) { - FT_Int32 s; - FT_UInt32 q; + FT_Int s = 1; + FT_Long q; /* XXX: this function does not allow 64-bit arguments */ - s = (FT_Int32)a; a = FT_ABS( a ); - s ^= (FT_Int32)b; b = FT_ABS( b ); - if ( (FT_UInt32)b == 0 ) + FT_MOVE_SIGN( a, s ); + FT_MOVE_SIGN( b, s ); + + if ( b == 0 ) { /* check for division by 0 */ - q = (FT_UInt32)0x7FFFFFFFL; + q = 0x7FFFFFFFL; } - else if ( ( a >> 16 ) == 0 ) + else if ( a <= 65535L - ( b >> 17 ) ) { /* compute result directly */ - q = (FT_UInt32)( ( a << 16 ) + ( b >> 1 ) ) / (FT_UInt32)b; + q = (FT_Long)( ( ( (FT_ULong)a << 16 ) + ( b >> 1 ) ) / b ); } else { @@ -560,138 +612,18 @@ FT_Int64 temp, temp2; - temp.hi = (FT_Int32) ( a >> 16 ); - temp.lo = (FT_UInt32)( a << 16 ); + temp.hi = a >> 16; + temp.lo = a << 16; temp2.hi = 0; - temp2.lo = (FT_UInt32)( b >> 1 ); - FT_Add64( &temp, &temp2, &temp ); - q = ft_div64by32( temp.hi, temp.lo, (FT_Int32)b ); - } - - return ( s < 0 ? -(FT_Int32)q : (FT_Int32)q ); - } - - -#if 0 - - /* documentation is in ftcalc.h */ - - FT_EXPORT_DEF( void ) - FT_MulTo64( FT_Int32 x, - FT_Int32 y, - FT_Int64 *z ) - { - FT_Int32 s; - - - s = x; x = FT_ABS( x ); - s ^= y; y = FT_ABS( y ); - - ft_multo64( x, y, z ); - - if ( s < 0 ) - { - z->lo = (FT_UInt32)-(FT_Int32)z->lo; - z->hi = ~z->hi + !( z->lo ); - } - } - + temp2.lo = b >> 1; - /* apparently, the second version of this code is not compiled correctly */ - /* on Mac machines with the MPW C compiler.. tsk, tsk, tsk... */ - -#if 1 - - FT_EXPORT_DEF( FT_Int32 ) - FT_Div64by32( FT_Int64* x, - FT_Int32 y ) - { - FT_Int32 s; - FT_UInt32 q, r, i, lo; - - - s = x->hi; - if ( s < 0 ) - { - x->lo = (FT_UInt32)-(FT_Int32)x->lo; - x->hi = ~x->hi + !x->lo; - } - s ^= y; y = FT_ABS( y ); - - /* Shortcut */ - if ( x->hi == 0 ) - { - if ( y > 0 ) - q = x->lo / y; - else - q = 0x7FFFFFFFL; - - return ( s < 0 ? -(FT_Int32)q : (FT_Int32)q ); - } - - r = x->hi; - lo = x->lo; - - if ( r >= (FT_UInt32)y ) /* we know y is to be treated as unsigned here */ - return ( s < 0 ? 0x80000001UL : 0x7FFFFFFFUL ); - /* Return Max/Min Int32 if division overflow. */ - /* This includes division by zero! */ - q = 0; - for ( i = 0; i < 32; i++ ) - { - r <<= 1; - q <<= 1; - r |= lo >> 31; - - if ( r >= (FT_UInt32)y ) - { - r -= y; - q |= 1; - } - lo <<= 1; - } - - return ( s < 0 ? -(FT_Int32)q : (FT_Int32)q ); - } - -#else /* 0 */ - - FT_EXPORT_DEF( FT_Int32 ) - FT_Div64by32( FT_Int64* x, - FT_Int32 y ) - { - FT_Int32 s; - FT_UInt32 q; - - - s = x->hi; - if ( s < 0 ) - { - x->lo = (FT_UInt32)-(FT_Int32)x->lo; - x->hi = ~x->hi + !x->lo; - } - s ^= y; y = FT_ABS( y ); - - /* Shortcut */ - if ( x->hi == 0 ) - { - if ( y > 0 ) - q = ( x->lo + ( y >> 1 ) ) / y; - else - q = 0x7FFFFFFFL; - - return ( s < 0 ? -(FT_Int32)q : (FT_Int32)q ); + FT_Add64( &temp, &temp2, &temp ); + q = (FT_Long)ft_div64by32( temp.hi, temp.lo, b ); } - q = ft_div64by32( x->hi, x->lo, y ); - - return ( s < 0 ? -(FT_Int32)q : (FT_Int32)q ); + return s < 0 ? -q : q; } -#endif /* 0 */ - -#endif /* 0 */ - #endif /* FT_LONG64 */ @@ -727,14 +659,14 @@ if ( !matrix ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); /* compute discriminant */ delta = FT_MulFix( matrix->xx, matrix->yy ) - FT_MulFix( matrix->xy, matrix->yx ); if ( !delta ) - return FT_Err_Invalid_Argument; /* matrix can't be inverted */ + return FT_THROW( Invalid_Argument ); /* matrix can't be inverted */ matrix->xy = - FT_DivFix( matrix->xy, delta ); matrix->yx = - FT_DivFix( matrix->yx, delta ); @@ -800,6 +732,8 @@ } +#if 0 + /* documentation is in ftcalc.h */ FT_BASE_DEF( FT_Int32 ) @@ -834,6 +768,8 @@ return (FT_Int32)root; } +#endif /* 0 */ + /* documentation is in ftcalc.h */ @@ -923,35 +859,40 @@ FT_Pos out_x, FT_Pos out_y ) { - FT_Pos ax = in_x; - FT_Pos ay = in_y; - - FT_Pos d_in, d_out, d_corner; - - - if ( ax < 0 ) - ax = -ax; - if ( ay < 0 ) - ay = -ay; - d_in = ax + ay; - - ax = out_x; - if ( ax < 0 ) - ax = -ax; - ay = out_y; - if ( ay < 0 ) - ay = -ay; - d_out = ax + ay; - - ax = out_x + in_x; - if ( ax < 0 ) - ax = -ax; - ay = out_y + in_y; - if ( ay < 0 ) - ay = -ay; - d_corner = ax + ay; - - return ( d_in + d_out - d_corner ) < ( d_corner >> 4 ); + FT_Pos ax = in_x + out_x; + FT_Pos ay = in_y + out_y; + + FT_Pos d_in, d_out, d_hypot; + + + /* The idea of this function is to compare the length of the */ + /* hypotenuse with the `in' and `out' length. The `corner' */ + /* represented by `in' and `out' is flat if the hypotenuse's */ + /* length isn't too large. */ + /* */ + /* This approach has the advantage that the angle between */ + /* `in' and `out' is not checked. In case one of the two */ + /* vectors is `dominant', this is, much larger than the */ + /* other vector, we thus always have a flat corner. */ + /* */ + /* hypotenuse */ + /* x---------------------------x */ + /* \ / */ + /* \ / */ + /* in \ / out */ + /* \ / */ + /* o */ + /* Point */ + + d_in = FT_HYPOT( in_x, in_y ); + d_out = FT_HYPOT( out_x, out_y ); + d_hypot = FT_HYPOT( ax, ay ); + + /* now do a simple length comparison: */ + /* */ + /* d_in + d_out < 17/16 d_hypot */ + + return ( d_in + d_out - d_hypot ) < ( d_hypot >> 4 ); } diff --git a/src/base/ftcid.c b/src/base/ftcid.c index 733aae1..741879d 100644 --- a/src/base/ftcid.c +++ b/src/base/ftcid.c @@ -4,7 +4,7 @@ /* */ /* FreeType API for accessing CID font information. */ /* */ -/* Copyright 2007, 2009 by Derek Clegg, Michael Toftdal. */ +/* Copyright 2007, 2009, 2013 by Derek Clegg, Michael Toftdal. */ /* */ /* This file is part of the FreeType project, and may only be used, */ /* modified, and distributed under the terms of the FreeType project */ @@ -35,7 +35,7 @@ FT_Int s = 0; - error = FT_Err_Invalid_Argument; + error = FT_ERR( Invalid_Argument ); if ( face ) { @@ -65,7 +65,7 @@ FT_Get_CID_Is_Internally_CID_Keyed( FT_Face face, FT_Bool *is_cid ) { - FT_Error error = FT_Err_Invalid_Argument; + FT_Error error = FT_ERR( Invalid_Argument ); FT_Bool ic = 0; @@ -92,7 +92,7 @@ FT_UInt glyph_index, FT_UInt *cid ) { - FT_Error error = FT_Err_Invalid_Argument; + FT_Error error = FT_ERR( Invalid_Argument ); FT_UInt c = 0; diff --git a/src/base/ftdbgmem.c b/src/base/ftdbgmem.c index 12fed04..6fb86fe 100644 --- a/src/base/ftdbgmem.c +++ b/src/base/ftdbgmem.c @@ -4,7 +4,7 @@ /* */ /* Memory debugger (body). */ /* */ -/* Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2009 by */ +/* Copyright 2001-2006, 2009, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -344,85 +344,80 @@ ft_mem_table_destroy( FT_MemTable table ) { FT_ULong i; + FT_Long leak_count = 0; + FT_ULong leaks = 0; FT_DumpMemory( table->memory ); - if ( table ) + /* remove all blocks from the table, revealing leaked ones */ + for ( i = 0; i < table->size; i++ ) { - FT_Long leak_count = 0; - FT_ULong leaks = 0; + FT_MemNode *pnode = table->buckets + i, next, node = *pnode; - /* remove all blocks from the table, revealing leaked ones */ - for ( i = 0; i < table->size; i++ ) + while ( node ) { - FT_MemNode *pnode = table->buckets + i, next, node = *pnode; + next = node->link; + node->link = 0; - - while ( node ) + if ( node->size > 0 ) { - next = node->link; - node->link = 0; - - if ( node->size > 0 ) - { - printf( - "leaked memory block at address %p, size %8ld in (%s:%ld)\n", - node->address, node->size, - FT_FILENAME( node->source->file_name ), - node->source->line_no ); + printf( + "leaked memory block at address %p, size %8ld in (%s:%ld)\n", + node->address, node->size, + FT_FILENAME( node->source->file_name ), + node->source->line_no ); - leak_count++; - leaks += node->size; + leak_count++; + leaks += node->size; - ft_mem_table_free( table, node->address ); - } + ft_mem_table_free( table, node->address ); + } - node->address = NULL; - node->size = 0; + node->address = NULL; + node->size = 0; - ft_mem_table_free( table, node ); - node = next; - } - table->buckets[i] = 0; + ft_mem_table_free( table, node ); + node = next; } + table->buckets[i] = 0; + } - ft_mem_table_free( table, table->buckets ); - table->buckets = NULL; - - table->size = 0; - table->nodes = 0; + ft_mem_table_free( table, table->buckets ); + table->buckets = NULL; - /* remove all sources */ - for ( i = 0; i < FT_MEM_SOURCE_BUCKETS; i++ ) - { - FT_MemSource source, next; + table->size = 0; + table->nodes = 0; + /* remove all sources */ + for ( i = 0; i < FT_MEM_SOURCE_BUCKETS; i++ ) + { + FT_MemSource source, next; - for ( source = table->sources[i]; source != NULL; source = next ) - { - next = source->link; - ft_mem_table_free( table, source ); - } - table->sources[i] = NULL; + for ( source = table->sources[i]; source != NULL; source = next ) + { + next = source->link; + ft_mem_table_free( table, source ); } - printf( - "FreeType: total memory allocations = %ld\n", table->alloc_total ); - printf( - "FreeType: maximum memory footprint = %ld\n", table->alloc_max ); + table->sources[i] = NULL; + } - ft_mem_table_free( table, table ); + printf( "FreeType: total memory allocations = %ld\n", + table->alloc_total ); + printf( "FreeType: maximum memory footprint = %ld\n", + table->alloc_max ); - if ( leak_count > 0 ) - ft_mem_debug_panic( - "FreeType: %ld bytes of memory leaked in %ld blocks\n", - leaks, leak_count ); + ft_mem_table_free( table, table ); - printf( "FreeType: no memory leaks detected\n" ); - } + if ( leak_count > 0 ) + ft_mem_debug_panic( + "FreeType: %ld bytes of memory leaked in %ld blocks\n", + leaks, leak_count ); + + printf( "FreeType: no memory leaks detected\n" ); } diff --git a/src/base/ftdebug.c b/src/base/ftdebug.c index 2adbeab..39ac6ad 100644 --- a/src/base/ftdebug.c +++ b/src/base/ftdebug.c @@ -4,7 +4,7 @@ /* */ /* Debugging and logging component (body). */ /* */ -/* Copyright 1996-2001, 2002, 2004, 2008 by */ +/* Copyright 1996-2001, 2002, 2004, 2008, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -51,7 +51,8 @@ /* documentation is in ftdebug.h */ FT_BASE_DEF( void ) - FT_Message( const char* fmt, ... ) + FT_Message( const char* fmt, + ... ) { va_list ap; @@ -65,7 +66,8 @@ /* documentation is in ftdebug.h */ FT_BASE_DEF( void ) - FT_Panic( const char* fmt, ... ) + FT_Panic( const char* fmt, + ... ) { va_list ap; @@ -77,6 +79,21 @@ exit( EXIT_FAILURE ); } + + /* documentation is in ftdebug.h */ + + FT_BASE_DEF( int ) + FT_Throw( FT_Error error, + int line, + const char* file ) + { + FT_UNUSED( error ); + FT_UNUSED( line ); + FT_UNUSED( file ); + + return 0; + } + #endif /* FT_DEBUG_LEVEL_ERROR */ @@ -135,7 +152,7 @@ /* the memory and stream components which are set to 7 and 5, */ /* respectively. */ /* */ - /* See the file <include/freetype/internal/fttrace.h> for details of the */ + /* See the file <include/internal/fttrace.h> for details of the */ /* available toggle names. */ /* */ /* The level must be between 0 and 7; 0 means quiet (except for serious */ @@ -164,6 +181,9 @@ while ( *p && *p != ':' ) p++; + if ( !*p ) + break; + if ( *p == ':' && p > q ) { FT_Int n, i, len = (FT_Int)( p - q ); @@ -192,7 +212,7 @@ p++; if ( *p ) { - level = *p++ - '0'; + level = *p - '0'; if ( level < 0 || level > 7 ) level = -1; } diff --git a/src/base/ftfstype.c b/src/base/ftfstype.c index d0ef7b7..6b49ef8 100644 --- a/src/base/ftfstype.c +++ b/src/base/ftfstype.c @@ -4,7 +4,7 @@ /* */ /* FreeType utility file to access FSType data (body). */ /* */ -/* Copyright 2008, 2009 by */ +/* Copyright 2008, 2009, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -51,7 +51,7 @@ /* look at FSType before fsType for Type42 */ - if ( ( os2 = (TT_OS2*)FT_Get_Sfnt_Table( face, ft_sfnt_os2 ) ) != NULL && + if ( ( os2 = (TT_OS2*)FT_Get_Sfnt_Table( face, FT_SFNT_OS2 ) ) != NULL && os2->version != 0xFFFFU ) return os2->fsType; diff --git a/src/base/ftgloadr.c b/src/base/ftgloadr.c index 8483450..3cc5c7a 100644 --- a/src/base/ftgloadr.c +++ b/src/base/ftgloadr.c @@ -4,7 +4,7 @@ /* */ /* The FreeType glyph loader (body). */ /* */ -/* Copyright 2002, 2003, 2004, 2005, 2006, 2010 by */ +/* Copyright 2002-2006, 2010, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -17,6 +17,7 @@ #include <ft2build.h> +#include FT_INTERNAL_DEBUG_H #include FT_INTERNAL_GLYPH_LOADER_H #include FT_INTERNAL_MEMORY_H #include FT_INTERNAL_OBJECTS_H @@ -219,7 +220,7 @@ new_max = FT_PAD_CEIL( new_max, 8 ); if ( new_max > FT_OUTLINE_POINTS_MAX ) - return FT_Err_Array_Too_Large; + return FT_THROW( Array_Too_Large ); if ( FT_RENEW_ARRAY( base->points, old_max, new_max ) || FT_RENEW_ARRAY( base->tags, old_max, new_max ) ) @@ -251,7 +252,7 @@ new_max = FT_PAD_CEIL( new_max, 4 ); if ( new_max > FT_OUTLINE_CONTOURS_MAX ) - return FT_Err_Array_Too_Large; + return FT_THROW( Array_Too_Large ); if ( FT_RENEW_ARRAY( base->contours, old_max, new_max ) ) goto Exit; @@ -264,6 +265,9 @@ FT_GlyphLoader_Adjust_Points( loader ); Exit: + if ( error ) + FT_GlyphLoader_Reset( loader ); + return error; } @@ -318,7 +322,7 @@ } - /* add current glyph to the base image - and prepare for another */ + /* add current glyph to the base image -- and prepare for another */ FT_BASE_DEF( void ) FT_GlyphLoader_Add( FT_GlyphLoader loader ) { diff --git a/src/base/ftglyph.c b/src/base/ftglyph.c index 591b57a..ac178c4 100644 --- a/src/base/ftglyph.c +++ b/src/base/ftglyph.c @@ -4,7 +4,7 @@ /* */ /* FreeType convenience functions to handle glyphs (body). */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2007, 2008, 2010 by */ +/* Copyright 1996-2005, 2007, 2008, 2010, 2012-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -29,6 +29,8 @@ #include <ft2build.h> +#include FT_INTERNAL_DEBUG_H + #include FT_GLYPH_H #include FT_OUTLINE_H #include FT_BITMAP_H @@ -65,7 +67,7 @@ if ( slot->format != FT_GLYPH_FORMAT_BITMAP ) { - error = FT_Err_Invalid_Glyph_Format; + error = FT_THROW( Invalid_Glyph_Format ); goto Exit; } @@ -166,7 +168,7 @@ /* check format in glyph slot */ if ( slot->format != FT_GLYPH_FORMAT_OUTLINE ) { - error = FT_Err_Invalid_Glyph_Format; + error = FT_THROW( Invalid_Glyph_Format ); goto Exit; } @@ -312,17 +314,17 @@ /* check arguments */ - if ( !target ) + if ( !target || !source || !source->clazz ) { - error = FT_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Exit; } - *target = 0; + *target = NULL; if ( !source || !source->clazz ) { - error = FT_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Exit; } @@ -357,16 +359,16 @@ FT_Error error; FT_Glyph glyph; - const FT_Glyph_Class* clazz = 0; + const FT_Glyph_Class* clazz = NULL; if ( !slot ) - return FT_Err_Invalid_Slot_Handle; + return FT_THROW( Invalid_Slot_Handle ); library = slot->library; if ( !aglyph ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); /* if it is a bitmap, that's easy :-) */ if ( slot->format == FT_GLYPH_FORMAT_BITMAP ) @@ -388,7 +390,7 @@ if ( !clazz ) { - error = FT_Err_Invalid_Glyph_Format; + error = FT_THROW( Invalid_Glyph_Format ); goto Exit; } @@ -422,15 +424,16 @@ FT_Matrix* matrix, FT_Vector* delta ) { - const FT_Glyph_Class* clazz; - FT_Error error = FT_Err_Ok; + FT_Error error = FT_Err_Ok; if ( !glyph || !glyph->clazz ) - error = FT_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); else { - clazz = glyph->clazz; + const FT_Glyph_Class* clazz = glyph->clazz; + + if ( clazz->glyph_transform ) { /* transform glyph image */ @@ -441,7 +444,7 @@ FT_Vector_Transform( &glyph->advance, matrix ); } else - error = FT_Err_Invalid_Glyph_Format; + error = FT_THROW( Invalid_Glyph_Format ); } return error; } @@ -464,38 +467,33 @@ if ( !glyph || !glyph->clazz ) return; - else + + clazz = glyph->clazz; + if ( !clazz->glyph_bbox ) + return; + + /* retrieve bbox in 26.6 coordinates */ + clazz->glyph_bbox( glyph, acbox ); + + /* perform grid fitting if needed */ + if ( bbox_mode == FT_GLYPH_BBOX_GRIDFIT || + bbox_mode == FT_GLYPH_BBOX_PIXELS ) { - clazz = glyph->clazz; - if ( !clazz->glyph_bbox ) - return; - else - { - /* retrieve bbox in 26.6 coordinates */ - clazz->glyph_bbox( glyph, acbox ); - - /* perform grid fitting if needed */ - if ( bbox_mode == FT_GLYPH_BBOX_GRIDFIT || - bbox_mode == FT_GLYPH_BBOX_PIXELS ) - { - acbox->xMin = FT_PIX_FLOOR( acbox->xMin ); - acbox->yMin = FT_PIX_FLOOR( acbox->yMin ); - acbox->xMax = FT_PIX_CEIL( acbox->xMax ); - acbox->yMax = FT_PIX_CEIL( acbox->yMax ); - } - - /* convert to integer pixels if needed */ - if ( bbox_mode == FT_GLYPH_BBOX_TRUNCATE || - bbox_mode == FT_GLYPH_BBOX_PIXELS ) - { - acbox->xMin >>= 6; - acbox->yMin >>= 6; - acbox->xMax >>= 6; - acbox->yMax >>= 6; - } - } + acbox->xMin = FT_PIX_FLOOR( acbox->xMin ); + acbox->yMin = FT_PIX_FLOOR( acbox->yMin ); + acbox->xMax = FT_PIX_CEIL( acbox->xMax ); + acbox->yMax = FT_PIX_CEIL( acbox->yMax ); + } + + /* convert to integer pixels if needed */ + if ( bbox_mode == FT_GLYPH_BBOX_TRUNCATE || + bbox_mode == FT_GLYPH_BBOX_PIXELS ) + { + acbox->xMin >>= 6; + acbox->yMin >>= 6; + acbox->xMax >>= 6; + acbox->yMax >>= 6; } - return; } @@ -510,11 +508,11 @@ FT_GlyphSlotRec dummy; FT_GlyphSlot_InternalRec dummy_internal; FT_Error error = FT_Err_Ok; - FT_Glyph glyph; + FT_Glyph b, glyph; FT_BitmapGlyph bitmap = NULL; const FT_Glyph_Class* clazz; - /* FT_BITMAP_GLYPH_CLASS_GET derefers `library' in PIC mode */ + /* FT_BITMAP_GLYPH_CLASS_GET dereferences `library' in PIC mode */ FT_Library library; @@ -547,10 +545,10 @@ dummy.format = clazz->glyph_format; /* create result bitmap glyph */ - error = ft_new_glyph( library, FT_BITMAP_GLYPH_CLASS_GET, - (FT_Glyph*)(void*)&bitmap ); + error = ft_new_glyph( library, FT_BITMAP_GLYPH_CLASS_GET, &b ); if ( error ) goto Exit; + bitmap = (FT_BitmapGlyph)b; #if 1 /* if `origin' is set, translate the glyph image */ @@ -600,7 +598,7 @@ return error; Bad: - error = FT_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Exit; } diff --git a/src/base/ftgxval.c b/src/base/ftgxval.c index aeeb8ce..a65f4c8 100644 --- a/src/base/ftgxval.c +++ b/src/base/ftgxval.c @@ -4,7 +4,7 @@ /* */ /* FreeType API for validating TrueTyepGX/AAT tables (body). */ /* */ -/* Copyright 2004, 2005, 2006, 2010 by */ +/* Copyright 2004-2006, 2010, 2013, 2014 by */ /* Masatake YAMATO, Redhat K.K, */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ @@ -26,6 +26,8 @@ #include <ft2build.h> +#include FT_INTERNAL_DEBUG_H + #include FT_INTERNAL_OBJECTS_H #include FT_SERVICE_GX_VALIDATE_H @@ -44,13 +46,13 @@ if ( !face ) { - error = FT_Err_Invalid_Face_Handle; + error = FT_THROW( Invalid_Face_Handle ); goto Exit; } - if ( tables == NULL ) + if ( !tables ) { - error = FT_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Exit; } @@ -62,7 +64,7 @@ tables, table_length ); else - error = FT_Err_Unimplemented_Feature; + error = FT_THROW( Unimplemented_Feature ); Exit: return error; @@ -96,13 +98,13 @@ if ( !face ) { - error = FT_Err_Invalid_Face_Handle; + error = FT_THROW( Invalid_Face_Handle ); goto Exit; } - if ( ckern_table == NULL ) + if ( !ckern_table ) { - error = FT_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Exit; } @@ -113,7 +115,7 @@ validation_flags, ckern_table ); else - error = FT_Err_Unimplemented_Feature; + error = FT_THROW( Unimplemented_Feature ); Exit: return error; diff --git a/src/base/ftinit.c b/src/base/ftinit.c index 91f8e2a..c4c8820 100644 --- a/src/base/ftinit.c +++ b/src/base/ftinit.c @@ -4,7 +4,7 @@ /* */ /* FreeType initialization layer (body). */ /* */ -/* Copyright 1996-2001, 2002, 2005, 2007, 2009, 2012 by */ +/* Copyright 1996-2002, 2005, 2007, 2009, 2012-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -23,8 +23,8 @@ /* FT_Add_Default_Modules(): */ /* This function is used to add the set of default modules to a */ /* fresh new library object. The set is taken from the header file */ - /* `freetype/config/ftmodule.h'. See the document `FreeType 2.0 */ - /* Build System' for more information. */ + /* `config/ftmodule.h'. See the document `FreeType 2.0 Build */ + /* System' for more information. */ /* */ /* FT_Init_FreeType(): */ /* This function creates a system object for the current platform, */ @@ -156,7 +156,7 @@ { FT_Error error; FT_Memory memory; - FT_Module_Class* *classes; + FT_Module_Class* *classes = NULL; FT_Module_Class* clazz; FT_UInt i; BasePIC* pic_container = (BasePIC*)library->pic_container.base; @@ -166,7 +166,7 @@ pic_container->default_module_classes = 0; - if ( FT_ALLOC( classes, sizeof ( FT_Module_Class* ) * + if ( FT_ALLOC( classes, sizeof ( FT_Module_Class* ) * ( FT_NUM_MODULE_CLASSES + 1 ) ) ) return error; @@ -235,6 +235,8 @@ FT_Memory memory; + /* check of `alibrary' delayed to `FT_New_Library' */ + /* First of all, allocate a new system object -- this function is part */ /* of the system-specific component, i.e. `ftsystem.c'. */ @@ -242,7 +244,7 @@ if ( !memory ) { FT_ERROR(( "FT_Init_FreeType: cannot find memory manager\n" )); - return FT_Err_Unimplemented_Feature; + return FT_THROW( Unimplemented_Feature ); } /* build a library out of it, then fill it with the set of */ @@ -263,17 +265,19 @@ FT_EXPORT_DEF( FT_Error ) FT_Done_FreeType( FT_Library library ) { - if ( library ) - { - FT_Memory memory = library->memory; + FT_Memory memory; + + if ( !library ) + return FT_THROW( Invalid_Library_Handle ); - /* Discard the library object */ - FT_Done_Library( library ); + memory = library->memory; - /* discard memory manager */ - FT_Done_Memory( memory ); - } + /* Discard the library object */ + FT_Done_Library( library ); + + /* discard memory manager */ + FT_Done_Memory( memory ); return FT_Err_Ok; } diff --git a/src/base/ftlcdfil.c b/src/base/ftlcdfil.c index 0da4ba1..d8bcbbf 100644 --- a/src/base/ftlcdfil.c +++ b/src/base/ftlcdfil.c @@ -4,7 +4,7 @@ /* */ /* FreeType API for color filtering of subpixel bitmap glyphs (body). */ /* */ -/* Copyright 2006, 2008, 2009, 2010 by */ +/* Copyright 2006, 2008-2010, 2013, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -17,6 +17,8 @@ #include <ft2build.h> +#include FT_INTERNAL_DEBUG_H + #include FT_LCD_FILTER_H #include FT_IMAGE_H #include FT_INTERNAL_OBJECTS_H @@ -44,9 +46,16 @@ FT_Byte* line = bitmap->buffer; + /* take care of bitmap flow */ + if ( bitmap->pitch < 0 ) + line -= bitmap->pitch * ( bitmap->rows - 1 ); + + /* `fir' and `pix' must be at least 32 bit wide, since the sum of */ + /* the values in `weights' can exceed 0xFF */ + for ( ; height > 0; height--, line += bitmap->pitch ) { - FT_UInt fir[5]; + FT_UInt fir[4]; /* below, `pix' is used as the 5th element */ FT_UInt val1, xx; @@ -55,7 +64,6 @@ fir[1] = weights[3] * val1; fir[2] = weights[4] * val1; fir[3] = 0; - fir[4] = 0; val1 = line[1]; fir[0] += weights[1] * val1; @@ -76,7 +84,7 @@ fir[3] = weights[4] * val; pix >>= 8; - pix |= -( pix >> 8 ); + pix |= (FT_UInt)-(FT_Int)( pix >> 8 ); line[xx - 2] = (FT_Byte)pix; } @@ -85,11 +93,11 @@ pix = fir[0] >> 8; - pix |= -( pix >> 8 ); + pix |= (FT_UInt)-(FT_Int)( pix >> 8 ); line[xx - 2] = (FT_Byte)pix; pix = fir[1] >> 8; - pix |= -( pix >> 8 ); + pix |= (FT_UInt)-(FT_Int)( pix >> 8 ); line[xx - 1] = (FT_Byte)pix; } } @@ -102,10 +110,14 @@ FT_Int pitch = bitmap->pitch; + /* take care of bitmap flow */ + if ( bitmap->pitch < 0 ) + column -= bitmap->pitch * ( bitmap->rows - 1 ); + for ( ; width > 0; width--, column++ ) { FT_Byte* col = column; - FT_UInt fir[5]; + FT_UInt fir[4]; /* below, `pix' is used as the 5th element */ FT_UInt val1, yy; @@ -114,7 +126,6 @@ fir[1] = weights[3] * val1; fir[2] = weights[4] * val1; fir[3] = 0; - fir[4] = 0; col += pitch; val1 = col[0]; @@ -137,7 +148,7 @@ fir[3] = weights[4] * val; pix >>= 8; - pix |= -( pix >> 8 ); + pix |= (FT_UInt)-(FT_Int)( pix >> 8 ); col[-2 * pitch] = (FT_Byte)pix; col += pitch; } @@ -147,11 +158,11 @@ pix = fir[0] >> 8; - pix |= -( pix >> 8 ); + pix |= (FT_UInt)-(FT_Int)( pix >> 8 ); col[-2 * pitch] = (FT_Byte)pix; pix = fir[1] >> 8; - pix |= -( pix >> 8 ); + pix |= (FT_UInt)-(FT_Int)( pix >> 8 ); col[-pitch] = (FT_Byte)pix; } } @@ -187,6 +198,10 @@ FT_Byte* line = bitmap->buffer; + /* take care of bitmap flow */ + if ( bitmap->pitch < 0 ) + line -= bitmap->pitch * ( bitmap->rows - 1 ); + for ( ; height > 0; height--, line += pitch ) { FT_UInt xx; @@ -226,6 +241,10 @@ FT_Byte* column = bitmap->buffer; + /* take care of bitmap flow */ + if ( bitmap->pitch < 0 ) + column -= bitmap->pitch * ( bitmap->rows - 1 ); + for ( ; width > 0; width--, column++ ) { FT_Byte* col = column; @@ -270,8 +289,11 @@ FT_Library_SetLcdFilterWeights( FT_Library library, unsigned char *weights ) { - if ( !library || !weights ) - return FT_Err_Invalid_Argument; + if ( !library ) + return FT_THROW( Invalid_Library_Handle ); + + if ( !weights ) + return FT_THROW( Invalid_Argument ); ft_memcpy( library->lcd_weights, weights, 5 ); @@ -292,7 +314,7 @@ if ( !library ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Library_Handle ); switch ( filter ) { @@ -339,7 +361,7 @@ #endif default: - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); } library->lcd_filter = filter; @@ -356,7 +378,7 @@ FT_UNUSED( library ); FT_UNUSED( weights ); - return FT_Err_Unimplemented_Feature; + return FT_THROW( Unimplemented_Feature ); } @@ -367,7 +389,7 @@ FT_UNUSED( library ); FT_UNUSED( filter ); - return FT_Err_Unimplemented_Feature; + return FT_THROW( Unimplemented_Feature ); } #endif /* !FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ diff --git a/src/base/ftmac.c b/src/base/ftmac.c index f200748..5301ab4 100644 --- a/src/base/ftmac.c +++ b/src/base/ftmac.c @@ -8,8 +8,7 @@ /* This file is for Mac OS X only; see builds/mac/ftoldmac.c for */ /* classic platforms built by MPW. */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, */ -/* 2009 by */ +/* Copyright 1996-2009, 2013, 2014 by */ /* Just van Rossum, David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -131,7 +130,7 @@ FT_UNUSED( pathSpec ); FT_UNUSED( face_index ); - return FT_Err_Unimplemented_Feature; + return FT_THROW( Unimplemented_Feature ); } @@ -190,10 +189,10 @@ CFRelease( cf_fontName ); if ( ats_font_id == 0 || ats_font_id == 0xFFFFFFFFUL ) - return FT_Err_Unknown_File_Format; + return FT_THROW( Unknown_File_Format ); if ( noErr != FT_ATSFontGetFileReference( ats_font_id, ats_font_ref ) ) - return FT_Err_Unknown_File_Format; + return FT_THROW( Unknown_File_Format ); /* face_index calculation by searching preceding fontIDs */ /* with same FSRef */ @@ -228,12 +227,15 @@ FT_Error err; + if ( !fontName || !face_index ) + return FT_THROW( Invalid_Argument) ; + err = FT_GetFileRef_From_Mac_ATS_Name( fontName, &ref, face_index ); - if ( FT_Err_Ok != err ) + if ( err ) return err; if ( noErr != FSRefMakePath( &ref, path, maxPathSize ) ) - return FT_Err_Unknown_File_Format; + return FT_THROW( Unknown_File_Format ); return FT_Err_Ok; } @@ -251,19 +253,22 @@ FT_UNUSED( pathSpec ); FT_UNUSED( face_index ); - return FT_Err_Unimplemented_Feature; + return FT_THROW( Unimplemented_Feature ); #else FSRef ref; FT_Error err; + if ( !fontName || !face_index ) + return FT_THROW( Invalid_Argument ); + err = FT_GetFileRef_From_Mac_ATS_Name( fontName, &ref, face_index ); - if ( FT_Err_Ok != err ) + if ( err ) return err; if ( noErr != FSGetCatalogInfo( &ref, kFSCatInfoNone, NULL, NULL, pathSpec, NULL ) ) - return FT_Err_Unknown_File_Format; + return FT_THROW( Unknown_File_Format ); return FT_Err_Ok; #endif @@ -279,7 +284,7 @@ if ( noErr != FSPathMakeRef( pathname, &ref, FALSE ) ) - return FT_Err_Cannot_Open_Resource; + return FT_THROW( Cannot_Open_Resource ); /* at present, no support for dfont format */ err = FSOpenResourceFile( &ref, 0, NULL, fsRdPerm, res ); @@ -359,11 +364,9 @@ count_faces_scalable( char* fond_data ) { AsscEntry* assoc; - FamRec* fond; short i, face, face_all; - fond = (FamRec*)fond_data; face_all = EndianS16_BtoN( *( (short *)( fond_data + sizeof ( FamRec ) ) ) ) + 1; assoc = (AsscEntry*)( fond_data + sizeof ( FamRec ) + 2 ); @@ -443,9 +446,10 @@ style = (StyleTable*)p; p += sizeof ( StyleTable ); string_count = EndianS16_BtoN( *(short*)(p) ); + string_count = FT_MIN( 64, string_count ); p += sizeof ( short ); - for ( i = 0; i < string_count && i < 64; i++ ) + for ( i = 0; i < string_count; i++ ) { names[i] = p; p += names[i][0]; @@ -462,7 +466,7 @@ ps_name[ps_name_len] = 0; } if ( style->indexes[face_index] > 1 && - style->indexes[face_index] <= FT_MIN( string_count, 64 ) ) + style->indexes[face_index] <= string_count ) { unsigned char* suffixes = names[style->indexes[face_index] - 1]; @@ -508,17 +512,17 @@ /* We should not extract parent directory by string manipulation. */ if ( noErr != FSPathMakeRef( path_fond, &ref, FALSE ) ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); if ( noErr != FSGetCatalogInfo( &ref, kFSCatInfoNone, NULL, NULL, NULL, &par_ref ) ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); if ( noErr != FSRefMakePath( &par_ref, path_lwfn, path_size ) ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); if ( ft_strlen( (char *)path_lwfn ) + 1 + base_lwfn[0] > path_size ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); /* now we have absolute dirname in path_lwfn */ ft_strcat( (char *)path_lwfn, "/" ); @@ -527,11 +531,11 @@ path_lwfn[dirname_len + base_lwfn[0]] = '\0'; if ( noErr != FSPathMakeRef( path_lwfn, &ref, FALSE ) ) - return FT_Err_Cannot_Open_Resource; + return FT_THROW( Cannot_Open_Resource ); if ( noErr != FSGetCatalogInfo( &ref, kFSCatInfoNone, NULL, NULL, NULL, NULL ) ) - return FT_Err_Cannot_Open_Resource; + return FT_THROW( Cannot_Open_Resource ); return FT_Err_Ok; } @@ -557,7 +561,7 @@ { err = lookup_lwfn_by_fond( pathname, lwfn_file_name, buff, sizeof ( buff ) ); - if ( FT_Err_Ok == err ) + if ( !err ) have_lwfn = 1; } @@ -620,7 +624,7 @@ /* detect integer overflows */ if ( total_size < old_total_size ) { - error = FT_Err_Array_Too_Large; + error = FT_THROW( Array_Too_Large ); goto Error; } @@ -705,7 +709,7 @@ if ( noErr != FT_FSPathMakeRes( pathname, &res ) ) - return FT_Err_Cannot_Open_Resource; + return FT_THROW( Cannot_Open_Resource ); pfb_data = NULL; pfb_size = 0; @@ -740,7 +744,7 @@ sfnt = GetResource( TTAG_sfnt, sfnt_id ); if ( sfnt == NULL ) - return FT_Err_Invalid_Handle; + return FT_THROW( Invalid_Handle ); sfnt_size = (FT_ULong)GetHandleSize( sfnt ); if ( FT_ALLOC( sfnt_data, (FT_Long)sfnt_size ) ) @@ -797,23 +801,26 @@ FT_Long face_index, FT_Face* aface ) { - FT_Error error = FT_Err_Cannot_Open_Resource; + FT_Error error = FT_ERR( Cannot_Open_Resource ); ResFileRefNum res_ref; ResourceIndex res_index; Handle fond; - short num_faces_in_res, num_faces_in_fond; + short num_faces_in_res; if ( noErr != FT_FSPathMakeRes( pathname, &res_ref ) ) - return FT_Err_Cannot_Open_Resource; + return FT_THROW( Cannot_Open_Resource ); UseResFile( res_ref ); if ( ResError() ) - return FT_Err_Cannot_Open_Resource; + return FT_THROW( Cannot_Open_Resource ); num_faces_in_res = 0; for ( res_index = 1; ; ++res_index ) { + short num_faces_in_fond; + + fond = Get1IndResource( TTAG_FOND, res_index ); if ( ResError() ) break; @@ -828,7 +835,7 @@ } CloseResFile( res_ref ); - if ( FT_Err_Ok == error && NULL != aface && NULL != *aface ) + if ( !error && aface && *aface ) (*aface)->num_faces = num_faces_in_res; return error; } @@ -852,9 +859,11 @@ FT_Error error = FT_Err_Ok; + /* check of `library' and `aface' delayed to `FT_New_Face_From_XXX' */ + GetResInfo( fond, &fond_id, &fond_type, fond_name ); if ( ResError() != noErr || fond_type != TTAG_FOND ) - return FT_Err_Invalid_File_Format; + return FT_THROW( Invalid_File_Format ); parse_fond( *fond, &have_sfnt, &sfnt_id, lwfn_file_name, face_index ); @@ -883,7 +892,7 @@ error = lookup_lwfn_by_fond( path_fond, lwfn_file_name, path_lwfn, sizeof ( path_lwfn ) ); - if ( FT_Err_Ok == error ) + if ( !error ) have_lwfn = 1; } } @@ -894,10 +903,10 @@ face_index, aface ); else - error = FT_Err_Unknown_File_Format; + error = FT_THROW( Unknown_File_Format ); found_no_lwfn_file: - if ( have_sfnt && FT_Err_Ok != error ) + if ( have_sfnt && error ) error = FT_New_Face_From_SFNT( library, sfnt_id, face_index, @@ -961,9 +970,8 @@ /* test for valid `library' and `aface' delayed to FT_Open_Face() */ if ( !pathname ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); - error = FT_Err_Ok; *aface = NULL; /* try resourcefork based font: LWFN, FFIL */ @@ -998,16 +1006,20 @@ { FT_Error error; FT_Open_Args args; - OSErr err; - UInt8 pathname[PATH_MAX]; + OSErr err; + UInt8 pathname[PATH_MAX]; + + + /* check of `library' and `aface' delayed to */ + /* `FT_New_Face_From_Resource' */ if ( !ref ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); err = FSRefMakePath( ref, pathname, sizeof ( pathname ) ); if ( err ) - error = FT_Err_Cannot_Open_Resource; + error = FT_THROW( Cannot_Open_Resource ); error = FT_New_Face_From_Resource( library, pathname, face_index, aface ); if ( error != 0 || *aface != NULL ) @@ -1043,13 +1055,15 @@ FT_UNUSED( face_index ); FT_UNUSED( aface ); - return FT_Err_Unimplemented_Feature; + return FT_THROW( Unimplemented_Feature ); #else FSRef ref; + /* check of `library' and `aface' delayed to `FT_New_Face_From_FSRef' */ + if ( !spec || FSpMakeFSRef( spec, &ref ) != noErr ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); else return FT_New_Face_From_FSRef( library, &ref, face_index, aface ); #endif diff --git a/src/base/ftmm.c b/src/base/ftmm.c index 0307729..056680b 100644 --- a/src/base/ftmm.c +++ b/src/base/ftmm.c @@ -4,7 +4,7 @@ /* */ /* Multiple Master font support (body). */ /* */ -/* Copyright 1996-2001, 2003, 2004, 2009 by */ +/* Copyright 1996-2001, 2003, 2004, 2009, 2013, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -17,6 +17,8 @@ #include <ft2build.h> +#include FT_INTERNAL_DEBUG_H + #include FT_MULTIPLE_MASTERS_H #include FT_INTERNAL_OBJECTS_H #include FT_SERVICE_MULTIPLE_MASTERS_H @@ -42,9 +44,9 @@ *aservice = NULL; if ( !face ) - return FT_Err_Invalid_Face_Handle; + return FT_THROW( Invalid_Face_Handle ); - error = FT_Err_Invalid_Argument; + error = FT_ERR( Invalid_Argument ); if ( FT_HAS_MULTIPLE_MASTERS( face ) ) { @@ -70,10 +72,15 @@ FT_Service_MultiMasters service; + /* check of `face' delayed to `ft_face_get_mm_service' */ + + if ( !amaster ) + return FT_THROW( Invalid_Argument ); + error = ft_face_get_mm_service( face, &service ); if ( !error ) { - error = FT_Err_Invalid_Argument; + error = FT_ERR( Invalid_Argument ); if ( service->get_mm ) error = service->get_mm( face, amaster ); } @@ -92,10 +99,15 @@ FT_Service_MultiMasters service; + /* check of `face' delayed to `ft_face_get_mm_service' */ + + if ( !amaster ) + return FT_THROW( Invalid_Argument ); + error = ft_face_get_mm_service( face, &service ); if ( !error ) { - error = FT_Err_Invalid_Argument; + error = FT_ERR( Invalid_Argument ); if ( service->get_mm_var ) error = service->get_mm_var( face, amaster ); } @@ -115,10 +127,15 @@ FT_Service_MultiMasters service; + /* check of `face' delayed to `ft_face_get_mm_service' */ + + if ( !coords ) + return FT_THROW( Invalid_Argument ); + error = ft_face_get_mm_service( face, &service ); if ( !error ) { - error = FT_Err_Invalid_Argument; + error = FT_ERR( Invalid_Argument ); if ( service->set_mm_design ) error = service->set_mm_design( face, num_coords, coords ); } @@ -138,10 +155,15 @@ FT_Service_MultiMasters service; + /* check of `face' delayed to `ft_face_get_mm_service' */ + + if ( !coords ) + return FT_THROW( Invalid_Argument ); + error = ft_face_get_mm_service( face, &service ); if ( !error ) { - error = FT_Err_Invalid_Argument; + error = FT_ERR( Invalid_Argument ); if ( service->set_var_design ) error = service->set_var_design( face, num_coords, coords ); } @@ -161,10 +183,15 @@ FT_Service_MultiMasters service; + /* check of `face' delayed to `ft_face_get_mm_service' */ + + if ( !coords ) + return FT_THROW( Invalid_Argument ); + error = ft_face_get_mm_service( face, &service ); if ( !error ) { - error = FT_Err_Invalid_Argument; + error = FT_ERR( Invalid_Argument ); if ( service->set_mm_blend ) error = service->set_mm_blend( face, num_coords, coords ); } @@ -187,10 +214,15 @@ FT_Service_MultiMasters service; + /* check of `face' delayed to `ft_face_get_mm_service' */ + + if ( !coords ) + return FT_THROW( Invalid_Argument ); + error = ft_face_get_mm_service( face, &service ); if ( !error ) { - error = FT_Err_Invalid_Argument; + error = FT_ERR( Invalid_Argument ); if ( service->set_mm_blend ) error = service->set_mm_blend( face, num_coords, coords ); } diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c index 36ee797..ee15a01 100644 --- a/src/base/ftobjs.c +++ b/src/base/ftobjs.c @@ -4,7 +4,7 @@ /* */ /* The FreeType private base classes (body). */ /* */ -/* Copyright 1996-2012 by */ +/* Copyright 1996-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -29,6 +29,7 @@ #include FT_TRUETYPE_TAGS_H #include FT_TRUETYPE_IDS_H +#include FT_SERVICE_PROPERTIES_H #include FT_SERVICE_SFNT_H #include FT_SERVICE_POSTSCRIPT_NAME_H #include FT_SERVICE_GLYPH_DICT_H @@ -40,6 +41,30 @@ #include "ftbase.h" #endif + +#ifdef FT_DEBUG_LEVEL_TRACE + +#include FT_BITMAP_H + +#if defined( _MSC_VER ) /* Visual C++ (and Intel C++) */ + /* We disable the warning `conversion from XXX to YYY, */ + /* possible loss of data' in order to compile cleanly with */ + /* the maximum level of warnings: `md5.c' is non-FreeType */ + /* code, and it gets used during development builds only. */ +#pragma warning( push ) +#pragma warning( disable : 4244 ) +#endif /* _MSC_VER */ + + /* it's easiest to include `md5.c' directly */ +#include "md5.c" + +#if defined( _MSC_VER ) +#pragma warning( pop ) +#endif + +#endif /* FT_DEBUG_LEVEL_TRACE */ + + #define GRID_FIT_METRICS @@ -136,10 +161,10 @@ *astream = 0; if ( !library ) - return FT_Err_Invalid_Library_Handle; + return FT_THROW( Invalid_Library_Handle ); if ( !args ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); memory = library->memory; @@ -177,7 +202,7 @@ #endif else - error = FT_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); if ( error ) FT_FREE( stream ); @@ -383,8 +408,11 @@ FT_GlyphSlot slot = NULL; - if ( !face || !face->driver ) - return FT_Err_Invalid_Argument; + if ( !face ) + return FT_THROW( Invalid_Face_Handle ); + + if ( !face->driver ) + return FT_THROW( Invalid_Argument ); driver = face->driver; clazz = driver->clazz; @@ -483,6 +511,7 @@ internal->transform_matrix.xy = 0; internal->transform_matrix.yx = 0; internal->transform_matrix.yy = 0x10000L; + matrix = &internal->transform_matrix; } else @@ -498,6 +527,7 @@ { internal->transform_delta.x = 0; internal->transform_delta.y = 0; + delta = &internal->transform_delta; } else @@ -574,7 +604,7 @@ if ( !face || !face->size || !face->glyph ) - return FT_Err_Invalid_Face_Handle; + return FT_THROW( Invalid_Face_Handle ); /* The validity test for `glyph_index' is performed by the */ /* font drivers. */ @@ -640,18 +670,25 @@ /* the check for `num_locations' assures that we actually */ /* test for instructions in a TTF and not in a CFF-based OTF */ + /* */ + /* since `maxSizeOfInstructions' might be unreliable, we */ + /* check the size of the `fpgm' and `prep' tables, too -- */ + /* the assumption is that there don't exist real TTFs where */ + /* both `fpgm' and `prep' tables are missing */ if ( mode == FT_RENDER_MODE_LIGHT || face->internal->ignore_unpatented_hinter || ( FT_IS_SFNT( face ) && ttface->num_locations && - ttface->max_profile.maxSizeOfInstructions == 0 ) ) + ttface->max_profile.maxSizeOfInstructions == 0 && + ttface->font_program_size == 0 && + ttface->cvt_program_size == 0 ) ) autohint = TRUE; } } if ( autohint ) { - FT_AutoHinter_Service hinting; + FT_AutoHinter_Interface hinting; /* try to load embedded bitmaps first if available */ @@ -680,7 +717,7 @@ internal->transform_flags = 0; /* load auto-hinted outline */ - hinting = (FT_AutoHinter_Service)hinter->clazz->module_interface; + hinting = (FT_AutoHinter_Interface)hinter->clazz->module_interface; error = hinting->load_glyph( (FT_AutoHinter)hinter, slot, face->size, @@ -814,7 +851,7 @@ if ( !face ) - return FT_Err_Invalid_Face_Handle; + return FT_THROW( Invalid_Face_Handle ); glyph_index = (FT_UInt)char_code; if ( face->charmap ) @@ -965,7 +1002,7 @@ first = face->charmaps; if ( !first ) - return FT_Err_Invalid_CharMap_Handle; + return FT_THROW( Invalid_CharMap_Handle ); /* * The original TrueType specification(s) only specified charmap @@ -1008,14 +1045,6 @@ ( cur[0]->platform_id == TT_PLATFORM_APPLE_UNICODE && cur[0]->encoding_id == TT_APPLE_ID_UNICODE_32 ) ) { -#ifdef FT_MAX_CHARMAP_CACHEABLE - if ( cur - first > FT_MAX_CHARMAP_CACHEABLE ) - { - FT_ERROR(( "find_unicode_charmap: UCS-4 cmap is found " - "at too late position (%d)\n", cur - first )); - continue; - } -#endif face->charmap = cur[0]; return FT_Err_Ok; } @@ -1030,20 +1059,12 @@ { if ( cur[0]->encoding == FT_ENCODING_UNICODE ) { -#ifdef FT_MAX_CHARMAP_CACHEABLE - if ( cur - first > FT_MAX_CHARMAP_CACHEABLE ) - { - FT_ERROR(( "find_unicode_charmap: UCS-2 cmap is found " - "at too late position (%d)\n", cur - first )); - continue; - } -#endif face->charmap = cur[0]; return FT_Err_Ok; } } - return FT_Err_Invalid_CharMap_Handle; + return FT_THROW( Invalid_CharMap_Handle ); } @@ -1079,17 +1100,7 @@ if ( cur[0]->platform_id == TT_PLATFORM_APPLE_UNICODE && cur[0]->encoding_id == TT_APPLE_ID_VARIANT_SELECTOR && FT_Get_CMap_Format( cur[0] ) == 14 ) - { -#ifdef FT_MAX_CHARMAP_CACHEABLE - if ( cur - first > FT_MAX_CHARMAP_CACHEABLE ) - { - FT_ERROR(( "find_unicode_charmap: UVS cmap is found " - "at too late position (%d)\n", cur - first )); - continue; - } -#endif return cur[0]; - } } return NULL; @@ -1106,7 +1117,8 @@ /* */ static FT_Error open_face( FT_Driver driver, - FT_Stream stream, + FT_Stream *astream, + FT_Bool external_stream, FT_Long face_index, FT_Int num_params, FT_Parameter* params, @@ -1114,10 +1126,11 @@ { FT_Memory memory; FT_Driver_Class clazz; - FT_Face face = 0; - FT_Error error, error2; + FT_Face face = NULL; FT_Face_Internal internal = NULL; + FT_Error error, error2; + clazz = driver->clazz; memory = driver->root.memory; @@ -1126,15 +1139,19 @@ if ( FT_ALLOC( face, clazz->face_object_size ) ) goto Fail; + face->driver = driver; + face->memory = memory; + face->stream = *astream; + + /* set the FT_FACE_FLAG_EXTERNAL_STREAM bit for FT_Done_Face */ + if ( external_stream ) + face->face_flags |= FT_FACE_FLAG_EXTERNAL_STREAM; + if ( FT_NEW( internal ) ) goto Fail; face->internal = internal; - face->driver = driver; - face->memory = memory; - face->stream = stream; - #ifdef FT_CONFIG_OPTION_INCREMENTAL { int i; @@ -1150,11 +1167,12 @@ #endif if ( clazz->init_face ) - error = clazz->init_face( stream, + error = clazz->init_face( *astream, face, (FT_Int)face_index, num_params, params ); + *astream = face->stream; /* Stream may have been changed. */ if ( error ) goto Fail; @@ -1165,7 +1183,7 @@ /* is returned. */ /* no error should happen, but we want to play safe */ - if ( error2 && error2 != FT_Err_Invalid_CharMap_Handle ) + if ( error2 && FT_ERR_NEQ( error2, Invalid_CharMap_Handle ) ) { error = error2; goto Fail; @@ -1204,9 +1222,9 @@ FT_Open_Args args; - /* test for valid `library' and `aface' delayed to FT_Open_Face() */ + /* test for valid `library' and `aface' delayed to `FT_Open_Face' */ if ( !pathname ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); args.flags = FT_OPEN_PATHNAME; args.pathname = (char*)pathname; @@ -1230,9 +1248,9 @@ FT_Open_Args args; - /* test for valid `library' and `face' delayed to FT_Open_Face() */ + /* test for valid `library' and `face' delayed to `FT_Open_Face' */ if ( !file_base ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); args.flags = FT_OPEN_MEMORY; args.memory_base = file_base; @@ -1304,10 +1322,10 @@ if ( !library ) - return FT_Err_Invalid_Library_Handle; + return FT_THROW( Invalid_Library_Handle ); if ( !base ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); *astream = 0; memory = library->memory; @@ -1421,7 +1439,7 @@ if ( FT_READ_ULONG( tag ) ) return error; if ( tag != TTAG_typ1 ) - return FT_Err_Unknown_File_Format; + return FT_THROW( Unknown_File_Format ); if ( FT_READ_USHORT( numTables ) ) return error; @@ -1458,7 +1476,7 @@ if ( face_index >= 0 && pstable_index == face_index ) return FT_Err_Ok; } - return FT_Err_Table_Missing; + return FT_THROW( Table_Missing ); } @@ -1504,7 +1522,7 @@ error = open_face_from_buffer( library, sfnt_ps, length, - face_index < 0 ? face_index : 0, + FT_MIN( face_index, 0 ), is_sfnt_cid ? "cid" : "type1", aface ); Exit: @@ -1512,7 +1530,7 @@ FT_Error error1; - if ( error == FT_Err_Unknown_File_Format ) + if ( FT_ERR_EQ( error, Unknown_File_Format ) ) { error1 = FT_Stream_Seek( stream, pos ); if ( error1 ) @@ -1540,13 +1558,13 @@ FT_Long face_index, FT_Face *aface ) { - FT_Error error = FT_Err_Cannot_Open_Resource; + FT_Error error = FT_ERR( Cannot_Open_Resource ); FT_Memory memory = library->memory; FT_Byte* pfb_data = NULL; int i, type, flags; - FT_Long len; - FT_Long pfb_len, pfb_pos, pfb_lenpos; - FT_Long rlen, temp; + FT_ULong len; + FT_ULong pfb_len, pfb_pos, pfb_lenpos; + FT_ULong rlen, temp; if ( face_index == -1 ) @@ -1562,11 +1580,34 @@ error = FT_Stream_Seek( stream, offsets[i] ); if ( error ) goto Exit; - if ( FT_READ_LONG( temp ) ) + if ( FT_READ_ULONG( temp ) ) + goto Exit; + + /* FT2 allocator takes signed long buffer length, + * too large value causing overflow should be checked + */ + FT_TRACE4(( " POST fragment #%d: length=0x%08x\n", + i, temp)); + if ( 0x7FFFFFFFUL < temp || pfb_len + temp + 6 < pfb_len ) + { + FT_TRACE2(( " too long fragment length makes" + " pfb_len confused: temp=0x%08x\n", temp )); + error = FT_THROW( Invalid_Offset ); goto Exit; + } + pfb_len += temp + 6; } + FT_TRACE2(( " total buffer size to concatenate %d" + " POST fragments: 0x%08x\n", + resource_cnt, pfb_len + 2)); + if ( pfb_len + 2 < 6 ) { + FT_TRACE2(( " too long fragment length makes" + " pfb_len confused: pfb_len=0x%08x\n", pfb_len )); + error = FT_THROW( Array_Too_Large ); + goto Exit; + } if ( FT_ALLOC( pfb_data, (FT_Long)pfb_len + 2 ) ) goto Exit; @@ -1586,16 +1627,30 @@ error = FT_Stream_Seek( stream, offsets[i] ); if ( error ) goto Exit2; - if ( FT_READ_LONG( rlen ) ) - goto Exit; + if ( FT_READ_ULONG( rlen ) ) + goto Exit2; + + /* FT2 allocator takes signed long buffer length, + * too large fragment length causing overflow should be checked + */ + if ( 0x7FFFFFFFUL < rlen ) + { + error = FT_THROW( Invalid_Offset ); + goto Exit2; + } + if ( FT_READ_USHORT( flags ) ) - goto Exit; + goto Exit2; FT_TRACE3(( "POST fragment[%d]: offsets=0x%08x, rlen=0x%08x, flags=0x%04x\n", i, offsets[i], rlen, flags )); + error = FT_ERR( Array_Too_Large ); /* postpone the check of rlen longer than buffer until FT_Stream_Read() */ if ( ( flags >> 8 ) == 0 ) /* Comment, should not be loaded */ + { + FT_TRACE3(( " Skip POST fragment #%d because it is a comment\n", i )); continue; + } /* the flags are part of the resource, so rlen >= 2. */ /* but some fonts declare rlen = 0 for empty fragment */ @@ -1608,6 +1663,8 @@ len += rlen; else { + FT_TRACE3(( " Write POST fragment #%d header (4-byte) to buffer" + " 0x%p + 0x%08x\n", i, pfb_data, pfb_lenpos )); if ( pfb_lenpos + 3 > pfb_len + 2 ) goto Exit2; pfb_data[pfb_lenpos ] = (FT_Byte)( len ); @@ -1618,6 +1675,8 @@ if ( ( flags >> 8 ) == 5 ) /* End of font mark */ break; + FT_TRACE3(( " Write POST fragment #%d header (6-byte) to buffer" + " 0x%p + 0x%08x\n", i, pfb_data, pfb_pos )); if ( pfb_pos + 6 > pfb_len + 2 ) goto Exit2; pfb_data[pfb_pos++] = 0x80; @@ -1633,16 +1692,18 @@ pfb_data[pfb_pos++] = 0; } - error = FT_Err_Cannot_Open_Resource; if ( pfb_pos > pfb_len || pfb_pos + rlen > pfb_len ) goto Exit2; + FT_TRACE3(( " Load POST fragment #%d (%d byte) to buffer" + " 0x%p + 0x%08x\n", i, rlen, pfb_data, pfb_pos )); error = FT_Stream_Read( stream, (FT_Byte *)pfb_data + pfb_pos, rlen ); if ( error ) goto Exit2; pfb_pos += rlen; } + error = FT_ERR( Array_Too_Large ); if ( pfb_pos + 2 > pfb_len + 2 ) goto Exit2; pfb_data[pfb_pos++] = 0x80; @@ -1663,6 +1724,13 @@ aface ); Exit2: + if ( error == FT_ERR( Array_Too_Large ) ) + FT_TRACE2(( " Abort due to too-short buffer to store" + " all POST fragments\n" )); + else if ( error == FT_ERR( Invalid_Offset ) ) + FT_TRACE2(( " Abort due to invalid offset in a POST fragment\n" )); + if ( error ) + error = FT_ERR( Cannot_Open_Resource ); FT_FREE( pfb_data ); Exit: @@ -1695,7 +1763,7 @@ if ( face_index == -1 ) face_index = 0; if ( face_index >= resource_cnt ) - return FT_Err_Cannot_Open_Resource; + return FT_THROW( Cannot_Open_Resource ); flag_offset = offsets[face_index]; error = FT_Stream_Seek( stream, flag_offset ); @@ -1705,7 +1773,7 @@ if ( FT_READ_LONG( rlen ) ) goto Exit; if ( rlen == -1 ) - return FT_Err_Cannot_Open_Resource; + return FT_THROW( Cannot_Open_Resource ); error = open_face_PS_from_sfnt_stream( library, stream, @@ -1762,9 +1830,10 @@ if ( error ) return error; + /* POST resources must be sorted to concatenate properly */ error = FT_Raccess_Get_DataOffsets( library, stream, map_offset, rdara_pos, - TTAG_POST, + TTAG_POST, TRUE, &data_offsets, &count ); if ( !error ) { @@ -1777,9 +1846,11 @@ return error; } + /* sfnt resources should not be sorted to preserve the face order by + QuickDraw API */ error = FT_Raccess_Get_DataOffsets( library, stream, map_offset, rdara_pos, - TTAG_sfnt, + TTAG_sfnt, FALSE, &data_offsets, &count ); if ( !error ) { @@ -1812,7 +1883,7 @@ if ( NULL == stream ) - return FT_Err_Invalid_Stream_Operation; + return FT_THROW( Invalid_Stream_Operation ); error = FT_Stream_Seek( stream, 0 ); if ( error ) @@ -1829,7 +1900,7 @@ header[ 1] > 33 || header[63] != 0 || header[2 + header[1]] != 0 ) - return FT_Err_Unknown_File_Format; + return FT_THROW( Unknown_File_Format ); dlen = ( header[0x53] << 24 ) | ( header[0x54] << 16 ) | @@ -1839,7 +1910,7 @@ rlen = ( header[0x57] << 24 ) | ( header[0x58] << 16 ) | ( header[0x59] << 8 ) | - header[0x5a]; + header[0x5A]; #endif /* 0 */ offset = 128 + ( ( dlen + 127 ) & ~127 ); @@ -1862,7 +1933,7 @@ #define FT_COMPONENT trace_raccess FT_Memory memory = library->memory; - FT_Error error = FT_Err_Unknown_File_Format; + FT_Error error = FT_ERR( Unknown_File_Format ); int i; char * file_names[FT_RACCESS_N_RULES]; @@ -1901,7 +1972,7 @@ i, args2.pathname, offsets[i] )); error = FT_Stream_New( library, &args2, &stream2 ); - if ( is_darwin_vfs && error == FT_Err_Cannot_Open_Stream ) + if ( is_darwin_vfs && FT_ERR_EQ( error, Cannot_Open_Stream ) ) vfs_rfork_has_no_font = TRUE; if ( error ) @@ -1930,7 +2001,7 @@ /* Caller (load_mac_face) requires FT_Err_Unknown_File_Format. */ if ( error ) - error = FT_Err_Unknown_File_Format; + error = FT_ERR( Unknown_File_Format ); return error; @@ -1959,7 +2030,7 @@ error = IsMacBinary( library, stream, face_index, aface ); - if ( FT_ERROR_BASE( error ) == FT_Err_Unknown_File_Format ) + if ( FT_ERR_EQ( error, Unknown_File_Format ) ) { #undef FT_COMPONENT @@ -1976,9 +2047,9 @@ } - if ( ( FT_ERROR_BASE( error ) == FT_Err_Unknown_File_Format || - FT_ERROR_BASE( error ) == FT_Err_Invalid_Stream_Operation ) && - ( args->flags & FT_OPEN_PATHNAME ) ) + if ( ( FT_ERR_EQ( error, Unknown_File_Format ) || + FT_ERR_EQ( error, Invalid_Stream_Operation ) ) && + ( args->flags & FT_OPEN_PATHNAME ) ) error = load_face_in_embedded_rfork( library, stream, face_index, aface, args ); return error; @@ -1997,8 +2068,8 @@ FT_Face *aface ) { FT_Error error; - FT_Driver driver; - FT_Memory memory; + FT_Driver driver = NULL; + FT_Memory memory = NULL; FT_Stream stream = NULL; FT_Face face = NULL; FT_ListNode node = NULL; @@ -2007,11 +2078,10 @@ FT_Module* limit; - /* test for valid `library' delayed to */ - /* FT_Stream_New() */ + /* test for valid `library' delayed to `FT_Stream_New' */ if ( ( !aface && face_index >= 0 ) || !args ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); external_stream = FT_BOOL( ( args->flags & FT_OPEN_STREAM ) && args->stream ); @@ -2042,24 +2112,25 @@ params = args->params; } - error = open_face( driver, stream, face_index, + error = open_face( driver, &stream, external_stream, face_index, num_params, params, &face ); if ( !error ) goto Success; } else - error = FT_Err_Invalid_Handle; + error = FT_THROW( Invalid_Handle ); FT_Stream_Free( stream, external_stream ); goto Fail; } else { + error = FT_ERR( Missing_Module ); + /* check each font driver for an appropriate format */ cur = library->modules; limit = cur + library->num_modules; - for ( ; cur < limit; cur++ ) { /* not all modules are font drivers, so check... */ @@ -2077,14 +2148,14 @@ params = args->params; } - error = open_face( driver, stream, face_index, + error = open_face( driver, &stream, external_stream, face_index, num_params, params, &face ); if ( !error ) goto Success; #ifdef FT_CONFIG_OPTION_MAC_FONTS if ( ft_strcmp( cur[0]->clazz->module_name, "truetype" ) == 0 && - FT_ERROR_BASE( error ) == FT_Err_Table_Missing ) + FT_ERR_EQ( error, Table_Missing ) ) { /* TrueType but essential tables are missing */ if ( FT_Stream_Seek( stream, 0 ) ) @@ -2104,39 +2175,39 @@ } #endif - if ( FT_ERROR_BASE( error ) != FT_Err_Unknown_File_Format ) + if ( FT_ERR_NEQ( error, Unknown_File_Format ) ) goto Fail3; } } - Fail3: - /* If we are on the mac, and we get an FT_Err_Invalid_Stream_Operation */ - /* it may be because we have an empty data fork, so we need to check */ - /* the resource fork. */ - if ( FT_ERROR_BASE( error ) != FT_Err_Cannot_Open_Stream && - FT_ERROR_BASE( error ) != FT_Err_Unknown_File_Format && - FT_ERROR_BASE( error ) != FT_Err_Invalid_Stream_Operation ) - goto Fail2; + Fail3: + /* If we are on the mac, and we get an */ + /* FT_Err_Invalid_Stream_Operation it may be because we have an */ + /* empty data fork, so we need to check the resource fork. */ + if ( FT_ERR_NEQ( error, Cannot_Open_Stream ) && + FT_ERR_NEQ( error, Unknown_File_Format ) && + FT_ERR_NEQ( error, Invalid_Stream_Operation ) ) + goto Fail2; #if !defined( FT_MACINTOSH ) && defined( FT_CONFIG_OPTION_MAC_FONTS ) - error = load_mac_face( library, stream, face_index, aface, args ); - if ( !error ) - { - /* We don't want to go to Success here. We've already done that. */ - /* On the other hand, if we succeeded we still need to close this */ - /* stream (we opened a different stream which extracted the */ - /* interesting information out of this stream here. That stream */ - /* will still be open and the face will point to it). */ - FT_Stream_Free( stream, external_stream ); - return error; - } + error = load_mac_face( library, stream, face_index, aface, args ); + if ( !error ) + { + /* We don't want to go to Success here. We've already done that. */ + /* On the other hand, if we succeeded we still need to close this */ + /* stream (we opened a different stream which extracted the */ + /* interesting information out of this stream here. That stream */ + /* will still be open and the face will point to it). */ + FT_Stream_Free( stream, external_stream ); + return error; + } - if ( FT_ERROR_BASE( error ) != FT_Err_Unknown_File_Format ) - goto Fail2; + if ( FT_ERR_NEQ( error, Unknown_File_Format ) ) + goto Fail2; #endif /* !FT_MACINTOSH && FT_CONFIG_OPTION_MAC_FONTS */ /* no driver is able to handle this format */ - error = FT_Err_Unknown_File_Format; + error = FT_THROW( Unknown_File_Format ); Fail2: FT_Stream_Free( stream, external_stream ); @@ -2146,10 +2217,6 @@ Success: FT_TRACE4(( "FT_Open_Face: New face object, adding to list\n" )); - /* set the FT_FACE_FLAG_EXTERNAL_STREAM bit for FT_Done_Face */ - if ( external_stream ) - face->face_flags |= FT_FACE_FLAG_EXTERNAL_STREAM; - /* add the face object to its driver's list */ if ( FT_NEW( node ) ) goto Fail; @@ -2237,7 +2304,10 @@ goto Exit; Fail: - FT_Done_Face( face ); + if ( node ) + FT_Done_Face( face ); /* face must be in the driver's list */ + else if ( face ) + destroy_face( memory, face, driver ); Exit: FT_TRACE4(( "FT_Open_Face: Return %d\n", error )); @@ -2255,10 +2325,10 @@ FT_Open_Args open; - /* test for valid `face' delayed to FT_Attach_Stream() */ + /* test for valid `face' delayed to `FT_Attach_Stream' */ if ( !filepathname ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); open.stream = NULL; open.flags = FT_OPEN_PATHNAME; @@ -2281,14 +2351,14 @@ FT_Driver_Class clazz; - /* test for valid `parameters' delayed to FT_Stream_New() */ + /* test for valid `parameters' delayed to `FT_Stream_New' */ if ( !face ) - return FT_Err_Invalid_Face_Handle; + return FT_THROW( Invalid_Face_Handle ); driver = face->driver; if ( !driver ) - return FT_Err_Invalid_Driver_Handle; + return FT_THROW( Invalid_Driver_Handle ); error = FT_Stream_New( driver->root.library, parameters, &stream ); if ( error ) @@ -2297,7 +2367,7 @@ /* we implement FT_Attach_Stream in each driver through the */ /* `attach_file' interface */ - error = FT_Err_Unimplemented_Feature; + error = FT_ERR( Unimplemented_Feature ); clazz = driver->clazz; if ( clazz->attach_file ) error = clazz->attach_file( face, stream ); @@ -2317,6 +2387,9 @@ FT_EXPORT_DEF( FT_Error ) FT_Reference_Face( FT_Face face ) { + if ( !face ) + return FT_THROW( Invalid_Face_Handle ); + face->internal->refcount++; return FT_Err_Ok; @@ -2334,7 +2407,7 @@ FT_ListNode node; - error = FT_Err_Invalid_Face_Handle; + error = FT_ERR( Invalid_Face_Handle ); if ( face && face->driver ) { face->internal->refcount--; @@ -2380,13 +2453,13 @@ if ( !face ) - return FT_Err_Invalid_Face_Handle; + return FT_THROW( Invalid_Face_Handle ); if ( !asize ) - return FT_Err_Invalid_Size_Handle; + return FT_THROW( Invalid_Argument ); if ( !face->driver ) - return FT_Err_Invalid_Driver_Handle; + return FT_THROW( Invalid_Driver_Handle ); *asize = 0; @@ -2438,15 +2511,15 @@ if ( !size ) - return FT_Err_Invalid_Size_Handle; + return FT_THROW( Invalid_Size_Handle ); face = size->face; if ( !face ) - return FT_Err_Invalid_Face_Handle; + return FT_THROW( Invalid_Face_Handle ); driver = face->driver; if ( !driver ) - return FT_Err_Invalid_Driver_Handle; + return FT_THROW( Invalid_Driver_Handle ); memory = driver->root.memory; @@ -2467,7 +2540,7 @@ destroy_size( memory, size, driver ); } else - error = FT_Err_Invalid_Size_Handle; + error = FT_THROW( Invalid_Size_Handle ); return error; } @@ -2486,11 +2559,11 @@ if ( !FT_HAS_FIXED_SIZES( face ) ) - return FT_Err_Invalid_Face_Handle; + return FT_THROW( Invalid_Face_Handle ); /* FT_Bitmap_Size doesn't provide enough info... */ if ( req->type != FT_SIZE_REQUEST_TYPE_NOMINAL ) - return FT_Err_Unimplemented_Feature; + return FT_THROW( Unimplemented_Feature ); w = FT_REQUEST_WIDTH ( req ); h = FT_REQUEST_HEIGHT( req ); @@ -2513,6 +2586,8 @@ if ( w == FT_PIX_ROUND( bsize->x_ppem ) || ignore_width ) { + FT_TRACE3(( "FT_Match_Size: bitmap strike %d matches\n", i )); + if ( size_index ) *size_index = (FT_ULong)i; @@ -2520,7 +2595,7 @@ } } - return FT_Err_Invalid_Pixel_Size; + return FT_THROW( Invalid_Pixel_Size ); } @@ -2763,10 +2838,10 @@ if ( !face || !FT_HAS_FIXED_SIZES( face ) ) - return FT_Err_Invalid_Face_Handle; + return FT_THROW( Invalid_Face_Handle ); if ( strike_index < 0 || strike_index >= face->num_fixed_sizes ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); clazz = face->driver->clazz; @@ -2816,11 +2891,11 @@ if ( !face ) - return FT_Err_Invalid_Face_Handle; + return FT_THROW( Invalid_Face_Handle ); if ( !req || req->width < 0 || req->height < 0 || req->type >= FT_SIZE_REQUEST_TYPE_MAX ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); clazz = face->driver->clazz; @@ -2869,9 +2944,6 @@ if ( error ) return error; - FT_TRACE3(( "FT_Request_Size: bitmap strike %lu matched\n", - strike_index )); - return FT_Select_Size( face, (FT_Int)strike_index ); } @@ -2893,6 +2965,8 @@ FT_Size_RequestRec req; + /* check of `face' delayed to `FT_Request_Size' */ + if ( !char_width ) char_width = char_height; else if ( !char_height ) @@ -2931,6 +3005,8 @@ FT_Size_RequestRec req; + /* check of `face' delayed to `FT_Request_Size' */ + if ( pixel_width == 0 ) pixel_width = pixel_height; else if ( pixel_height == 0 ) @@ -2971,10 +3047,10 @@ if ( !face ) - return FT_Err_Invalid_Face_Handle; + return FT_THROW( Invalid_Face_Handle ); if ( !akerning ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); driver = face->driver; @@ -3030,14 +3106,14 @@ if ( !face ) - return FT_Err_Invalid_Face_Handle; + return FT_THROW( Invalid_Face_Handle ); if ( !akerning ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); FT_FACE_FIND_SERVICE( face, service, KERNING ); if ( !service ) - return FT_Err_Unimplemented_Feature; + return FT_THROW( Unimplemented_Feature ); error = service->get_track( face, point_size, @@ -3059,10 +3135,10 @@ if ( !face ) - return FT_Err_Invalid_Face_Handle; + return FT_THROW( Invalid_Face_Handle ); if ( encoding == FT_ENCODING_NONE ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); /* FT_ENCODING_UNICODE is special. We try to find the `best' Unicode */ /* charmap available, i.e., one with UCS-4 characters, if possible. */ @@ -3073,7 +3149,7 @@ cur = face->charmaps; if ( !cur ) - return FT_Err_Invalid_CharMap_Handle; + return FT_THROW( Invalid_CharMap_Handle ); limit = cur + face->num_charmaps; @@ -3081,21 +3157,12 @@ { if ( cur[0]->encoding == encoding ) { -#ifdef FT_MAX_CHARMAP_CACHEABLE - if ( cur - face->charmaps > FT_MAX_CHARMAP_CACHEABLE ) - { - FT_ERROR(( "FT_Select_Charmap: requested charmap is found (%d), " - "but in too late position to cache\n", - cur - face->charmaps )); - continue; - } -#endif face->charmap = cur[0]; return 0; } } - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); } @@ -3110,13 +3177,14 @@ if ( !face ) - return FT_Err_Invalid_Face_Handle; + return FT_THROW( Invalid_Face_Handle ); cur = face->charmaps; - if ( !cur ) - return FT_Err_Invalid_CharMap_Handle; + if ( !cur || !charmap ) + return FT_THROW( Invalid_CharMap_Handle ); + if ( FT_Get_CMap_Format( charmap ) == 14 ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); limit = cur + face->num_charmaps; @@ -3124,20 +3192,12 @@ { if ( cur[0] == charmap ) { -#ifdef FT_MAX_CHARMAP_CACHEABLE - if ( cur - face->charmaps > FT_MAX_CHARMAP_CACHEABLE ) - { - FT_ERROR(( "FT_Set_Charmap: requested charmap is found (%d), " - "but in too late position to cache\n", - cur - face->charmaps )); - continue; - } -#endif face->charmap = cur[0]; - return 0; + return FT_Err_Ok; } } - return FT_Err_Invalid_Argument; + + return FT_THROW( Invalid_Argument ); } @@ -3158,15 +3218,6 @@ FT_ASSERT( i < charmap->face->num_charmaps ); -#ifdef FT_MAX_CHARMAP_CACHEABLE - if ( i > FT_MAX_CHARMAP_CACHEABLE ) - { - FT_ERROR(( "FT_Get_Charmap_Index: requested charmap is found (%d), " - "but in too late position to cache\n", - i )); - return -i; - } -#endif return i; } @@ -3176,7 +3227,7 @@ { FT_CMap_Class clazz = cmap->clazz; FT_Face face = cmap->charmap.face; - FT_Memory memory = FT_FACE_MEMORY(face); + FT_Memory memory = FT_FACE_MEMORY( face ); if ( clazz->done ) @@ -3245,7 +3296,7 @@ if ( clazz == NULL || charmap == NULL || charmap->face == NULL ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); face = charmap->face; memory = FT_FACE_MEMORY( face ); @@ -3319,6 +3370,7 @@ FT_UInt gindex = 0; + /* only do something if we have a charmap, and we have glyphs at all */ if ( face && face->charmap && face->num_glyphs ) { gindex = FT_Get_Char_Index( face, 0 ); @@ -3350,8 +3402,10 @@ FT_CMap cmap = FT_CMAP( face->charmap ); - do { + do + { gindex = cmap->clazz->char_next( cmap, &code ); + } while ( gindex >= (FT_UInt)face->num_glyphs ); result = ( gindex == 0 ) ? 0 : code; @@ -3374,8 +3428,9 @@ FT_UInt result = 0; - if ( face && face->charmap && - face->charmap->encoding == FT_ENCODING_UNICODE ) + if ( face && + face->charmap && + face->charmap->encoding == FT_ENCODING_UNICODE ) { FT_CharMap charmap = find_variant_selector_charmap( face ); FT_CMap ucmap = FT_CMAP( face->charmap ); @@ -3553,7 +3608,9 @@ FT_UInt result = 0; - if ( face && FT_HAS_GLYPH_NAMES( face ) ) + if ( face && + FT_HAS_GLYPH_NAMES( face ) && + glyph_name ) { FT_Service_GlyphDict service; @@ -3578,27 +3635,30 @@ FT_Pointer buffer, FT_UInt buffer_max ) { - FT_Error error = FT_Err_Invalid_Argument; + FT_Error error; + FT_Service_GlyphDict service; - /* clean up buffer */ - if ( buffer && buffer_max > 0 ) - ((FT_Byte*)buffer)[0] = 0; + if ( !face ) + return FT_THROW( Invalid_Face_Handle ); - if ( face && - (FT_Long)glyph_index <= face->num_glyphs && - FT_HAS_GLYPH_NAMES( face ) ) - { - FT_Service_GlyphDict service; + if ( !buffer || buffer_max == 0 ) + return FT_THROW( Invalid_Argument ); + /* clean up buffer */ + ((FT_Byte*)buffer)[0] = '\0'; - FT_FACE_LOOKUP_SERVICE( face, - service, - GLYPH_DICT ); + if ( (FT_Long)glyph_index >= face->num_glyphs ) + return FT_THROW( Invalid_Glyph_Index ); - if ( service && service->get_name ) - error = service->get_name( face, glyph_index, buffer, buffer_max ); - } + if ( !FT_HAS_GLYPH_NAMES( face ) ) + return FT_THROW( Invalid_Argument ); + + FT_FACE_LOOKUP_SERVICE( face, service, GLYPH_DICT ); + if ( service && service->get_name ) + error = service->get_name( face, glyph_index, buffer, buffer_max ); + else + error = FT_THROW( Invalid_Argument ); return error; } @@ -3639,7 +3699,7 @@ FT_Get_Sfnt_Table( FT_Face face, FT_Sfnt_Tag tag ) { - void* table = 0; + void* table = NULL; FT_Service_SFNT_Table service; @@ -3667,11 +3727,11 @@ if ( !face || !FT_IS_SFNT( face ) ) - return FT_Err_Invalid_Face_Handle; + return FT_THROW( Invalid_Face_Handle ); FT_FACE_FIND_SERVICE( face, service, SFNT_TABLE ); if ( service == NULL ) - return FT_Err_Unimplemented_Feature; + return FT_THROW( Unimplemented_Feature ); return service->load_table( face, tag, offset, buffer, length ); } @@ -3689,12 +3749,14 @@ FT_ULong offset; + /* test for valid `length' delayed to `service->table_info' */ + if ( !face || !FT_IS_SFNT( face ) ) - return FT_Err_Invalid_Face_Handle; + return FT_THROW( Invalid_Face_Handle ); FT_FACE_FIND_SERVICE( face, service, SFNT_TABLE ); if ( service == NULL ) - return FT_Err_Unimplemented_Feature; + return FT_THROW( Unimplemented_Feature ); return service->table_info( face, table_index, tag, &offset, length ); } @@ -3756,12 +3818,12 @@ FT_Face face; - if ( size == NULL ) - return FT_Err_Invalid_Argument; + if ( !size ) + return FT_THROW( Invalid_Size_Handle ); face = size->face; - if ( face == NULL || face->driver == NULL ) - return FT_Err_Invalid_Argument; + if ( !face || !face->driver ) + return FT_THROW( Invalid_Face_Handle ); /* we don't need anything more complex than that; all size objects */ /* are already listed by the face */ @@ -3903,11 +3965,17 @@ static void ft_remove_renderer( FT_Module module ) { - FT_Library library = module->library; - FT_Memory memory = library->memory; + FT_Library library; + FT_Memory memory; FT_ListNode node; + library = module->library; + if ( !library ) + return; + + memory = library->memory; + node = FT_List_Find( &library->renderers, module ); if ( node ) { @@ -3934,7 +4002,7 @@ FT_Get_Renderer( FT_Library library, FT_Glyph_Format format ) { - /* test for valid `library' delayed to FT_Lookup_Renderer() */ + /* test for valid `library' delayed to `FT_Lookup_Renderer' */ return FT_Lookup_Renderer( library, format, 0 ); } @@ -3951,17 +4019,31 @@ FT_ListNode node; FT_Error error = FT_Err_Ok; + FT_Renderer_SetModeFunc set_mode; + if ( !library ) - return FT_Err_Invalid_Library_Handle; + { + error = FT_THROW( Invalid_Library_Handle ); + goto Exit; + } if ( !renderer ) - return FT_Err_Invalid_Argument; + { + error = FT_THROW( Invalid_Argument ); + goto Exit; + } + + if ( num_params > 0 && !parameters ) + { + error = FT_THROW( Invalid_Argument ); + goto Exit; + } node = FT_List_Find( &library->renderers, renderer ); if ( !node ) { - error = FT_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Exit; } @@ -3970,18 +4052,14 @@ if ( renderer->glyph_format == FT_GLYPH_FORMAT_OUTLINE ) library->cur_renderer = renderer; - if ( num_params > 0 ) - { - FT_Renderer_SetModeFunc set_mode = renderer->clazz->set_mode; - + set_mode = renderer->clazz->set_mode; - for ( ; num_params > 0; num_params-- ) - { - error = set_mode( renderer, parameters->tag, parameters->data ); - if ( error ) - break; - parameters++; - } + for ( ; num_params > 0; num_params-- ) + { + error = set_mode( renderer, parameters->tag, parameters->data ); + if ( error ) + break; + parameters++; } Exit: @@ -4019,12 +4097,12 @@ else renderer = FT_Lookup_Renderer( library, slot->format, &node ); - error = FT_Err_Unimplemented_Feature; + error = FT_ERR( Unimplemented_Feature ); while ( renderer ) { error = renderer->render( renderer, slot, render_mode, NULL ); - if ( !error || - FT_ERROR_BASE( error ) != FT_Err_Cannot_Render_Glyph ) + if ( !error || + FT_ERR_NEQ( error, Cannot_Render_Glyph ) ) break; /* FT_Err_Cannot_Render_Glyph is returned if the render mode */ @@ -4040,10 +4118,57 @@ /* if we changed the current renderer for the glyph image format */ /* we need to select it as the next current one */ if ( !error && update && renderer ) - FT_Set_Renderer( library, renderer, 0, 0 ); + { + error = FT_Set_Renderer( library, renderer, 0, 0 ); + if ( error ) + break; + } + } + } + +#ifdef FT_DEBUG_LEVEL_TRACE + +#undef FT_COMPONENT +#define FT_COMPONENT trace_bitmap + + /* we convert to a single bitmap format for computing the checksum */ + if ( !error ) + { + FT_Bitmap bitmap; + FT_Error err; + + + FT_Bitmap_New( &bitmap ); + + /* this also converts the bitmap flow to `down' (i.e., pitch > 0) */ + err = FT_Bitmap_Convert( library, &slot->bitmap, &bitmap, 1 ); + if ( !err ) + { + MD5_CTX ctx; + unsigned char md5[16]; + int i; + + + MD5_Init( &ctx); + MD5_Update( &ctx, bitmap.buffer, bitmap.rows * bitmap.pitch ); + MD5_Final( md5, &ctx ); + + FT_TRACE3(( "MD5 checksum for %dx%d bitmap:\n" + " ", + bitmap.rows, bitmap.pitch )); + for ( i = 0; i < 16; i++ ) + FT_TRACE3(( "%02X", md5[i] )); + FT_TRACE3(( "\n" )); } + + FT_Bitmap_Done( library, &bitmap ); } +#undef FT_COMPONENT +#define FT_COMPONENT trace_objs + +#endif /* FT_DEBUG_LEVEL_TRACE */ + return error; } @@ -4058,7 +4183,7 @@ if ( !slot || !slot->face ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); library = FT_FACE_LIBRARY( slot->face ); @@ -4138,14 +4263,14 @@ FREETYPE_MINOR ) if ( !library ) - return FT_Err_Invalid_Library_Handle; + return FT_THROW( Invalid_Library_Handle ); if ( !clazz ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); /* check freetype version */ if ( clazz->module_requires > FREETYPE_VER_FIXED ) - return FT_Err_Invalid_Version; + return FT_THROW( Invalid_Version ); /* look for a module with the same name in the library's table */ for ( nn = 0; nn < library->num_modules; nn++ ) @@ -4155,7 +4280,7 @@ { /* this installed module has the same name, compare their versions */ if ( clazz->module_version <= module->clazz->module_version ) - return FT_Err_Lower_Module_Version; + return FT_THROW( Lower_Module_Version ); /* remove the module from our list, then exit the loop to replace */ /* it by our new version.. */ @@ -4169,7 +4294,7 @@ if ( library->num_modules >= FT_MAX_MODULES ) { - error = FT_Err_Too_Many_Drivers; + error = FT_THROW( Too_Many_Drivers ); goto Exit; } @@ -4240,7 +4365,8 @@ FT_Renderer renderer = FT_RENDERER( module ); - if ( renderer->clazz->glyph_format == FT_GLYPH_FORMAT_OUTLINE && + if ( renderer->clazz && + renderer->clazz->glyph_format == FT_GLYPH_FORMAT_OUTLINE && renderer->raster ) renderer->clazz->raster_class->raster_done( renderer->raster ); } @@ -4256,7 +4382,7 @@ FT_Get_Module( FT_Library library, const char* module_name ) { - FT_Module result = 0; + FT_Module result = NULL; FT_Module* cur; FT_Module* limit; @@ -4301,19 +4427,18 @@ { FT_Pointer result = NULL; + if ( module ) { FT_ASSERT( module->clazz && module->clazz->get_interface ); - /* first, look for the service in the module - */ + /* first, look for the service in the module */ if ( module->clazz->get_interface ) result = module->clazz->get_interface( module, service_id ); if ( result == NULL ) { - /* we didn't find it, look in all other modules then - */ + /* we didn't find it, look in all other modules then */ FT_Library library = module->library; FT_Module* cur = library->modules; FT_Module* limit = cur + library->num_modules; @@ -4349,7 +4474,7 @@ /* try to find the module from the table, then remove it from there */ if ( !library ) - return FT_Err_Invalid_Library_Handle; + return FT_THROW( Invalid_Library_Handle ); if ( module ) { @@ -4378,7 +4503,119 @@ } } } - return FT_Err_Invalid_Driver_Handle; + return FT_THROW( Invalid_Driver_Handle ); + } + + + static FT_Error + ft_property_do( FT_Library library, + const FT_String* module_name, + const FT_String* property_name, + void* value, + FT_Bool set ) + { + FT_Module* cur; + FT_Module* limit; + FT_Module_Interface interface; + + FT_Service_Properties service; + +#ifdef FT_DEBUG_LEVEL_ERROR + const FT_String* set_name = "FT_Property_Set"; + const FT_String* get_name = "FT_Property_Get"; + const FT_String* func_name = set ? set_name : get_name; +#endif + + FT_Bool missing_func; + + + if ( !library ) + return FT_THROW( Invalid_Library_Handle ); + + if ( !module_name || !property_name || !value ) + return FT_THROW( Invalid_Argument ); + + cur = library->modules; + limit = cur + library->num_modules; + + /* search module */ + for ( ; cur < limit; cur++ ) + if ( !ft_strcmp( cur[0]->clazz->module_name, module_name ) ) + break; + + if ( cur == limit ) + { + FT_ERROR(( "%s: can't find module `%s'\n", + func_name, module_name )); + return FT_THROW( Missing_Module ); + } + + /* check whether we have a service interface */ + if ( !cur[0]->clazz->get_interface ) + { + FT_ERROR(( "%s: module `%s' doesn't support properties\n", + func_name, module_name )); + return FT_THROW( Unimplemented_Feature ); + } + + /* search property service */ + interface = cur[0]->clazz->get_interface( cur[0], + FT_SERVICE_ID_PROPERTIES ); + if ( !interface ) + { + FT_ERROR(( "%s: module `%s' doesn't support properties\n", + func_name, module_name )); + return FT_THROW( Unimplemented_Feature ); + } + + service = (FT_Service_Properties)interface; + + if ( set ) + missing_func = (FT_Bool)( !service->set_property ); + else + missing_func = (FT_Bool)( !service->get_property ); + + if ( missing_func ) + { + FT_ERROR(( "%s: property service of module `%s' is broken\n", + func_name, module_name )); + return FT_THROW( Unimplemented_Feature ); + } + + return set ? service->set_property( cur[0], property_name, value ) + : service->get_property( cur[0], property_name, value ); + } + + + /* documentation is in ftmodapi.h */ + + FT_EXPORT_DEF( FT_Error ) + FT_Property_Set( FT_Library library, + const FT_String* module_name, + const FT_String* property_name, + const void* value ) + { + return ft_property_do( library, + module_name, + property_name, + (void*)value, + TRUE ); + } + + + /* documentation is in ftmodapi.h */ + + FT_EXPORT_DEF( FT_Error ) + FT_Property_Get( FT_Library library, + const FT_String* module_name, + const FT_String* property_name, + void* value ) + { + return ft_property_do( library, + module_name, + property_name, + value, + FALSE ); } @@ -4400,6 +4637,9 @@ FT_EXPORT_DEF( FT_Error ) FT_Reference_Library( FT_Library library ) { + if ( !library ) + return FT_THROW( Invalid_Library_Handle ); + library->refcount++; return FT_Err_Ok; @@ -4416,8 +4656,8 @@ FT_Error error; - if ( !memory ) - return FT_Err_Invalid_Argument; + if ( !memory || !alibrary ) + return FT_THROW( Invalid_Argument ); #ifdef FT_DEBUG_LEVEL_ERROR /* init debugging support */ @@ -4504,7 +4744,7 @@ if ( !library ) - return FT_Err_Invalid_Library_Handle; + return FT_THROW( Invalid_Library_Handle ); library->refcount--; if ( library->refcount > 0 ) @@ -4651,70 +4891,6 @@ } -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS - - FT_BASE_DEF( FT_Error ) - ft_stub_set_char_sizes( FT_Size size, - FT_F26Dot6 width, - FT_F26Dot6 height, - FT_UInt horz_res, - FT_UInt vert_res ) - { - FT_Size_RequestRec req; - FT_Driver driver = size->face->driver; - - - if ( driver->clazz->request_size ) - { - req.type = FT_SIZE_REQUEST_TYPE_NOMINAL; - req.width = width; - req.height = height; - - if ( horz_res == 0 ) - horz_res = vert_res; - - if ( vert_res == 0 ) - vert_res = horz_res; - - if ( horz_res == 0 ) - horz_res = vert_res = 72; - - req.horiResolution = horz_res; - req.vertResolution = vert_res; - - return driver->clazz->request_size( size, &req ); - } - - return 0; - } - - - FT_BASE_DEF( FT_Error ) - ft_stub_set_pixel_sizes( FT_Size size, - FT_UInt width, - FT_UInt height ) - { - FT_Size_RequestRec req; - FT_Driver driver = size->face->driver; - - - if ( driver->clazz->request_size ) - { - req.type = FT_SIZE_REQUEST_TYPE_NOMINAL; - req.width = width << 6; - req.height = height << 6; - req.horiResolution = 0; - req.vertResolution = 0; - - return driver->clazz->request_size( size, &req ); - } - - return 0; - } - -#endif /* FT_CONFIG_OPTION_OLD_INTERNALS */ - - /* documentation is in freetype.h */ FT_EXPORT_DEF( FT_Error ) @@ -4726,7 +4902,7 @@ FT_Int *p_arg2, FT_Matrix *p_transform ) { - FT_Error error = FT_Err_Invalid_Argument; + FT_Error error = FT_ERR( Invalid_Argument ); if ( glyph && @@ -4742,6 +4918,8 @@ *p_arg1 = subg->arg1; *p_arg2 = subg->arg2; *p_transform = subg->transform; + + error = FT_Err_Ok; } return error; diff --git a/src/base/ftotval.c b/src/base/ftotval.c index 694fd2b..5fc73d7 100644 --- a/src/base/ftotval.c +++ b/src/base/ftotval.c @@ -4,7 +4,7 @@ /* */ /* FreeType API for validating OpenType tables (body). */ /* */ -/* Copyright 2004, 2006, 2008, 2010 by */ +/* Copyright 2004, 2006, 2008, 2010, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -16,6 +16,8 @@ /***************************************************************************/ #include <ft2build.h> +#include FT_INTERNAL_DEBUG_H + #include FT_INTERNAL_OBJECTS_H #include FT_SERVICE_OPENTYPE_VALIDATE_H #include FT_OPENTYPE_VALIDATE_H @@ -38,7 +40,7 @@ if ( !face ) { - error = FT_Err_Invalid_Face_Handle; + error = FT_THROW( Invalid_Face_Handle ); goto Exit; } @@ -48,7 +50,7 @@ GSUB_table && JSTF_table ) ) { - error = FT_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Exit; } @@ -63,7 +65,7 @@ GSUB_table, JSTF_table ); else - error = FT_Err_Unimplemented_Feature; + error = FT_THROW( Unimplemented_Feature ); Exit: return error; diff --git a/src/base/ftoutln.c b/src/base/ftoutln.c index 9ae276d..8749d64 100644 --- a/src/base/ftoutln.c +++ b/src/base/ftoutln.c @@ -4,7 +4,7 @@ /* */ /* FreeType outline management (body). */ /* */ -/* Copyright 1996-2008, 2010, 2012 by */ +/* Copyright 1996-2008, 2010, 2012-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -26,6 +26,7 @@ #include <ft2build.h> #include FT_OUTLINE_H #include FT_INTERNAL_OBJECTS_H +#include FT_INTERNAL_CALC_H #include FT_INTERNAL_DEBUG_H #include FT_TRIGONOMETRY_H @@ -72,8 +73,11 @@ FT_Pos delta; - if ( !outline || !func_interface ) - return FT_Err_Invalid_Argument; + if ( !outline ) + return FT_THROW( Invalid_Outline ); + + if ( !func_interface ) + return FT_THROW( Invalid_Argument ); shift = func_interface->shift; delta = func_interface->delta; @@ -127,7 +131,7 @@ v_start.x = ( v_start.x + v_last.x ) / 2; v_start.y = ( v_start.y + v_last.y ) / 2; - v_last = v_start; + /* v_last = v_start; */ } point--; tags--; @@ -286,7 +290,7 @@ return error; Invalid_Outline: - return FT_Err_Invalid_Outline; + return FT_THROW( Invalid_Outline ); } @@ -300,10 +304,17 @@ if ( !anoutline || !memory ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); *anoutline = null_outline; + if ( numContours < 0 || + (FT_UInt)numContours > numPoints ) + return FT_THROW( Invalid_Argument ); + + if ( numPoints > FT_OUTLINE_POINTS_MAX ) + return FT_THROW( Array_Too_Large ); + if ( FT_NEW_ARRAY( anoutline->points, numPoints ) || FT_NEW_ARRAY( anoutline->tags, numPoints ) || FT_NEW_ARRAY( anoutline->contours, numContours ) ) @@ -332,7 +343,7 @@ FT_Outline *anoutline ) { if ( !library ) - return FT_Err_Invalid_Library_Handle; + return FT_THROW( Invalid_Library_Handle ); return FT_Outline_New_Internal( library->memory, numPoints, numContours, anoutline ); @@ -354,7 +365,7 @@ /* empty glyph? */ if ( n_points == 0 && n_contours == 0 ) - return 0; + return FT_Err_Ok; /* check point and contour counts */ if ( n_points <= 0 || n_contours <= 0 ) @@ -376,11 +387,11 @@ goto Bad; /* XXX: check the tags array */ - return 0; + return FT_Err_Ok; } Bad: - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); } @@ -393,10 +404,12 @@ FT_Int is_owner; - if ( !source || !target || - source->n_points != target->n_points || + if ( !source || !target ) + return FT_THROW( Invalid_Outline ); + + if ( source->n_points != target->n_points || source->n_contours != target->n_contours ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); if ( source == target ) return FT_Err_Ok; @@ -422,20 +435,21 @@ FT_Outline_Done_Internal( FT_Memory memory, FT_Outline* outline ) { - if ( memory && outline ) - { - if ( outline->flags & FT_OUTLINE_OWNER ) - { - FT_FREE( outline->points ); - FT_FREE( outline->tags ); - FT_FREE( outline->contours ); - } - *outline = null_outline; + if ( !outline ) + return FT_THROW( Invalid_Outline ); - return FT_Err_Ok; + if ( !memory ) + return FT_THROW( Invalid_Argument ); + + if ( outline->flags & FT_OUTLINE_OWNER ) + { + FT_FREE( outline->points ); + FT_FREE( outline->tags ); + FT_FREE( outline->contours ); } - else - return FT_Err_Invalid_Argument; + *outline = null_outline; + + return FT_Err_Ok; } @@ -448,7 +462,7 @@ /* check for valid `outline' in FT_Outline_Done_Internal() */ if ( !library ) - return FT_Err_Invalid_Library_Handle; + return FT_THROW( Invalid_Library_Handle ); return FT_Outline_Done_Internal( library->memory, outline ); } @@ -568,11 +582,13 @@ { char* p = outline->tags + first; char* q = outline->tags + last; - char swap; while ( p < q ) { + char swap; + + swap = *p; *p = *q; *q = swap; @@ -602,21 +618,24 @@ if ( !library ) - return FT_Err_Invalid_Library_Handle; + return FT_THROW( Invalid_Library_Handle ); - if ( !outline || !params ) - return FT_Err_Invalid_Argument; + if ( !outline ) + return FT_THROW( Invalid_Outline ); + + if ( !params ) + return FT_THROW( Invalid_Argument ); renderer = library->cur_renderer; node = library->renderers.head; params->source = (void*)outline; - error = FT_Err_Cannot_Render_Glyph; + error = FT_ERR( Cannot_Render_Glyph ); while ( renderer ) { error = renderer->raster_render( renderer->raster, params ); - if ( !error || FT_ERROR_BASE( error ) != FT_Err_Cannot_Render_Glyph ) + if ( !error || FT_ERR_NEQ( error, Cannot_Render_Glyph ) ) break; /* FT_Err_Cannot_Render_Glyph is returned if the render mode */ @@ -633,7 +652,7 @@ /* if we changed the current renderer for the glyph image format */ /* we need to select it as the next current one */ if ( !error && update && renderer ) - FT_Set_Renderer( library, renderer, 0, 0 ); + error = FT_Set_Renderer( library, renderer, 0, 0 ); return error; } @@ -650,9 +669,9 @@ if ( !abitmap ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); - /* other checks are delayed to FT_Outline_Render() */ + /* other checks are delayed to `FT_Outline_Render' */ params.target = abitmap; params.flags = 0; @@ -713,7 +732,8 @@ #if 0 #define FT_OUTLINE_GET_CONTOUR( outline, c, first, last ) \ - do { \ + do \ + { \ (first) = ( c > 0 ) ? (outline)->points + \ (outline)->contours[c - 1] + 1 \ : (outline)->points; \ @@ -882,85 +902,126 @@ FT_Outline_Embolden( FT_Outline* outline, FT_Pos strength ) { + return FT_Outline_EmboldenXY( outline, strength, strength ); + } + + + /* documentation is in ftoutln.h */ + + FT_EXPORT_DEF( FT_Error ) + FT_Outline_EmboldenXY( FT_Outline* outline, + FT_Pos xstrength, + FT_Pos ystrength ) + { FT_Vector* points; FT_Vector v_prev, v_first, v_next, v_cur; - FT_Angle rotate, angle_in, angle_out; FT_Int c, n, first; FT_Int orientation; if ( !outline ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Outline ); - strength /= 2; - if ( strength == 0 ) + xstrength /= 2; + ystrength /= 2; + if ( xstrength == 0 && ystrength == 0 ) return FT_Err_Ok; orientation = FT_Outline_Get_Orientation( outline ); if ( orientation == FT_ORIENTATION_NONE ) { if ( outline->n_contours ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); else return FT_Err_Ok; } - if ( orientation == FT_ORIENTATION_TRUETYPE ) - rotate = -FT_ANGLE_PI2; - else - rotate = FT_ANGLE_PI2; - points = outline->points; first = 0; for ( c = 0; c < outline->n_contours; c++ ) { - int last = outline->contours[c]; + FT_Vector in, out, shift; + FT_Fixed l_in, l_out, l, q, d; + int last = outline->contours[c]; v_first = points[first]; v_prev = points[last]; v_cur = v_first; - for ( n = first; n <= last; n++ ) + /* compute incoming normalized vector */ + in.x = v_cur.x - v_prev.x; + in.y = v_cur.y - v_prev.y; + l_in = FT_Vector_Length( &in ); + if ( l_in ) { - FT_Vector in, out; - FT_Angle angle_diff; - FT_Pos d; - FT_Fixed scale; - + in.x = FT_DivFix( in.x, l_in ); + in.y = FT_DivFix( in.y, l_in ); + } + for ( n = first; n <= last; n++ ) + { if ( n < last ) v_next = points[n + 1]; else v_next = v_first; - /* compute the in and out vectors */ - in.x = v_cur.x - v_prev.x; - in.y = v_cur.y - v_prev.y; - + /* compute outgoing normalized vector */ out.x = v_next.x - v_cur.x; out.y = v_next.y - v_cur.y; + l_out = FT_Vector_Length( &out ); + if ( l_out ) + { + out.x = FT_DivFix( out.x, l_out ); + out.y = FT_DivFix( out.y, l_out ); + } - angle_in = FT_Atan2( in.x, in.y ); - angle_out = FT_Atan2( out.x, out.y ); - angle_diff = FT_Angle_Diff( angle_in, angle_out ); - scale = FT_Cos( angle_diff / 2 ); + d = FT_MulFix( in.x, out.x ) + FT_MulFix( in.y, out.y ); - if ( scale < 0x4000L && scale > -0x4000L ) - in.x = in.y = 0; - else + /* shift only if turn is less than ~160 degrees */ + if ( d > -0xF000L ) { - d = FT_DivFix( strength, scale ); + d = d + 0x10000L; + + /* shift components are aligned along lateral bisector */ + /* and directed according to the outline orientation. */ + shift.x = in.y + out.y; + shift.y = in.x + out.x; + + if ( orientation == FT_ORIENTATION_TRUETYPE ) + shift.x = -shift.x; + else + shift.y = -shift.y; + + /* restrict shift magnitude to better handle collapsing segments */ + q = FT_MulFix( out.x, in.y ) - FT_MulFix( out.y, in.x ); + if ( orientation == FT_ORIENTATION_TRUETYPE ) + q = -q; + + l = FT_MIN( l_in, l_out ); - FT_Vector_From_Polar( &in, d, angle_in + angle_diff / 2 - rotate ); + /* non-strict inequalities avoid divide-by-zero when q == l == 0 */ + if ( FT_MulFix( xstrength, q ) <= FT_MulFix( d, l ) ) + shift.x = FT_MulDiv( shift.x, xstrength, d ); + else + shift.x = FT_MulDiv( shift.x, l, q ); + + + if ( FT_MulFix( ystrength, q ) <= FT_MulFix( d, l ) ) + shift.y = FT_MulDiv( shift.y, ystrength, d ); + else + shift.y = FT_MulDiv( shift.y, l, q ); } + else + shift.x = shift.y = 0; - outline->points[n].x = v_cur.x + strength + in.x; - outline->points[n].y = v_cur.y + strength + in.y; + outline->points[n].x = v_cur.x + xstrength + shift.x; + outline->points[n].y = v_cur.y + ystrength + shift.y; - v_prev = v_cur; - v_cur = v_next; + in = out; + l_in = l_out; + v_cur = v_next; } first = last + 1; @@ -975,23 +1036,12 @@ FT_EXPORT_DEF( FT_Orientation ) FT_Outline_Get_Orientation( FT_Outline* outline ) { - FT_Pos xmin = 32768L; - FT_Pos xmin_ymin = 32768L; - FT_Pos xmin_ymax = -32768L; - FT_Vector* xmin_first = NULL; - FT_Vector* xmin_last = NULL; - - short* contour; - - FT_Vector* first; - FT_Vector* last; - FT_Vector* prev; - FT_Vector* point; - - int i; - FT_Pos ray_y[3]; - FT_Orientation result[3] = - { FT_ORIENTATION_NONE, FT_ORIENTATION_NONE, FT_ORIENTATION_NONE }; + FT_BBox cbox; + FT_Int xshift, yshift; + FT_Vector* points; + FT_Vector v_prev, v_cur; + FT_Int c, n, first; + FT_Pos area = 0; if ( !outline || outline->n_points <= 0 ) @@ -1002,127 +1052,45 @@ /* cubic or quadratic curves, this test deals with the polygon */ /* only which is spanned up by the control points. */ - first = outline->points; - for ( contour = outline->contours; - contour < outline->contours + outline->n_contours; - contour++, first = last + 1 ) - { - FT_Pos contour_xmin = 32768L; - FT_Pos contour_xmax = -32768L; - FT_Pos contour_ymin = 32768L; - FT_Pos contour_ymax = -32768L; - + FT_Outline_Get_CBox( outline, &cbox ); - last = outline->points + *contour; + /* Handle collapsed outlines to avoid undefined FT_MSB. */ + if ( cbox.xMin == cbox.xMax || cbox.yMin == cbox.yMax ) + return FT_ORIENTATION_NONE; - /* skip degenerate contours */ - if ( last < first + 2 ) - continue; + xshift = FT_MSB( FT_ABS( cbox.xMax ) | FT_ABS( cbox.xMin ) ) - 14; + xshift = FT_MAX( xshift, 0 ); - for ( point = first; point <= last; ++point ) - { - if ( point->x < contour_xmin ) - contour_xmin = point->x; + yshift = FT_MSB( cbox.yMax - cbox.yMin ) - 14; + yshift = FT_MAX( yshift, 0 ); - if ( point->x > contour_xmax ) - contour_xmax = point->x; - - if ( point->y < contour_ymin ) - contour_ymin = point->y; - - if ( point->y > contour_ymax ) - contour_ymax = point->y; - } - - if ( contour_xmin < xmin && - contour_xmin != contour_xmax && - contour_ymin != contour_ymax ) - { - xmin = contour_xmin; - xmin_ymin = contour_ymin; - xmin_ymax = contour_ymax; - xmin_first = first; - xmin_last = last; - } - } - - if ( xmin == 32768L ) - return FT_ORIENTATION_TRUETYPE; - - ray_y[0] = ( xmin_ymin * 3 + xmin_ymax ) >> 2; - ray_y[1] = ( xmin_ymin + xmin_ymax ) >> 1; - ray_y[2] = ( xmin_ymin + xmin_ymax * 3 ) >> 2; + points = outline->points; - for ( i = 0; i < 3; i++ ) + first = 0; + for ( c = 0; c < outline->n_contours; c++ ) { - FT_Pos left_x; - FT_Pos right_x; - FT_Vector* left1; - FT_Vector* left2; - FT_Vector* right1; - FT_Vector* right2; - + FT_Int last = outline->contours[c]; - RedoRay: - left_x = 32768L; - right_x = -32768L; - left1 = left2 = right1 = right2 = NULL; + v_prev = points[last]; - prev = xmin_last; - for ( point = xmin_first; point <= xmin_last; prev = point, ++point ) + for ( n = first; n <= last; n++ ) { - FT_Pos tmp_x; - - - if ( point->y == ray_y[i] || prev->y == ray_y[i] ) - { - ray_y[i]++; - goto RedoRay; - } - - if ( ( point->y < ray_y[i] && prev->y < ray_y[i] ) || - ( point->y > ray_y[i] && prev->y > ray_y[i] ) ) - continue; - - tmp_x = FT_MulDiv( point->x - prev->x, - ray_y[i] - prev->y, - point->y - prev->y ) + prev->x; - - if ( tmp_x < left_x ) - { - left_x = tmp_x; - left1 = prev; - left2 = point; - } - - if ( tmp_x > right_x ) - { - right_x = tmp_x; - right1 = prev; - right2 = point; - } + v_cur = points[n]; + area += ( ( v_cur.y - v_prev.y ) >> yshift ) * + ( ( v_cur.x + v_prev.x ) >> xshift ); + v_prev = v_cur; } - if ( left1 && right1 ) - { - if ( left1->y < left2->y && right1->y > right2->y ) - result[i] = FT_ORIENTATION_TRUETYPE; - else if ( left1->y > left2->y && right1->y < right2->y ) - result[i] = FT_ORIENTATION_POSTSCRIPT; - else - result[i] = FT_ORIENTATION_NONE; - } + first = last + 1; } - if ( result[0] != FT_ORIENTATION_NONE && - ( result[0] == result[1] || result[0] == result[2] ) ) - return result[0]; - - if ( result[1] != FT_ORIENTATION_NONE && result[1] == result[2] ) - return result[1]; - - return FT_ORIENTATION_TRUETYPE; + if ( area > 0 ) + return FT_ORIENTATION_POSTSCRIPT; + else if ( area < 0 ) + return FT_ORIENTATION_TRUETYPE; + else + return FT_ORIENTATION_NONE; } diff --git a/src/base/ftpfr.c b/src/base/ftpfr.c index 3a0f92d..7425abe 100644 --- a/src/base/ftpfr.c +++ b/src/base/ftpfr.c @@ -4,7 +4,7 @@ /* */ /* FreeType API for accessing PFR-specific data (body). */ /* */ -/* Copyright 2002, 2003, 2004, 2008, 2010 by */ +/* Copyright 2002-2004, 2008, 2010, 2013, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -16,6 +16,8 @@ /***************************************************************************/ #include <ft2build.h> +#include FT_INTERNAL_DEBUG_H + #include FT_INTERNAL_OBJECTS_H #include FT_SERVICE_PFR_H @@ -48,7 +50,7 @@ if ( !face ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Face_Handle ); service = ft_pfr_check( face ); if ( service ) @@ -84,7 +86,7 @@ if ( ametrics_y_scale ) *ametrics_y_scale = y_scale; - error = FT_Err_Unknown_File_Format; + error = FT_THROW( Unknown_File_Format ); } return error; @@ -104,7 +106,10 @@ if ( !face ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Face_Handle ); + + if ( !avector ) + return FT_THROW( Invalid_Argument ); service = ft_pfr_check( face ); if ( service ) @@ -128,14 +133,18 @@ FT_Service_PfrMetrics service; + if ( !face ) + return FT_THROW( Invalid_Face_Handle ); + + if ( !aadvance ) + return FT_THROW( Invalid_Argument ); + service = ft_pfr_check( face ); if ( service ) - { error = service->get_advance( face, gindex, aadvance ); - } else /* XXX: TODO: PROVIDE ADVANCE-LOADING METHOD TO ALL FONT DRIVERS */ - error = FT_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); return error; } diff --git a/src/base/ftpic.c b/src/base/ftpic.c index b74e90d..9bd92f7 100644 --- a/src/base/ftpic.c +++ b/src/base/ftpic.c @@ -4,7 +4,7 @@ /* */ /* The FreeType position independent code services (body). */ /* */ -/* Copyright 2009 by */ +/* Copyright 2009, 2013 by */ /* Oran Agra and Mickey Gabel. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -29,7 +29,8 @@ ft_pic_container_init( FT_Library library ) { FT_PIC_Container* pic_container = &library->pic_container; - FT_Error error = FT_Err_Ok; + FT_Error error; + FT_MEM_SET( pic_container, 0, sizeof ( *pic_container ) ); diff --git a/src/base/ftrfork.c b/src/base/ftrfork.c index 01d8625..efe24d6 100644 --- a/src/base/ftrfork.c +++ b/src/base/ftrfork.c @@ -4,7 +4,7 @@ /* */ /* Embedded resource forks accessor (body). */ /* */ -/* Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010 by */ +/* Copyright 2004-2010, 2013, 2014 by */ /* Masatake YAMATO and Redhat K.K. */ /* */ /* FT_Raccess_Get_HeaderInfo() and raccess_guess_darwin_hfsplus() are */ @@ -29,6 +29,7 @@ #include FT_INTERNAL_STREAM_H #include FT_INTERNAL_RFORK_H #include "basepic.h" +#include "ftbase.h" #undef FT_COMPONENT #define FT_COMPONENT trace_raccess @@ -86,7 +87,7 @@ /* map_len = head[12] .. head[15] */ if ( *rdata_pos + rdata_len != map_pos || map_pos == rfork_offset ) - return FT_Err_Unknown_File_Format; + return FT_THROW( Unknown_File_Format ); error = FT_Stream_Seek( stream, map_pos ); if ( error ) @@ -108,7 +109,7 @@ allmatch = 0; } if ( !allzeros && !allmatch ) - return FT_Err_Unknown_File_Format; + return FT_THROW( Unknown_File_Format ); /* If we have reached this point then it is probably a mac resource */ /* file. Now, does it contain any interesting resources? */ @@ -121,7 +122,7 @@ if ( FT_READ_USHORT( type_list ) ) return error; if ( type_list == -1 ) - return FT_Err_Unknown_File_Format; + return FT_THROW( Unknown_File_Format ); error = FT_Stream_Seek( stream, map_pos + type_list ); if ( error ) @@ -151,6 +152,7 @@ FT_Long map_offset, FT_Long rdata_pos, FT_Long tag, + FT_Bool sort_by_res_id, FT_Long **offsets, FT_Long *count ) { @@ -163,6 +165,7 @@ FT_RFork_Ref *ref = NULL; + FT_TRACE3(( "\n" )); error = FT_Stream_Seek( stream, map_offset ); if ( error ) return error; @@ -179,10 +182,12 @@ return error; FT_TRACE2(( "Resource tags: %c%c%c%c\n", - (char)( 0xff & ( tag_internal >> 24 ) ), - (char)( 0xff & ( tag_internal >> 16 ) ), - (char)( 0xff & ( tag_internal >> 8 ) ), - (char)( 0xff & ( tag_internal >> 0 ) ) )); + (char)( 0xFF & ( tag_internal >> 24 ) ), + (char)( 0xFF & ( tag_internal >> 16 ) ), + (char)( 0xFF & ( tag_internal >> 8 ) ), + (char)( 0xFF & ( tag_internal >> 0 ) ) )); + FT_TRACE3(( " : subcount=%d, suboffset=0x%04x\n", + subcnt, rpos )); if ( tag_internal == tag ) { @@ -208,11 +213,24 @@ goto Exit; ref[j].offset = temp & 0xFFFFFFL; + FT_TRACE3(( " [%d]:" + " resource_id=0x%04x, offset=0x%08x\n", + j, ref[j].res_id, ref[j].offset )); } - ft_qsort( ref, *count, sizeof ( FT_RFork_Ref ), - ( int(*)(const void*, const void*) ) - ft_raccess_sort_ref_by_id ); + if (sort_by_res_id) + { + ft_qsort( ref, *count, sizeof ( FT_RFork_Ref ), + ( int(*)(const void*, const void*) ) + ft_raccess_sort_ref_by_id ); + + FT_TRACE3(( " -- sort resources by their ids --\n" )); + for ( j = 0; j < *count; ++ j ) { + FT_TRACE3(( " [%d]:" + " resource_id=0x%04x, offset=0x%08x\n", + j, ref[j].res_id, ref[j].offset )); + } + } if ( FT_NEW_ARRAY( offsets_internal, *count ) ) goto Exit; @@ -233,7 +251,7 @@ } } - return FT_Err_Cannot_Open_Resource; + return FT_THROW( Cannot_Open_Resource ); } @@ -362,7 +380,7 @@ FT_Long *offsets, FT_Error *errors ) { - FT_Long i; + FT_Int i; for ( i = 0; i < FT_RACCESS_N_RULES; i++ ) @@ -435,7 +453,7 @@ *result_file_name = NULL; if ( NULL == stream ) - return FT_Err_Cannot_Open_Stream; + return FT_THROW( Cannot_Open_Stream ); return raccess_guess_apple_generic( library, stream, base_file_name, magic, result_offset ); @@ -457,7 +475,7 @@ *result_file_name = NULL; if ( NULL == stream ) - return FT_Err_Cannot_Open_Stream; + return FT_THROW( Cannot_Open_Stream ); return raccess_guess_apple_generic( library, stream, base_file_name, magic, result_offset ); @@ -481,7 +499,7 @@ memory = library->memory; newpath = raccess_make_file_name( memory, base_file_name, "._" ); if ( !newpath ) - return FT_Err_Out_Of_Memory; + return FT_THROW( Out_Of_Memory ); error = raccess_guess_linux_double_from_file_name( library, newpath, result_offset ); @@ -507,7 +525,7 @@ FT_Error error; char* newpath = NULL; FT_Memory memory; - FT_Long base_file_len = ft_strlen( base_file_name ); + FT_Long base_file_len = (FT_Long)ft_strlen( base_file_name ); FT_UNUSED( stream ); @@ -515,7 +533,7 @@ memory = library->memory; if ( base_file_len + 6 > FT_INT_MAX ) - return FT_Err_Array_Too_Large; + return FT_THROW( Array_Too_Large ); if ( FT_ALLOC( newpath, base_file_len + 6 ) ) return error; @@ -543,7 +561,7 @@ FT_Error error; char* newpath = NULL; FT_Memory memory; - FT_Long base_file_len = ft_strlen( base_file_name ); + FT_Long base_file_len = (FT_Long)ft_strlen( base_file_name ); FT_UNUSED( stream ); @@ -551,7 +569,7 @@ memory = library->memory; if ( base_file_len + 18 > FT_INT_MAX ) - return FT_Err_Array_Too_Large; + return FT_THROW( Array_Too_Large ); if ( FT_ALLOC( newpath, base_file_len + 18 ) ) return error; @@ -584,7 +602,7 @@ newpath = raccess_make_file_name( memory, base_file_name, "resource.frk/" ); if ( !newpath ) - return FT_Err_Out_Of_Memory; + return FT_THROW( Out_Of_Memory ); *result_file_name = newpath; *result_offset = 0; @@ -610,7 +628,7 @@ newpath = raccess_make_file_name( memory, base_file_name, ".resource/" ); if ( !newpath ) - return FT_Err_Out_Of_Memory; + return FT_THROW( Out_Of_Memory ); *result_file_name = newpath; *result_offset = 0; @@ -637,7 +655,7 @@ newpath = raccess_make_file_name( memory, base_file_name, "%" ); if ( !newpath ) - return FT_Err_Out_Of_Memory; + return FT_THROW( Out_Of_Memory ); error = raccess_guess_linux_double_from_file_name( library, newpath, result_offset ); @@ -669,7 +687,7 @@ newpath = raccess_make_file_name( memory, base_file_name, ".AppleDouble/" ); if ( !newpath ) - return FT_Err_Out_Of_Memory; + return FT_THROW( Out_Of_Memory ); error = raccess_guess_linux_double_from_file_name( library, newpath, result_offset ); @@ -708,7 +726,7 @@ if ( FT_READ_LONG( magic_from_stream ) ) return error; if ( magic_from_stream != magic ) - return FT_Err_Unknown_File_Format; + return FT_THROW( Unknown_File_Format ); if ( FT_READ_LONG( version_number ) ) return error; @@ -721,7 +739,7 @@ if ( FT_READ_USHORT( n_of_entries ) ) return error; if ( n_of_entries == 0 ) - return FT_Err_Unknown_File_Format; + return FT_THROW( Unknown_File_Format ); for ( i = 0; i < n_of_entries; i++ ) { @@ -744,7 +762,7 @@ } } - return FT_Err_Unknown_File_Format; + return FT_THROW( Unknown_File_Format ); } @@ -827,7 +845,7 @@ FT_Long *offsets, FT_Error *errors ) { - int i; + FT_Int i; FT_UNUSED( library ); FT_UNUSED( stream ); @@ -838,7 +856,7 @@ { new_names[i] = NULL; offsets[i] = 0; - errors[i] = FT_Err_Unimplemented_Feature; + errors[i] = FT_ERR( Unimplemented_Feature ); } } diff --git a/src/base/ftsnames.c b/src/base/ftsnames.c index 3447888..260e91c 100644 --- a/src/base/ftsnames.c +++ b/src/base/ftsnames.c @@ -44,7 +44,7 @@ FT_UInt idx, FT_SfntName *aname ) { - FT_Error error = FT_Err_Invalid_Argument; + FT_Error error = FT_ERR( Invalid_Argument ); if ( aname && face && FT_IS_SFNT( face ) ) diff --git a/src/base/ftstream.c b/src/base/ftstream.c index fc2868e..759fd8f 100644 --- a/src/base/ftstream.c +++ b/src/base/ftstream.c @@ -4,7 +4,7 @@ /* */ /* I/O stream support (body). */ /* */ -/* Copyright 2000-2002, 2004-2006, 2008-2011 by */ +/* Copyright 2000-2002, 2004-2006, 2008-2011, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -68,7 +68,7 @@ " invalid i/o; pos = 0x%lx, size = 0x%lx\n", pos, stream->size )); - error = FT_Err_Invalid_Stream_Operation; + error = FT_THROW( Invalid_Stream_Operation ); } } /* note that seeking to the first position after the file is valid */ @@ -78,7 +78,7 @@ " invalid i/o; pos = 0x%lx, size = 0x%lx\n", pos, stream->size )); - error = FT_Err_Invalid_Stream_Operation; + error = FT_THROW( Invalid_Stream_Operation ); } if ( !error ) @@ -93,7 +93,7 @@ FT_Long distance ) { if ( distance < 0 ) - return FT_Err_Invalid_Stream_Operation; + return FT_THROW( Invalid_Stream_Operation ); return FT_Stream_Seek( stream, (FT_ULong)( stream->pos + distance ) ); } @@ -131,7 +131,7 @@ " invalid i/o; pos = 0x%lx, size = 0x%lx\n", pos, stream->size )); - return FT_Err_Invalid_Stream_Operation; + return FT_THROW( Invalid_Stream_Operation ); } if ( stream->read ) @@ -153,7 +153,7 @@ " invalid read; expected %lu bytes, got %lu\n", count, read_bytes )); - error = FT_Err_Invalid_Stream_Operation; + error = FT_THROW( Invalid_Stream_Operation ); } return error; @@ -254,7 +254,7 @@ " frame size (%lu) larger than stream size (%lu)\n", count, stream->size )); - error = FT_Err_Invalid_Stream_Operation; + error = FT_THROW( Invalid_Stream_Operation ); goto Exit; } @@ -277,7 +277,7 @@ count, read_bytes )); FT_FREE( stream->base ); - error = FT_Err_Invalid_Stream_Operation; + error = FT_THROW( Invalid_Stream_Operation ); } stream->cursor = stream->base; stream->limit = stream->cursor + count; @@ -293,7 +293,7 @@ " invalid i/o; pos = 0x%lx, count = %lu, size = 0x%lx\n", stream->pos, count, stream->size )); - error = FT_Err_Invalid_Stream_Operation; + error = FT_THROW( Invalid_Stream_Operation ); goto Exit; } @@ -474,7 +474,7 @@ return result; Fail: - *error = FT_Err_Invalid_Stream_Operation; + *error = FT_THROW( Invalid_Stream_Operation ); FT_ERROR(( "FT_Stream_ReadChar:" " invalid i/o; pos = 0x%lx, size = 0x%lx\n", stream->pos, stream->size )); @@ -521,7 +521,7 @@ return result; Fail: - *error = FT_Err_Invalid_Stream_Operation; + *error = FT_THROW( Invalid_Stream_Operation ); FT_ERROR(( "FT_Stream_ReadUShort:" " invalid i/o; pos = 0x%lx, size = 0x%lx\n", stream->pos, stream->size )); @@ -568,7 +568,7 @@ return result; Fail: - *error = FT_Err_Invalid_Stream_Operation; + *error = FT_THROW( Invalid_Stream_Operation ); FT_ERROR(( "FT_Stream_ReadUShortLE:" " invalid i/o; pos = 0x%lx, size = 0x%lx\n", stream->pos, stream->size )); @@ -615,7 +615,7 @@ return result; Fail: - *error = FT_Err_Invalid_Stream_Operation; + *error = FT_THROW( Invalid_Stream_Operation ); FT_ERROR(( "FT_Stream_ReadUOffset:" " invalid i/o; pos = 0x%lx, size = 0x%lx\n", stream->pos, stream->size )); @@ -662,7 +662,7 @@ return result; Fail: - *error = FT_Err_Invalid_Stream_Operation; + *error = FT_THROW( Invalid_Stream_Operation ); FT_ERROR(( "FT_Stream_ReadULong:" " invalid i/o; pos = 0x%lx, size = 0x%lx\n", stream->pos, stream->size )); @@ -709,7 +709,7 @@ return result; Fail: - *error = FT_Err_Invalid_Stream_Operation; + *error = FT_THROW( Invalid_Stream_Operation ); FT_ERROR(( "FT_Stream_ReadULongLE:" " invalid i/o; pos = 0x%lx, size = 0x%lx\n", stream->pos, stream->size )); @@ -727,8 +727,12 @@ FT_Bool frame_accessed = 0; FT_Byte* cursor; - if ( !fields || !stream ) - return FT_Err_Invalid_Argument; + + if ( !fields ) + return FT_THROW( Invalid_Argument ); + + if ( !stream ) + return FT_THROW( Invalid_Stream_Handle ); cursor = stream->cursor; @@ -760,7 +764,7 @@ if ( cursor + len > stream->limit ) { - error = FT_Err_Invalid_Stream_Operation; + error = FT_THROW( Invalid_Stream_Operation ); goto Exit; } @@ -776,43 +780,43 @@ case ft_frame_byte: case ft_frame_schar: /* read a single byte */ - value = FT_NEXT_BYTE(cursor); + value = FT_NEXT_BYTE( cursor ); sign_shift = 24; break; case ft_frame_short_be: case ft_frame_ushort_be: /* read a 2-byte big-endian short */ - value = FT_NEXT_USHORT(cursor); + value = FT_NEXT_USHORT( cursor) ; sign_shift = 16; break; case ft_frame_short_le: case ft_frame_ushort_le: /* read a 2-byte little-endian short */ - value = FT_NEXT_USHORT_LE(cursor); + value = FT_NEXT_USHORT_LE( cursor ); sign_shift = 16; break; case ft_frame_long_be: case ft_frame_ulong_be: /* read a 4-byte big-endian long */ - value = FT_NEXT_ULONG(cursor); + value = FT_NEXT_ULONG( cursor ); sign_shift = 0; break; case ft_frame_long_le: case ft_frame_ulong_le: /* read a 4-byte little-endian long */ - value = FT_NEXT_ULONG_LE(cursor); + value = FT_NEXT_ULONG_LE( cursor ); sign_shift = 0; break; case ft_frame_off3_be: case ft_frame_uoff3_be: /* read a 3-byte big-endian long */ - value = FT_NEXT_UOFF3(cursor); + value = FT_NEXT_UOFF3( cursor ); sign_shift = 8; break; case ft_frame_off3_le: case ft_frame_uoff3_le: /* read a 3-byte little-endian long */ - value = FT_NEXT_UOFF3_LE(cursor); + value = FT_NEXT_UOFF3_LE( cursor ); sign_shift = 8; break; @@ -831,15 +835,15 @@ p = (FT_Byte*)structure + fields->offset; switch ( fields->size ) { - case (8 / FT_CHAR_BIT): + case ( 8 / FT_CHAR_BIT ): *(FT_Byte*)p = (FT_Byte)value; break; - case (16 / FT_CHAR_BIT): + case ( 16 / FT_CHAR_BIT ): *(FT_UShort*)p = (FT_UShort)value; break; - case (32 / FT_CHAR_BIT): + case ( 32 / FT_CHAR_BIT ): *(FT_UInt32*)p = (FT_UInt32)value; break; diff --git a/src/base/ftstroke.c b/src/base/ftstroke.c index 5399efe..5fc41fc 100644 --- a/src/base/ftstroke.c +++ b/src/base/ftstroke.c @@ -4,7 +4,7 @@ /* */ /* FreeType path stroker (body). */ /* */ -/* Copyright 2002-2006, 2008-2011 by */ +/* Copyright 2002-2006, 2008-2011, 2013, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -789,13 +789,16 @@ FT_Stroker_New( FT_Library library, FT_Stroker *astroker ) { - FT_Error error; + FT_Error error; /* assigned in FT_NEW */ FT_Memory memory; FT_Stroker stroker = NULL; if ( !library ) - return FT_Err_Invalid_Argument; + return FT_THROW( Invalid_Library_Handle ); + + if ( !astroker ) + return FT_THROW( Invalid_Argument ); memory = library->memory; @@ -822,14 +825,17 @@ FT_Stroker_LineJoin line_join, FT_Fixed miter_limit ) { + if ( !stroker ) + return; + stroker->radius = radius; stroker->line_cap = line_cap; stroker->line_join = line_join; stroker->miter_limit = miter_limit; /* ensure miter limit has sensible value */ - if ( stroker->miter_limit < 0x10000 ) - stroker->miter_limit = 0x10000; + if ( stroker->miter_limit < 0x10000L ) + stroker->miter_limit = 0x10000L; /* save line join style: */ /* line join style can be temporarily changed when stroking curves */ @@ -1002,7 +1008,8 @@ FT_Tan( theta ) ) ); - intersect = FT_BOOL( stroker->line_length >= min_length && + intersect = FT_BOOL( min_length && + stroker->line_length >= min_length && line_length >= min_length ); } @@ -1126,9 +1133,8 @@ middle.y += stroker->center.y; /* compute first angle point */ - length = FT_MulFix( radius, - FT_DivFix( 0x10000L - sigma, - ft_pos_abs( FT_Sin( theta ) ) ) ); + length = FT_MulDiv( radius, 0x10000L - sigma, + ft_pos_abs( FT_Sin( theta ) ) ); FT_Vector_From_Polar( &delta, length, phi + rotate ); delta.x += middle.x; @@ -1288,6 +1294,9 @@ FT_Fixed line_length; + if ( !stroker || !to ) + return FT_THROW( Invalid_Argument ); + delta.x = to->x - stroker->center.x; delta.y = to->y - stroker->center.y; @@ -1361,6 +1370,12 @@ FT_Bool first_arc = TRUE; + if ( !stroker || !control || !to ) + { + error = FT_THROW( Invalid_Argument ); + goto Exit; + } + /* if all control points are coincident, this is a no-op; */ /* avoid creating a spurious corner */ if ( FT_IS_SMALL( stroker->center.x - control->x ) && @@ -1495,7 +1510,7 @@ sinA = ft_pos_abs( FT_Sin( alpha1 - gamma ) ); sinB = ft_pos_abs( FT_Sin( beta - gamma ) ); - alen = FT_DivFix( FT_MulFix( blen, sinA ), sinB ); + alen = FT_MulDiv( blen, sinA, sinB ); FT_Vector_From_Polar( &delta, alen, beta ); delta.x += start.x; @@ -1557,6 +1572,12 @@ FT_Bool first_arc = TRUE; + if ( !stroker || !control1 || !control2 || !to ) + { + error = FT_THROW( Invalid_Argument ); + goto Exit; + } + /* if all control points are coincident, this is a no-op; */ /* avoid creating a spurious corner */ if ( FT_IS_SMALL( stroker->center.x - control1->x ) && @@ -1702,7 +1723,7 @@ sinA = ft_pos_abs( FT_Sin( alpha1 - gamma ) ); sinB = ft_pos_abs( FT_Sin( beta - gamma ) ); - alen = FT_DivFix( FT_MulFix( blen, sinA ), sinB ); + alen = FT_MulDiv( blen, sinA, sinB ); FT_Vector_From_Polar( &delta, alen, beta ); delta.x += start.x; @@ -1759,6 +1780,9 @@ FT_Vector* to, FT_Bool open ) { + if ( !stroker || !to ) + return FT_THROW( Invalid_Argument ); + /* We cannot process the first point, because there is not enough */ /* information regarding its corner/cap. The latter will be processed */ /* in the `FT_Stroker_EndSubPath' routine. */ @@ -1859,6 +1883,12 @@ FT_Error error = FT_Err_Ok; + if ( !stroker ) + { + error = FT_THROW( Invalid_Argument ); + goto Exit; + } + if ( stroker->subpath_open ) { FT_StrokeBorder right = stroker->borders; @@ -1955,7 +1985,7 @@ if ( !stroker || border > 1 ) { - error = FT_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Exit; } @@ -1984,6 +2014,12 @@ FT_Error error; + if ( !stroker ) + { + error = FT_THROW( Invalid_Argument ); + goto Exit; + } + error = ft_stroke_border_get_counts( stroker->borders + 0, &count1, &count2 ); if ( error ) @@ -1998,8 +2034,12 @@ num_contours = count2 + count4; Exit: - *anum_points = num_points; - *anum_contours = num_contours; + if ( anum_points ) + *anum_points = num_points; + + if ( anum_contours ) + *anum_contours = num_contours; + return error; } @@ -2011,6 +2051,9 @@ FT_StrokerBorder border, FT_Outline* outline ) { + if ( !stroker || !outline ) + return; + if ( border == FT_STROKER_BORDER_LEFT || border == FT_STROKER_BORDER_RIGHT ) { @@ -2060,8 +2103,11 @@ FT_Int tag; /* current point's state */ - if ( !outline || !stroker ) - return FT_Err_Invalid_Argument; + if ( !outline ) + return FT_THROW( Invalid_Outline ); + + if ( !stroker ) + return FT_THROW( Invalid_Argument ); FT_Stroker_Rewind( stroker ); @@ -2239,7 +2285,7 @@ return error; Invalid_Outline: - return FT_Err_Invalid_Outline; + return FT_THROW( Invalid_Outline ); } @@ -2259,18 +2305,20 @@ FT_Stroker stroker, FT_Bool destroy ) { - FT_Error error = FT_Err_Invalid_Argument; - FT_Glyph glyph = NULL; + FT_Error error = FT_ERR( Invalid_Argument ); + FT_Glyph glyph = NULL; + + /* for FT_OUTLINE_GLYPH_CLASS_GET (in PIC mode) */ FT_Library library = stroker->library; FT_UNUSED( library ); - if ( pglyph == NULL ) + if ( !pglyph ) goto Exit; glyph = *pglyph; - if ( glyph == NULL || glyph->clazz != FT_OUTLINE_GLYPH_CLASS_GET ) + if ( !glyph || glyph->clazz != FT_OUTLINE_GLYPH_CLASS_GET ) goto Exit; { @@ -2294,7 +2342,7 @@ if ( error ) goto Fail; - (void)FT_Stroker_GetCounts( stroker, &num_points, &num_contours ); + FT_Stroker_GetCounts( stroker, &num_points, &num_contours ); FT_Outline_Done( glyph->library, outline ); @@ -2335,18 +2383,20 @@ FT_Bool inside, FT_Bool destroy ) { - FT_Error error = FT_Err_Invalid_Argument; - FT_Glyph glyph = NULL; + FT_Error error = FT_ERR( Invalid_Argument ); + FT_Glyph glyph = NULL; + + /* for FT_OUTLINE_GLYPH_CLASS_GET (in PIC mode) */ FT_Library library = stroker->library; FT_UNUSED( library ); - if ( pglyph == NULL ) + if ( !pglyph ) goto Exit; glyph = *pglyph; - if ( glyph == NULL || glyph->clazz != FT_OUTLINE_GLYPH_CLASS_GET ) + if ( !glyph || glyph->clazz != FT_OUTLINE_GLYPH_CLASS_GET ) goto Exit; { @@ -2380,8 +2430,8 @@ if ( error ) goto Fail; - (void)FT_Stroker_GetBorderCounts( stroker, border, - &num_points, &num_contours ); + FT_Stroker_GetBorderCounts( stroker, border, + &num_points, &num_contours ); FT_Outline_Done( glyph->library, outline ); diff --git a/src/base/ftsynth.c b/src/base/ftsynth.c index d4ec0da..0567bd5 100644 --- a/src/base/ftsynth.c +++ b/src/base/ftsynth.c @@ -4,7 +4,7 @@ /* */ /* FreeType synthesizing code for emboldening and slanting (body). */ /* */ -/* Copyright 2000-2001, 2002, 2003, 2004, 2005, 2006, 2010 by */ +/* Copyright 2000-2006, 2010, 2012-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -33,6 +33,7 @@ #undef FT_COMPONENT #define FT_COMPONENT trace_synth + /*************************************************************************/ /*************************************************************************/ /**** ****/ @@ -47,8 +48,13 @@ FT_GlyphSlot_Oblique( FT_GlyphSlot slot ) { FT_Matrix transform; - FT_Outline* outline = &slot->outline; + FT_Outline* outline; + + + if ( !slot ) + return; + outline = &slot->outline; /* only oblique outline glyphs */ if ( slot->format != FT_GLYPH_FORMAT_OUTLINE ) @@ -62,7 +68,7 @@ transform.xx = 0x10000L; transform.yx = 0x00000L; - transform.xy = 0x06000L; + transform.xy = 0x0366AL; transform.yy = 0x10000L; FT_Outline_Transform( outline, &transform ); @@ -72,7 +78,7 @@ /*************************************************************************/ /*************************************************************************/ /**** ****/ - /**** EXPERIMENTAL EMBOLDENING/OUTLINING SUPPORT ****/ + /**** EXPERIMENTAL EMBOLDENING SUPPORT ****/ /**** ****/ /*************************************************************************/ /*************************************************************************/ @@ -83,12 +89,18 @@ FT_EXPORT_DEF( void ) FT_GlyphSlot_Embolden( FT_GlyphSlot slot ) { - FT_Library library = slot->library; - FT_Face face = slot->face; + FT_Library library; + FT_Face face; FT_Error error; FT_Pos xstr, ystr; + if ( !slot ) + return; + + library = slot->library; + face = slot->face; + if ( slot->format != FT_GLYPH_FORMAT_OUTLINE && slot->format != FT_GLYPH_FORMAT_BITMAP ) return; @@ -99,15 +111,8 @@ ystr = xstr; if ( slot->format == FT_GLYPH_FORMAT_OUTLINE ) - { - /* ignore error */ - (void)FT_Outline_Embolden( &slot->outline, xstr ); + FT_Outline_EmboldenXY( &slot->outline, xstr, ystr ); - /* this is more than enough for most glyphs; if you need accurate */ - /* values, you have to call FT_Outline_Get_CBox */ - xstr = xstr * 2; - ystr = xstr; - } else /* slot->format == FT_GLYPH_FORMAT_BITMAP */ { /* round to full pixels */ @@ -145,11 +150,9 @@ slot->metrics.width += xstr; slot->metrics.height += ystr; - slot->metrics.horiBearingY += ystr; slot->metrics.horiAdvance += xstr; - slot->metrics.vertBearingX -= xstr / 2; - slot->metrics.vertBearingY += ystr; slot->metrics.vertAdvance += ystr; + slot->metrics.horiBearingY += ystr; /* XXX: 16-bit overflow case must be excluded before here */ if ( slot->format == FT_GLYPH_FORMAT_BITMAP ) diff --git a/src/base/ftsystem.c b/src/base/ftsystem.c index 7e203be..2c6ddac 100644 --- a/src/base/ftsystem.c +++ b/src/base/ftsystem.c @@ -4,7 +4,7 @@ /* */ /* ANSI-specific FreeType low-level system interface (body). */ /* */ -/* Copyright 1996-2002, 2006, 2008-2011 by */ +/* Copyright 1996-2002, 2006, 2008-2011, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -228,7 +228,7 @@ if ( !stream ) - return FT_Err_Invalid_Stream_Handle; + return FT_THROW( Invalid_Stream_Handle ); stream->descriptor.pointer = NULL; stream->pathname.pointer = (char*)filepathname; @@ -243,7 +243,7 @@ FT_ERROR(( "FT_Stream_Open:" " could not open `%s'\n", filepathname )); - return FT_Err_Cannot_Open_Resource; + return FT_THROW( Cannot_Open_Resource ); } ft_fseek( file, 0, SEEK_END ); @@ -253,7 +253,7 @@ FT_ERROR(( "FT_Stream_Open:" )); FT_ERROR(( " opened `%s' but zero-sized\n", filepathname )); ft_fclose( file ); - return FT_Err_Cannot_Open_Stream; + return FT_THROW( Cannot_Open_Stream ); } ft_fseek( file, 0, SEEK_SET ); diff --git a/src/base/fttrigon.c b/src/base/fttrigon.c index fdf433a..22b7ecf 100644 --- a/src/base/fttrigon.c +++ b/src/base/fttrigon.c @@ -4,7 +4,7 @@ /* */ /* FreeType trigonometric functions (body). */ /* */ -/* Copyright 2001, 2002, 2003, 2004, 2005 by */ +/* Copyright 2001-2005, 2012-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -15,169 +15,146 @@ /* */ /***************************************************************************/ + /*************************************************************************/ + /* */ + /* This is a fixed-point CORDIC implementation of trigonometric */ + /* functions as well as transformations between Cartesian and polar */ + /* coordinates. The angles are represented as 16.16 fixed-point values */ + /* in degrees, i.e., the angular resolution is 2^-16 degrees. Note that */ + /* only vectors longer than 2^16*180/pi (or at least 22 bits) on a */ + /* discrete Cartesian grid can have the same or better angular */ + /* resolution. Therefore, to maintain this precision, some functions */ + /* require an interim upscaling of the vectors, whereas others operate */ + /* with 24-bit long vectors directly. */ + /* */ + /*************************************************************************/ #include <ft2build.h> #include FT_INTERNAL_OBJECTS_H +#include FT_INTERNAL_CALC_H #include FT_TRIGONOMETRY_H - /* the following is 0.2715717684432231 * 2^30 */ -#define FT_TRIG_COSCALE 0x11616E8EUL + /* the Cordic shrink factor 0.858785336480436 * 2^32 */ +#define FT_TRIG_SCALE 0xDBD95B16UL + + /* the highest bit in overflow-safe vector components, */ + /* MSB of 0.858785336480436 * sqrt(0.5) * 2^30 */ +#define FT_TRIG_SAFE_MSB 29 /* this table was generated for FT_PI = 180L << 16, i.e. degrees */ #define FT_TRIG_MAX_ITERS 23 - static const FT_Fixed - ft_trig_arctan_table[24] = + static const FT_Angle + ft_trig_arctan_table[] = { - 4157273L, 2949120L, 1740967L, 919879L, 466945L, 234379L, 117304L, - 58666L, 29335L, 14668L, 7334L, 3667L, 1833L, 917L, 458L, 229L, 115L, + 1740967L, 919879L, 466945L, 234379L, 117304L, 58666L, 29335L, + 14668L, 7334L, 3667L, 1833L, 917L, 458L, 229L, 115L, 57L, 29L, 14L, 7L, 4L, 2L, 1L }; - /* the Cordic shrink factor, multiplied by 2^32 */ -#define FT_TRIG_SCALE 1166391785UL /* 0x4585BA38UL */ - -#ifdef FT_CONFIG_HAS_INT64 +#ifdef FT_LONG64 /* multiply a given value by the CORDIC shrink factor */ static FT_Fixed ft_trig_downscale( FT_Fixed val ) { - FT_Fixed s; - FT_Int64 v; + FT_Int s = 1; - s = val; - val = ( val >= 0 ) ? val : -val; + if ( val < 0 ) + { + val = -val; + s = -1; + } - v = ( val * (FT_Int64)FT_TRIG_SCALE ) + 0x100000000UL; - val = (FT_Fixed)( v >> 32 ); + /* 0x40000000 comes from regression analysis between true */ + /* and CORDIC hypotenuse, so it minimizes the error */ + val = (FT_Fixed)( ( (FT_Int64)val * FT_TRIG_SCALE + 0x40000000UL ) >> 32 ); - return ( s >= 0 ) ? val : -val; + return s < 0 ? -val : val; } -#else /* !FT_CONFIG_HAS_INT64 */ +#else /* !FT_LONG64 */ /* multiply a given value by the CORDIC shrink factor */ static FT_Fixed ft_trig_downscale( FT_Fixed val ) { - FT_Fixed s; - FT_UInt32 v1, v2, k1, k2, hi, lo1, lo2, lo3; + FT_Int s = 1; + FT_UInt32 lo1, hi1, lo2, hi2, lo, hi, i1, i2; + + if ( val < 0 ) + { + val = -val; + s = -1; + } + + lo1 = val & 0x0000FFFFU; + hi1 = val >> 16; + lo2 = FT_TRIG_SCALE & 0x0000FFFFU; + hi2 = FT_TRIG_SCALE >> 16; - s = val; - val = ( val >= 0 ) ? val : -val; + lo = lo1 * lo2; + i1 = lo1 * hi2; + i2 = lo2 * hi1; + hi = hi1 * hi2; - v1 = (FT_UInt32)val >> 16; - v2 = (FT_UInt32)(val & 0xFFFFL); + /* Check carry overflow of i1 + i2 */ + i1 += i2; + hi += (FT_UInt32)( i1 < i2 ) << 16; - k1 = (FT_UInt32)FT_TRIG_SCALE >> 16; /* constant */ - k2 = (FT_UInt32)(FT_TRIG_SCALE & 0xFFFFL); /* constant */ + hi += i1 >> 16; + i1 = i1 << 16; - hi = k1 * v1; - lo1 = k1 * v2 + k2 * v1; /* can't overflow */ + /* Check carry overflow of i1 + lo */ + lo += i1; + hi += ( lo < i1 ); - lo2 = ( k2 * v2 ) >> 16; - lo3 = ( lo1 >= lo2 ) ? lo1 : lo2; - lo1 += lo2; + /* 0x40000000 comes from regression analysis between true */ + /* and CORDIC hypotenuse, so it minimizes the error */ - hi += lo1 >> 16; - if ( lo1 < lo3 ) - hi += (FT_UInt32)0x10000UL; + /* Check carry overflow of lo + 0x40000000 */ + lo += 0x40000000UL; + hi += ( lo < 0x40000000UL ); val = (FT_Fixed)hi; - return ( s >= 0 ) ? val : -val; + return s < 0 ? -val : val; } -#endif /* !FT_CONFIG_HAS_INT64 */ +#endif /* !FT_LONG64 */ + /* undefined and never called for zero vector */ static FT_Int ft_trig_prenorm( FT_Vector* vec ) { - FT_Fixed x, y, z; - FT_Int shift; + FT_Pos x, y; + FT_Int shift; x = vec->x; y = vec->y; - z = ( ( x >= 0 ) ? x : - x ) | ( (y >= 0) ? y : -y ); - shift = 0; - -#if 1 - /* determine msb bit index in `shift' */ - if ( z >= ( 1L << 16 ) ) - { - z >>= 16; - shift += 16; - } - if ( z >= ( 1L << 8 ) ) - { - z >>= 8; - shift += 8; - } - if ( z >= ( 1L << 4 ) ) - { - z >>= 4; - shift += 4; - } - if ( z >= ( 1L << 2 ) ) - { - z >>= 2; - shift += 2; - } - if ( z >= ( 1L << 1 ) ) - { - z >>= 1; - shift += 1; - } + shift = FT_MSB( FT_ABS( x ) | FT_ABS( y ) ); - if ( shift <= 27 ) + if ( shift <= FT_TRIG_SAFE_MSB ) { - shift = 27 - shift; - vec->x = x << shift; - vec->y = y << shift; + shift = FT_TRIG_SAFE_MSB - shift; + vec->x = (FT_Pos)( (FT_ULong)x << shift ); + vec->y = (FT_Pos)( (FT_ULong)y << shift ); } else { - shift -= 27; + shift -= FT_TRIG_SAFE_MSB; vec->x = x >> shift; vec->y = y >> shift; shift = -shift; } -#else /* 0 */ - - if ( z < ( 1L << 27 ) ) - { - do - { - shift++; - z <<= 1; - } while ( z < ( 1L << 27 ) ); - vec->x = x << shift; - vec->y = y << shift; - } - else if ( z > ( 1L << 28 ) ) - { - do - { - shift++; - z >>= 1; - } while ( z > ( 1L << 28 ) ); - - vec->x = x >> shift; - vec->y = y >> shift; - shift = -shift; - } - -#endif /* 0 */ - return shift; } @@ -187,65 +164,50 @@ FT_Angle theta ) { FT_Int i; - FT_Fixed x, y, xtemp; - const FT_Fixed *arctanptr; + FT_Fixed x, y, xtemp, b; + const FT_Angle *arctanptr; x = vec->x; y = vec->y; - /* Get angle between -90 and 90 degrees */ - while ( theta <= -FT_ANGLE_PI2 ) + /* Rotate inside [-PI/4,PI/4] sector */ + while ( theta < -FT_ANGLE_PI4 ) { - x = -x; - y = -y; - theta += FT_ANGLE_PI; + xtemp = y; + y = -x; + x = xtemp; + theta += FT_ANGLE_PI2; } - while ( theta > FT_ANGLE_PI2 ) + while ( theta > FT_ANGLE_PI4 ) { - x = -x; - y = -y; - theta -= FT_ANGLE_PI; + xtemp = -y; + y = x; + x = xtemp; + theta -= FT_ANGLE_PI2; } - /* Initial pseudorotation, with left shift */ arctanptr = ft_trig_arctan_table; - if ( theta < 0 ) - { - xtemp = x + ( y << 1 ); - y = y - ( x << 1 ); - x = xtemp; - theta += *arctanptr++; - } - else - { - xtemp = x - ( y << 1 ); - y = y + ( x << 1 ); - x = xtemp; - theta -= *arctanptr++; - } - - /* Subsequent pseudorotations, with right shifts */ - i = 0; - do + /* Pseudorotations, with right shifts */ + for ( i = 1, b = 1; i < FT_TRIG_MAX_ITERS; b <<= 1, i++ ) { if ( theta < 0 ) { - xtemp = x + ( y >> i ); - y = y - ( x >> i ); + xtemp = x + ( ( y + b ) >> i ); + y = y - ( ( x + b ) >> i ); x = xtemp; theta += *arctanptr++; } else { - xtemp = x - ( y >> i ); - y = y + ( x >> i ); + xtemp = x - ( ( y + b ) >> i ); + y = y + ( ( x + b ) >> i ); x = xtemp; theta -= *arctanptr++; } - } while ( ++i < FT_TRIG_MAX_ITERS ); + } vec->x = x; vec->y = y; @@ -255,72 +217,74 @@ static void ft_trig_pseudo_polarize( FT_Vector* vec ) { - FT_Fixed theta; - FT_Fixed yi, i; - FT_Fixed x, y; - const FT_Fixed *arctanptr; + FT_Angle theta; + FT_Int i; + FT_Fixed x, y, xtemp, b; + const FT_Angle *arctanptr; x = vec->x; y = vec->y; - /* Get the vector into the right half plane */ - theta = 0; - if ( x < 0 ) - { - x = -x; - y = -y; - theta = 2 * FT_ANGLE_PI2; - } - - if ( y > 0 ) - theta = - theta; - - arctanptr = ft_trig_arctan_table; - - if ( y < 0 ) + /* Get the vector into [-PI/4,PI/4] sector */ + if ( y > x ) { - /* Rotate positive */ - yi = y + ( x << 1 ); - x = x - ( y << 1 ); - y = yi; - theta -= *arctanptr++; /* Subtract angle */ + if ( y > -x ) + { + theta = FT_ANGLE_PI2; + xtemp = y; + y = -x; + x = xtemp; + } + else + { + theta = y > 0 ? FT_ANGLE_PI : -FT_ANGLE_PI; + x = -x; + y = -y; + } } else { - /* Rotate negative */ - yi = y - ( x << 1 ); - x = x + ( y << 1 ); - y = yi; - theta += *arctanptr++; /* Add angle */ + if ( y < -x ) + { + theta = -FT_ANGLE_PI2; + xtemp = -y; + y = x; + x = xtemp; + } + else + { + theta = 0; + } } - i = 0; - do + arctanptr = ft_trig_arctan_table; + + /* Pseudorotations, with right shifts */ + for ( i = 1, b = 1; i < FT_TRIG_MAX_ITERS; b <<= 1, i++ ) { - if ( y < 0 ) + if ( y > 0 ) { - /* Rotate positive */ - yi = y + ( x >> i ); - x = x - ( y >> i ); - y = yi; - theta -= *arctanptr++; + xtemp = x + ( ( y + b ) >> i ); + y = y - ( ( x + b ) >> i ); + x = xtemp; + theta += *arctanptr++; } else { - /* Rotate negative */ - yi = y - ( x >> i ); - x = x + ( y >> i ); - y = yi; - theta += *arctanptr++; + xtemp = x - ( ( y + b ) >> i ); + y = y + ( ( x + b ) >> i ); + x = xtemp; + theta -= *arctanptr++; } - } while ( ++i < FT_TRIG_MAX_ITERS ); + } - /* round theta */ + /* round theta to acknowledge its error that mostly comes */ + /* from accumulated rounding errors in the arctan table */ if ( theta >= 0 ) - theta = FT_PAD_ROUND( theta, 32 ); + theta = FT_PAD_ROUND( theta, 16 ); else - theta = -FT_PAD_ROUND( -theta, 32 ); + theta = -FT_PAD_ROUND( -theta, 16 ); vec->x = x; vec->y = theta; @@ -335,11 +299,11 @@ FT_Vector v; - v.x = FT_TRIG_COSCALE >> 2; + v.x = FT_TRIG_SCALE >> 8; v.y = 0; ft_trig_pseudo_rotate( &v, angle ); - return v.x / ( 1 << 12 ); + return ( v.x + 0x80L ) >> 8; } @@ -360,7 +324,7 @@ FT_Vector v; - v.x = FT_TRIG_COSCALE >> 2; + v.x = FT_TRIG_SCALE >> 8; v.y = 0; ft_trig_pseudo_rotate( &v, angle ); @@ -395,11 +359,14 @@ FT_Vector_Unit( FT_Vector* vec, FT_Angle angle ) { - vec->x = FT_TRIG_COSCALE >> 2; + if ( !vec ) + return; + + vec->x = FT_TRIG_SCALE >> 8; vec->y = 0; ft_trig_pseudo_rotate( vec, angle ); - vec->x >>= 12; - vec->y >>= 12; + vec->x = ( vec->x + 0x80L ) >> 8; + vec->y = ( vec->y + 0x80L ) >> 8; } @@ -421,6 +388,9 @@ FT_Vector v; + if ( !vec ) + return; + v.x = vec->x; v.y = vec->y; @@ -442,8 +412,8 @@ else { shift = -shift; - vec->x = v.x << shift; - vec->y = v.y << shift; + vec->x = (FT_Pos)( (FT_ULong)v.x << shift ); + vec->y = (FT_Pos)( (FT_ULong)v.y << shift ); } } } @@ -458,16 +428,19 @@ FT_Vector v; + if ( !vec ) + return 0; + v = *vec; /* handle trivial cases */ if ( v.x == 0 ) { - return ( v.y >= 0 ) ? v.y : -v.y; + return FT_ABS( v.y ); } else if ( v.y == 0 ) { - return ( v.x >= 0 ) ? v.x : -v.x; + return FT_ABS( v.x ); } /* general case */ @@ -479,7 +452,7 @@ if ( shift > 0 ) return ( v.x + ( 1 << ( shift - 1 ) ) ) >> shift; - return v.x << -shift; + return (FT_Fixed)( (FT_UInt32)v.x << -shift ); } @@ -494,6 +467,9 @@ FT_Vector v; + if ( !vec || !length || !angle ) + return; + v = *vec; if ( v.x == 0 && v.y == 0 ) @@ -504,7 +480,8 @@ v.x = ft_trig_downscale( v.x ); - *length = ( shift >= 0 ) ? ( v.x >> shift ) : ( v.x << -shift ); + *length = shift >= 0 ? ( v.x >> shift ) + : (FT_Fixed)( (FT_UInt32)v.x << -shift ); *angle = v.y; } @@ -516,6 +493,9 @@ FT_Fixed length, FT_Angle angle ) { + if ( !vec ) + return; + vec->x = length; vec->y = 0; diff --git a/src/base/fttype1.c b/src/base/fttype1.c index 885dba5..47af19a 100644 --- a/src/base/fttype1.c +++ b/src/base/fttype1.c @@ -4,7 +4,7 @@ /* */ /* FreeType utility file for PS names support (body). */ /* */ -/* Copyright 2002-2004, 2011 by */ +/* Copyright 2002-2004, 2011, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -17,6 +17,7 @@ #include <ft2build.h> +#include FT_INTERNAL_DEBUG_H #include FT_INTERNAL_OBJECTS_H #include FT_INTERNAL_SERVICE_H #include FT_SERVICE_POSTSCRIPT_INFO_H @@ -28,19 +29,22 @@ FT_Get_PS_Font_Info( FT_Face face, PS_FontInfoRec* afont_info ) { - FT_Error error = FT_Err_Invalid_Argument; + FT_Error error; + FT_Service_PsInfo service; - if ( face ) - { - FT_Service_PsInfo service = NULL; + if ( !face ) + return FT_THROW( Invalid_Face_Handle ); + if ( !afont_info ) + return FT_THROW( Invalid_Argument ); - FT_FACE_FIND_SERVICE( face, service, POSTSCRIPT_INFO ); + FT_FACE_FIND_SERVICE( face, service, POSTSCRIPT_INFO ); - if ( service && service->ps_get_font_info ) - error = service->ps_get_font_info( face, afont_info ); - } + if ( service && service->ps_get_font_info ) + error = service->ps_get_font_info( face, afont_info ); + else + error = FT_THROW( Invalid_Argument ); return error; } @@ -51,8 +55,8 @@ FT_EXPORT_DEF( FT_Int ) FT_Has_PS_Glyph_Names( FT_Face face ) { - FT_Int result = 0; - FT_Service_PsInfo service = NULL; + FT_Int result = 0; + FT_Service_PsInfo service; if ( face ) @@ -73,19 +77,22 @@ FT_Get_PS_Font_Private( FT_Face face, PS_PrivateRec* afont_private ) { - FT_Error error = FT_Err_Invalid_Argument; + FT_Error error; + FT_Service_PsInfo service; - if ( face ) - { - FT_Service_PsInfo service = NULL; + if ( !face ) + return FT_THROW( Invalid_Face_Handle ); + if ( !afont_private ) + return FT_THROW( Invalid_Argument ); - FT_FACE_FIND_SERVICE( face, service, POSTSCRIPT_INFO ); + FT_FACE_FIND_SERVICE( face, service, POSTSCRIPT_INFO ); - if ( service && service->ps_get_font_private ) - error = service->ps_get_font_private( face, afont_private ); - } + if ( service && service->ps_get_font_private ) + error = service->ps_get_font_private( face, afont_private ); + else + error = FT_THROW( Invalid_Argument ); return error; } diff --git a/src/base/ftutil.c b/src/base/ftutil.c index 5f77be5..56e2800 100644 --- a/src/base/ftutil.c +++ b/src/base/ftutil.c @@ -4,7 +4,7 @@ /* */ /* FreeType utility file for memory and list management (body). */ /* */ -/* Copyright 2002, 2004, 2005, 2006, 2007 by */ +/* Copyright 2002, 2004-2007, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -75,12 +75,12 @@ { block = memory->alloc( memory, size ); if ( block == NULL ) - error = FT_Err_Out_Of_Memory; + error = FT_THROW( Out_Of_Memory ); } else if ( size < 0 ) { /* may help catch/prevent security issues */ - error = FT_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); } *p_error = error; @@ -98,6 +98,7 @@ { FT_Error error = FT_Err_Ok; + block = ft_mem_qrealloc( memory, item_size, cur_count, new_count, block, &error ); if ( !error && new_count > cur_count ) @@ -127,7 +128,7 @@ if ( cur_count < 0 || new_count < 0 || item_size < 0 ) { /* may help catch/prevent nasty security issues */ - error = FT_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); } else if ( new_count == 0 || item_size == 0 ) { @@ -136,7 +137,7 @@ } else if ( new_count > FT_INT_MAX/item_size ) { - error = FT_Err_Array_Too_Large; + error = FT_THROW( Array_Too_Large ); } else if ( cur_count == 0 ) { @@ -153,7 +154,7 @@ block2 = memory->realloc( memory, cur_size, new_size, block ); if ( block2 == NULL ) - error = FT_Err_Out_Of_Memory; + error = FT_THROW( Out_Of_Memory ); else block = block2; } @@ -244,6 +245,9 @@ FT_ListNode cur; + if ( !list ) + return NULL; + cur = list->head; while ( cur ) { @@ -253,7 +257,7 @@ cur = cur->next; } - return (FT_ListNode)0; + return NULL; } @@ -263,8 +267,13 @@ FT_List_Add( FT_List list, FT_ListNode node ) { - FT_ListNode before = list->tail; + FT_ListNode before; + + + if ( !list || !node ) + return; + before = list->tail; node->next = 0; node->prev = before; @@ -284,8 +293,13 @@ FT_List_Insert( FT_List list, FT_ListNode node ) { - FT_ListNode after = list->head; + FT_ListNode after; + + + if ( !list || !node ) + return; + after = list->head; node->next = after; node->prev = 0; @@ -308,6 +322,9 @@ FT_ListNode before, after; + if ( !list || !node ) + return; + before = node->prev; after = node->next; @@ -332,6 +349,9 @@ FT_ListNode before, after; + if ( !list || !node ) + return; + before = node->prev; after = node->next; @@ -356,14 +376,19 @@ /* documentation is in ftlist.h */ FT_EXPORT_DEF( FT_Error ) - FT_List_Iterate( FT_List list, - FT_List_Iterator iterator, - void* user ) + FT_List_Iterate( FT_List list, + FT_List_Iterator iterator, + void* user ) { - FT_ListNode cur = list->head; + FT_ListNode cur; FT_Error error = FT_Err_Ok; + if ( !list || !iterator ) + return FT_THROW( Invalid_Argument ); + + cur = list->head; + while ( cur ) { FT_ListNode next = cur->next; @@ -391,6 +416,9 @@ FT_ListNode cur; + if ( !list || !memory ) + return; + cur = list->head; while ( cur ) { @@ -410,92 +438,4 @@ } - FT_BASE_DEF( FT_UInt32 ) - ft_highpow2( FT_UInt32 value ) - { - FT_UInt32 value2; - - - /* - * We simply clear the lowest bit in each iteration. When - * we reach 0, we know that the previous value was our result. - */ - for ( ;; ) - { - value2 = value & (value - 1); /* clear lowest bit */ - if ( value2 == 0 ) - break; - - value = value2; - } - return value; - } - - -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS - - FT_BASE_DEF( FT_Error ) - FT_Alloc( FT_Memory memory, - FT_Long size, - void* *P ) - { - FT_Error error; - - - (void)FT_ALLOC( *P, size ); - return error; - } - - - FT_BASE_DEF( FT_Error ) - FT_QAlloc( FT_Memory memory, - FT_Long size, - void* *p ) - { - FT_Error error; - - - (void)FT_QALLOC( *p, size ); - return error; - } - - - FT_BASE_DEF( FT_Error ) - FT_Realloc( FT_Memory memory, - FT_Long current, - FT_Long size, - void* *P ) - { - FT_Error error; - - - (void)FT_REALLOC( *P, current, size ); - return error; - } - - - FT_BASE_DEF( FT_Error ) - FT_QRealloc( FT_Memory memory, - FT_Long current, - FT_Long size, - void* *p ) - { - FT_Error error; - - - (void)FT_QREALLOC( *p, current, size ); - return error; - } - - - FT_BASE_DEF( void ) - FT_Free( FT_Memory memory, - void* *P ) - { - if ( *P ) - FT_MEM_FREE( *P ); - } - -#endif /* FT_CONFIG_OPTION_OLD_INTERNALS */ - /* END */ diff --git a/src/base/ftwinfnt.c b/src/base/ftwinfnt.c index bc2e90e..8e337fb 100644 --- a/src/base/ftwinfnt.c +++ b/src/base/ftwinfnt.c @@ -4,7 +4,7 @@ /* */ /* FreeType API for accessing Windows FNT specific info (body). */ /* */ -/* Copyright 2003, 2004 by */ +/* Copyright 2003, 2004, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -17,6 +17,7 @@ #include <ft2build.h> +#include FT_INTERNAL_DEBUG_H #include FT_WINFONTS_H #include FT_INTERNAL_OBJECTS_H #include FT_SERVICE_WINFNT_H @@ -32,17 +33,18 @@ FT_Error error; - error = FT_Err_Invalid_Argument; + if ( !face ) + return FT_THROW( Invalid_Face_Handle ); - if ( face != NULL ) - { - FT_FACE_LOOKUP_SERVICE( face, service, WINFNT ); + if ( !header ) + return FT_THROW( Invalid_Argument ); - if ( service != NULL ) - { - error = service->get_header( face, header ); - } - } + FT_FACE_LOOKUP_SERVICE( face, service, WINFNT ); + + if ( service ) + error = service->get_header( face, header ); + else + error = FT_THROW( Invalid_Argument ); return error; } diff --git a/src/base/md5.c b/src/base/md5.c new file mode 100644 index 0000000..52d96ac --- /dev/null +++ b/src/base/md5.c @@ -0,0 +1,296 @@ +/* + * This is an OpenSSL-compatible implementation of the RSA Data Security, Inc. + * MD5 Message-Digest Algorithm (RFC 1321). + * + * Homepage: + * http://openwall.info/wiki/people/solar/software/public-domain-source-code/md5 + * + * Author: + * Alexander Peslyak, better known as Solar Designer <solar at openwall.com> + * + * This software was written by Alexander Peslyak in 2001. No copyright is + * claimed, and the software is hereby placed in the public domain. + * In case this attempt to disclaim copyright and place the software in the + * public domain is deemed null and void, then the software is + * Copyright (c) 2001 Alexander Peslyak and it is hereby released to the + * general public under the following terms: + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted. + * + * There's ABSOLUTELY NO WARRANTY, express or implied. + * + * (This is a heavily cut-down "BSD license".) + * + * This differs from Colin Plumb's older public domain implementation in that + * no exactly 32-bit integer data type is required (any 32-bit or wider + * unsigned integer data type will do), there's no compile-time endianness + * configuration, and the function prototypes match OpenSSL's. No code from + * Colin Plumb's implementation has been reused; this comment merely compares + * the properties of the two independent implementations. + * + * The primary goals of this implementation are portability and ease of use. + * It is meant to be fast, but not as fast as possible. Some known + * optimizations are not included to reduce source code size and avoid + * compile-time configuration. + */ + +#ifndef HAVE_OPENSSL + +#include <string.h> + +#include "md5.h" + +/* + * The basic MD5 functions. + * + * F and G are optimized compared to their RFC 1321 definitions for + * architectures that lack an AND-NOT instruction, just like in Colin Plumb's + * implementation. + */ +#define F(x, y, z) ((z) ^ ((x) & ((y) ^ (z)))) +#define G(x, y, z) ((y) ^ ((z) & ((x) ^ (y)))) +#define H(x, y, z) (((x) ^ (y)) ^ (z)) +#define H2(x, y, z) ((x) ^ ((y) ^ (z))) +#define I(x, y, z) ((y) ^ ((x) | ~(z))) + +/* + * The MD5 transformation for all four rounds. + */ +#define STEP(f, a, b, c, d, x, t, s) \ + (a) += f((b), (c), (d)) + (x) + (t); \ + (a) = (((a) << (s)) | (((a) & 0xffffffff) >> (32 - (s)))); \ + (a) += (b); + +/* + * SET reads 4 input bytes in little-endian byte order and stores them + * in a properly aligned word in host byte order. + * + * The check for little-endian architectures that tolerate unaligned + * memory accesses is just an optimization. Nothing will break if it + * doesn't work. + */ +#if defined(__i386__) || defined(__x86_64__) || defined(__vax__) +#define SET(n) \ + (*(MD5_u32plus *)&ptr[(n) * 4]) +#define GET(n) \ + SET(n) +#else +#define SET(n) \ + (ctx->block[(n)] = \ + (MD5_u32plus)ptr[(n) * 4] | \ + ((MD5_u32plus)ptr[(n) * 4 + 1] << 8) | \ + ((MD5_u32plus)ptr[(n) * 4 + 2] << 16) | \ + ((MD5_u32plus)ptr[(n) * 4 + 3] << 24)) +#define GET(n) \ + (ctx->block[(n)]) +#endif + +/* + * This processes one or more 64-byte data blocks, but does NOT update + * the bit counters. There are no alignment requirements. + */ +static const void *body(MD5_CTX *ctx, const void *data, unsigned long size) +{ + const unsigned char *ptr; + MD5_u32plus a, b, c, d; + MD5_u32plus saved_a, saved_b, saved_c, saved_d; + + ptr = (const unsigned char *)data; + + a = ctx->a; + b = ctx->b; + c = ctx->c; + d = ctx->d; + + do { + saved_a = a; + saved_b = b; + saved_c = c; + saved_d = d; + +/* Round 1 */ + STEP(F, a, b, c, d, SET(0), 0xd76aa478, 7) + STEP(F, d, a, b, c, SET(1), 0xe8c7b756, 12) + STEP(F, c, d, a, b, SET(2), 0x242070db, 17) + STEP(F, b, c, d, a, SET(3), 0xc1bdceee, 22) + STEP(F, a, b, c, d, SET(4), 0xf57c0faf, 7) + STEP(F, d, a, b, c, SET(5), 0x4787c62a, 12) + STEP(F, c, d, a, b, SET(6), 0xa8304613, 17) + STEP(F, b, c, d, a, SET(7), 0xfd469501, 22) + STEP(F, a, b, c, d, SET(8), 0x698098d8, 7) + STEP(F, d, a, b, c, SET(9), 0x8b44f7af, 12) + STEP(F, c, d, a, b, SET(10), 0xffff5bb1, 17) + STEP(F, b, c, d, a, SET(11), 0x895cd7be, 22) + STEP(F, a, b, c, d, SET(12), 0x6b901122, 7) + STEP(F, d, a, b, c, SET(13), 0xfd987193, 12) + STEP(F, c, d, a, b, SET(14), 0xa679438e, 17) + STEP(F, b, c, d, a, SET(15), 0x49b40821, 22) + +/* Round 2 */ + STEP(G, a, b, c, d, GET(1), 0xf61e2562, 5) + STEP(G, d, a, b, c, GET(6), 0xc040b340, 9) + STEP(G, c, d, a, b, GET(11), 0x265e5a51, 14) + STEP(G, b, c, d, a, GET(0), 0xe9b6c7aa, 20) + STEP(G, a, b, c, d, GET(5), 0xd62f105d, 5) + STEP(G, d, a, b, c, GET(10), 0x02441453, 9) + STEP(G, c, d, a, b, GET(15), 0xd8a1e681, 14) + STEP(G, b, c, d, a, GET(4), 0xe7d3fbc8, 20) + STEP(G, a, b, c, d, GET(9), 0x21e1cde6, 5) + STEP(G, d, a, b, c, GET(14), 0xc33707d6, 9) + STEP(G, c, d, a, b, GET(3), 0xf4d50d87, 14) + STEP(G, b, c, d, a, GET(8), 0x455a14ed, 20) + STEP(G, a, b, c, d, GET(13), 0xa9e3e905, 5) + STEP(G, d, a, b, c, GET(2), 0xfcefa3f8, 9) + STEP(G, c, d, a, b, GET(7), 0x676f02d9, 14) + STEP(G, b, c, d, a, GET(12), 0x8d2a4c8a, 20) + +/* Round 3 */ + STEP(H, a, b, c, d, GET(5), 0xfffa3942, 4) + STEP(H2, d, a, b, c, GET(8), 0x8771f681, 11) + STEP(H, c, d, a, b, GET(11), 0x6d9d6122, 16) + STEP(H2, b, c, d, a, GET(14), 0xfde5380c, 23) + STEP(H, a, b, c, d, GET(1), 0xa4beea44, 4) + STEP(H2, d, a, b, c, GET(4), 0x4bdecfa9, 11) + STEP(H, c, d, a, b, GET(7), 0xf6bb4b60, 16) + STEP(H2, b, c, d, a, GET(10), 0xbebfbc70, 23) + STEP(H, a, b, c, d, GET(13), 0x289b7ec6, 4) + STEP(H2, d, a, b, c, GET(0), 0xeaa127fa, 11) + STEP(H, c, d, a, b, GET(3), 0xd4ef3085, 16) + STEP(H2, b, c, d, a, GET(6), 0x04881d05, 23) + STEP(H, a, b, c, d, GET(9), 0xd9d4d039, 4) + STEP(H2, d, a, b, c, GET(12), 0xe6db99e5, 11) + STEP(H, c, d, a, b, GET(15), 0x1fa27cf8, 16) + STEP(H2, b, c, d, a, GET(2), 0xc4ac5665, 23) + +/* Round 4 */ + STEP(I, a, b, c, d, GET(0), 0xf4292244, 6) + STEP(I, d, a, b, c, GET(7), 0x432aff97, 10) + STEP(I, c, d, a, b, GET(14), 0xab9423a7, 15) + STEP(I, b, c, d, a, GET(5), 0xfc93a039, 21) + STEP(I, a, b, c, d, GET(12), 0x655b59c3, 6) + STEP(I, d, a, b, c, GET(3), 0x8f0ccc92, 10) + STEP(I, c, d, a, b, GET(10), 0xffeff47d, 15) + STEP(I, b, c, d, a, GET(1), 0x85845dd1, 21) + STEP(I, a, b, c, d, GET(8), 0x6fa87e4f, 6) + STEP(I, d, a, b, c, GET(15), 0xfe2ce6e0, 10) + STEP(I, c, d, a, b, GET(6), 0xa3014314, 15) + STEP(I, b, c, d, a, GET(13), 0x4e0811a1, 21) + STEP(I, a, b, c, d, GET(4), 0xf7537e82, 6) + STEP(I, d, a, b, c, GET(11), 0xbd3af235, 10) + STEP(I, c, d, a, b, GET(2), 0x2ad7d2bb, 15) + STEP(I, b, c, d, a, GET(9), 0xeb86d391, 21) + + a += saved_a; + b += saved_b; + c += saved_c; + d += saved_d; + + ptr += 64; + } while (size -= 64); + + ctx->a = a; + ctx->b = b; + ctx->c = c; + ctx->d = d; + + return ptr; +} + +void MD5_Init(MD5_CTX *ctx) +{ + ctx->a = 0x67452301; + ctx->b = 0xefcdab89; + ctx->c = 0x98badcfe; + ctx->d = 0x10325476; + + ctx->lo = 0; + ctx->hi = 0; +} + +void MD5_Update(MD5_CTX *ctx, const void *data, unsigned long size) +{ + MD5_u32plus saved_lo; + unsigned long used, available; + + saved_lo = ctx->lo; + if ((ctx->lo = (saved_lo + size) & 0x1fffffff) < saved_lo) + ctx->hi++; + ctx->hi += size >> 29; + + used = saved_lo & 0x3f; + + if (used) { + available = 64 - used; + + if (size < available) { + memcpy(&ctx->buffer[used], data, size); + return; + } + + memcpy(&ctx->buffer[used], data, available); + data = (const unsigned char *)data + available; + size -= available; + body(ctx, ctx->buffer, 64); + } + + if (size >= 64) { + data = body(ctx, data, size & ~(unsigned long)0x3f); + size &= 0x3f; + } + + memcpy(ctx->buffer, data, size); +} + +void MD5_Final(unsigned char *result, MD5_CTX *ctx) +{ + unsigned long used, available; + + used = ctx->lo & 0x3f; + + ctx->buffer[used++] = 0x80; + + available = 64 - used; + + if (available < 8) { + memset(&ctx->buffer[used], 0, available); + body(ctx, ctx->buffer, 64); + used = 0; + available = 64; + } + + memset(&ctx->buffer[used], 0, available - 8); + + ctx->lo <<= 3; + ctx->buffer[56] = ctx->lo; + ctx->buffer[57] = ctx->lo >> 8; + ctx->buffer[58] = ctx->lo >> 16; + ctx->buffer[59] = ctx->lo >> 24; + ctx->buffer[60] = ctx->hi; + ctx->buffer[61] = ctx->hi >> 8; + ctx->buffer[62] = ctx->hi >> 16; + ctx->buffer[63] = ctx->hi >> 24; + + body(ctx, ctx->buffer, 64); + + result[0] = ctx->a; + result[1] = ctx->a >> 8; + result[2] = ctx->a >> 16; + result[3] = ctx->a >> 24; + result[4] = ctx->b; + result[5] = ctx->b >> 8; + result[6] = ctx->b >> 16; + result[7] = ctx->b >> 24; + result[8] = ctx->c; + result[9] = ctx->c >> 8; + result[10] = ctx->c >> 16; + result[11] = ctx->c >> 24; + result[12] = ctx->d; + result[13] = ctx->d >> 8; + result[14] = ctx->d >> 16; + result[15] = ctx->d >> 24; + + memset(ctx, 0, sizeof(*ctx)); +} + +#endif diff --git a/src/base/md5.h b/src/base/md5.h new file mode 100644 index 0000000..2da44bf --- /dev/null +++ b/src/base/md5.h @@ -0,0 +1,45 @@ +/* + * This is an OpenSSL-compatible implementation of the RSA Data Security, Inc. + * MD5 Message-Digest Algorithm (RFC 1321). + * + * Homepage: + * http://openwall.info/wiki/people/solar/software/public-domain-source-code/md5 + * + * Author: + * Alexander Peslyak, better known as Solar Designer <solar at openwall.com> + * + * This software was written by Alexander Peslyak in 2001. No copyright is + * claimed, and the software is hereby placed in the public domain. + * In case this attempt to disclaim copyright and place the software in the + * public domain is deemed null and void, then the software is + * Copyright (c) 2001 Alexander Peslyak and it is hereby released to the + * general public under the following terms: + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted. + * + * There's ABSOLUTELY NO WARRANTY, express or implied. + * + * See md5.c for more information. + */ + +#ifdef HAVE_OPENSSL +#include <openssl/md5.h> +#elif !defined(_MD5_H) +#define _MD5_H + +/* Any 32-bit or wider unsigned integer data type will do */ +typedef unsigned int MD5_u32plus; + +typedef struct { + MD5_u32plus lo, hi; + MD5_u32plus a, b, c, d; + unsigned char buffer[64]; + MD5_u32plus block[16]; +} MD5_CTX; + +extern void MD5_Init(MD5_CTX *ctx); +extern void MD5_Update(MD5_CTX *ctx, const void *data, unsigned long size); +extern void MD5_Final(unsigned char *result, MD5_CTX *ctx); + +#endif diff --git a/src/base/rules.mk b/src/base/rules.mk index 10f578a..cbd8107 100644 --- a/src/base/rules.mk +++ b/src/base/rules.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2000, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 by +# Copyright 1996-2000, 2002-2009, 2013 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -19,8 +19,8 @@ # BASE_OBJ_S: The single-object base layer. # BASE_OBJ_M: A list of all objects for a multiple-objects build. # BASE_EXT_OBJ: A list of base layer extensions, i.e., components found -# in `freetype/src/base' which are not compiled within the -# base layer proper. +# in `src/base' which are not compiled within the base +# layer proper. BASE_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(SRC_DIR)/base) @@ -33,12 +33,14 @@ BASE_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(SRC_DIR)/base) # All files listed here should be included in `ftbase.c' (for a `single' # build). # -BASE_SRC := $(BASE_DIR)/ftadvanc.c \ +BASE_SRC := $(BASE_DIR)/basepic.c \ + $(BASE_DIR)/ftadvanc.c \ $(BASE_DIR)/ftcalc.c \ $(BASE_DIR)/ftdbgmem.c \ $(BASE_DIR)/ftgloadr.c \ $(BASE_DIR)/ftobjs.c \ $(BASE_DIR)/ftoutln.c \ + $(BASE_DIR)/ftpic.c \ $(BASE_DIR)/ftrfork.c \ $(BASE_DIR)/ftsnames.c \ $(BASE_DIR)/ftstream.c \ @@ -50,7 +52,11 @@ ifneq ($(ftmac_c),) BASE_SRC += $(BASE_DIR)/$(ftmac_c) endif -BASE_H := $(BASE_DIR)/ftbase.h +# for simplicity, we also handle `md5.c' (which gets included by `ftobjs.h') +BASE_H := $(BASE_DIR)/basepic.h \ + $(BASE_DIR)/ftbase.h \ + $(BASE_DIR)/md5.c \ + $(BASE_DIR)/md5.h # Base layer `extensions' sources # diff --git a/src/bdf/bdfdrivr.c b/src/bdf/bdfdrivr.c index 0edcc77..55a428c 100644 --- a/src/bdf/bdfdrivr.c +++ b/src/bdf/bdfdrivr.c @@ -2,7 +2,7 @@ FreeType font driver for bdf files - Copyright (C) 2001-2008, 2011 by + Copyright (C) 2001-2008, 2011, 2013, 2014 by Francesco Zappa Nardelli Permission is hereby granted, free of charge, to any person obtaining a copy @@ -72,7 +72,7 @@ THE SOFTWARE. cmap->num_encodings = face->bdffont->glyphs_used; cmap->encodings = face->en_table; - return BDF_Err_Ok; + return FT_Err_Ok; } @@ -182,7 +182,7 @@ THE SOFTWARE. } - FT_CALLBACK_TABLE_DEF + static const FT_CMap_ClassRec bdf_cmap_class = { sizeof ( BDF_CMapRec ), @@ -198,7 +198,7 @@ THE SOFTWARE. static FT_Error bdf_interpret_style( BDF_Face bdf ) { - FT_Error error = BDF_Err_Ok; + FT_Error error = FT_Err_Ok; FT_Face face = FT_FACE( bdf ); FT_Memory memory = face->memory; bdf_font_t* font = bdf->bdffont; @@ -243,8 +243,6 @@ THE SOFTWARE. !( *(prop->value.atom) == 'N' || *(prop->value.atom) == 'n' ) ) strings[0] = (char *)(prop->value.atom); - len = 0; - for ( len = 0, nn = 0; nn < 4; nn++ ) { lengths[nn] = 0; @@ -342,7 +340,7 @@ THE SOFTWARE. FT_Int num_params, FT_Parameter* params ) { - FT_Error error = BDF_Err_Ok; + FT_Error error = FT_Err_Ok; BDF_Face face = (BDF_Face)bdfface; FT_Memory memory = FT_FACE_MEMORY( face ); @@ -351,7 +349,6 @@ THE SOFTWARE. FT_UNUSED( num_params ); FT_UNUSED( params ); - FT_UNUSED( face_index ); FT_TRACE2(( "BDF driver\n" )); @@ -365,7 +362,7 @@ THE SOFTWARE. options.font_spacing = BDF_PROPORTIONAL; error = bdf_load_font( stream, memory, &options, &font ); - if ( error == BDF_Err_Missing_Startfont_Field ) + if ( FT_ERR_EQ( error, Missing_Startfont_Field ) ) { FT_TRACE2(( " not a BDF file\n" )); goto Fail; @@ -375,6 +372,19 @@ THE SOFTWARE. /* we have a bdf font: let's construct the face object */ face->bdffont = font; + + /* BDF could not have multiple face in single font file. + * XXX: non-zero face_index is already invalid argument, but + * Type1, Type42 driver has a convention to return + * an invalid argument error when the font could be + * opened by the specified driver. + */ + if ( face_index > 0 ) { + FT_ERROR(( "BDF_Face_Init: invalid face index\n" )); + BDF_Face_Done( bdfface ); + return FT_THROW( Invalid_Argument ); + } + { bdf_property_t* prop = NULL; @@ -388,9 +398,10 @@ THE SOFTWARE. bdfface->num_faces = 1; bdfface->face_index = 0; - bdfface->face_flags = FT_FACE_FLAG_FIXED_SIZES | - FT_FACE_FLAG_HORIZONTAL | - FT_FACE_FLAG_FAST_GLYPHS; + + bdfface->face_flags |= FT_FACE_FLAG_FIXED_SIZES | + FT_FACE_FLAG_HORIZONTAL | + FT_FACE_FLAG_FAST_GLYPHS; prop = bdf_get_font_property( font, "SPACING" ); if ( prop && prop->format == BDF_ATOM && @@ -591,7 +602,7 @@ THE SOFTWARE. Fail: BDF_Face_Done( bdfface ); - return BDF_Err_Unknown_File_Format; + return FT_THROW( Unknown_File_Format ); } @@ -608,7 +619,7 @@ THE SOFTWARE. size->metrics.descender = -bdffont->font_descent << 6; size->metrics.max_advance = bdffont->bbx.width << 6; - return BDF_Err_Ok; + return FT_Err_Ok; } @@ -619,7 +630,7 @@ THE SOFTWARE. FT_Face face = size->face; FT_Bitmap_Size* bsize = face->available_sizes; bdf_font_t* bdffont = ( (BDF_Face)face )->bdffont; - FT_Error error = BDF_Err_Invalid_Pixel_Size; + FT_Error error = FT_ERR( Invalid_Pixel_Size ); FT_Long height; @@ -630,17 +641,17 @@ THE SOFTWARE. { case FT_SIZE_REQUEST_TYPE_NOMINAL: if ( height == ( ( bsize->y_ppem + 32 ) >> 6 ) ) - error = BDF_Err_Ok; + error = FT_Err_Ok; break; case FT_SIZE_REQUEST_TYPE_REAL_DIM: if ( height == ( bdffont->font_ascent + bdffont->font_descent ) ) - error = BDF_Err_Ok; + error = FT_Err_Ok; break; default: - error = BDF_Err_Unimplemented_Feature; + error = FT_THROW( Unimplemented_Feature ); break; } @@ -660,7 +671,7 @@ THE SOFTWARE. { BDF_Face bdf = (BDF_Face)FT_SIZE_FACE( size ); FT_Face face = FT_FACE( bdf ); - FT_Error error = BDF_Err_Ok; + FT_Error error = FT_Err_Ok; FT_Bitmap* bitmap = &slot->bitmap; bdf_glyph_t glyph; int bpp = bdf->bdffont->bpp; @@ -668,12 +679,20 @@ THE SOFTWARE. FT_UNUSED( load_flags ); - if ( !face || glyph_index >= (FT_UInt)face->num_glyphs ) + if ( !face ) { - error = BDF_Err_Invalid_Argument; + error = FT_THROW( Invalid_Face_Handle ); goto Exit; } + if ( glyph_index >= (FT_UInt)face->num_glyphs ) + { + error = FT_THROW( Invalid_Argument ); + goto Exit; + } + + FT_TRACE1(( "BDF_Glyph_Load: glyph index %d\n", glyph_index )); + /* index 0 is the undefined glyph */ if ( glyph_index == 0 ) glyph_index = bdf->default_glyph; @@ -786,7 +805,7 @@ THE SOFTWARE. } Fail: - return BDF_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); } @@ -864,10 +883,6 @@ THE SOFTWARE. 0, /* FT_Slot_InitFunc */ 0, /* FT_Slot_DoneFunc */ -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS - ft_stub_set_char_sizes, - ft_stub_set_pixel_sizes, -#endif BDF_Glyph_Load, 0, /* FT_Face_GetKerningFunc */ diff --git a/src/bdf/bdflib.c b/src/bdf/bdflib.c index b7b6857..abcfdee 100644 --- a/src/bdf/bdflib.c +++ b/src/bdf/bdflib.c @@ -1,6 +1,6 @@ /* * Copyright 2000 Computing Research Labs, New Mexico State University - * Copyright 2001-2012 + * Copyright 2001-2014 * Francesco Zappa Nardelli * * Permission is hereby granted, free of charge, to any person obtaining a @@ -169,6 +169,18 @@ sizeof ( _bdf_properties[0] ); + /* An auxiliary macro to parse properties, to be used in conditionals. */ + /* It behaves like `strncmp' but also tests the following character */ + /* whether it is a whitespace or NULL. */ + /* `property' is a constant string of length `n' to compare with. */ +#define _bdf_strncmp( name, property, n ) \ + ( ft_strncmp( name, property, n ) || \ + !( name[n] == ' ' || \ + name[n] == '\0' || \ + name[n] == '\n' || \ + name[n] == '\r' || \ + name[n] == '\t' ) ) + /* Auto correction messages. */ #define ACMSG1 "FONT_ASCENT property missing. " \ "Added `FONT_ASCENT %hd'.\n" @@ -254,7 +266,7 @@ { hashnode* obp = ht->table, *bp, *nbp; int i, sz = ht->size; - FT_Error error = BDF_Err_Ok; + FT_Error error = FT_Err_Ok; ht->size <<= 1; @@ -282,8 +294,8 @@ hash_init( hashtable* ht, FT_Memory memory ) { - int sz = INITIAL_HT_SIZE; - FT_Error error = BDF_Err_Ok; + int sz = INITIAL_HT_SIZE; + FT_Error error = FT_Err_Ok; ht->size = sz; @@ -322,8 +334,9 @@ hashtable* ht, FT_Memory memory ) { - hashnode nn, *bp = hash_bucket( key, ht ); - FT_Error error = BDF_Err_Ok; + hashnode nn; + hashnode* bp = hash_bucket( key, ht ); + FT_Error error = FT_Err_Ok; nn = *bp; @@ -456,7 +469,7 @@ _bdf_list_ensure( _bdf_list_t* list, unsigned long num_items ) /* same as _bdf_list_t.used */ { - FT_Error error = BDF_Err_Ok; + FT_Error error = FT_Err_Ok; if ( num_items > list->size ) @@ -469,7 +482,7 @@ if ( oldsize == bigsize ) { - error = BDF_Err_Out_Of_Memory; + error = FT_THROW( Out_Of_Memory ); goto Exit; } else if ( newsize < oldsize || newsize > bigsize ) @@ -519,7 +532,7 @@ unsigned long *alen ) { unsigned long i, j; - char *fp, *dp; + char* dp; *alen = 0; @@ -530,7 +543,9 @@ dp = list->field[0]; for ( i = j = 0; i < list->used; i++ ) { - fp = list->field[i]; + char* fp = list->field[i]; + + while ( *fp ) dp[j++] = *fp++; @@ -558,7 +573,7 @@ int mult, final_empty; char *sp, *ep, *end; char seps[32]; - FT_Error error = BDF_Err_Ok; + FT_Error error = FT_Err_Ok; /* Initialize the list. */ @@ -569,6 +584,7 @@ list->field[1] = (char*)empty; list->field[2] = (char*)empty; list->field[3] = (char*)empty; + list->field[4] = (char*)empty; } /* If the line is empty, then simply return. */ @@ -580,7 +596,7 @@ /* this, so an error is signaled. */ if ( separators == 0 || *separators == 0 ) { - error = BDF_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Exit; } @@ -666,14 +682,14 @@ unsigned long lineno, buf_size; int refill, hold, to_skip; ptrdiff_t bytes, start, end, cursor, avail; - char* buf = 0; + char* buf = 0; FT_Memory memory = stream->memory; - FT_Error error = BDF_Err_Ok; + FT_Error error = FT_Err_Ok; if ( callback == 0 ) { - error = BDF_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Exit; } @@ -687,7 +703,6 @@ lineno = 1; buf[0] = 0; start = 0; - end = 0; avail = 0; cursor = 0; refill = 1; @@ -737,7 +752,7 @@ if ( buf_size >= 65536UL ) /* limit ourselves to 64KByte */ { FT_ERROR(( "_bdf_readstream: " ERRMSG6, lineno )); - error = BDF_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Exit; } @@ -752,7 +767,7 @@ { bytes = avail - start; - FT_MEM_COPY( buf, buf + start, bytes ); + FT_MEM_MOVE( buf, buf + start, bytes ); cursor = bytes; avail -= bytes; @@ -766,14 +781,14 @@ hold = buf[end]; buf[end] = 0; - /* XXX: Use encoding independent value for 0x1a */ - if ( buf[start] != '#' && buf[start] != 0x1a && end > start ) + /* XXX: Use encoding independent value for 0x1A */ + if ( buf[start] != '#' && buf[start] != 0x1A && end > start ) { - error = (*cb)( buf + start, end - start, lineno, + error = (*cb)( buf + start, (unsigned long)( end - start ), lineno, (void*)&cb, client_data ); /* Redo if we have encountered CHARS without properties. */ if ( error == -1 ) - error = (*cb)( buf + start, end - start, lineno, + error = (*cb)( buf + start, (unsigned long)( end - start ), lineno, (void*)&cb, client_data ); if ( error ) break; @@ -808,17 +823,17 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; static const unsigned char odigits[32] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -826,7 +841,7 @@ static const unsigned char ddigits[32] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x03, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -834,16 +849,13 @@ static const unsigned char hdigits[32] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x03, - 0x7e, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x03, + 0x7E, 0x00, 0x00, 0x00, 0x7E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -#define isdigok( m, d ) (m[(d) >> 3] & ( 1 << ( (d) & 7 ) ) ) - - /* Routine to convert an ASCII string into an unsigned long integer. */ static unsigned long _bdf_atoul( char* s, @@ -881,7 +893,7 @@ s += 2; } - for ( v = 0; isdigok( dmap, *s ); s++ ) + for ( v = 0; sbitset( dmap, *s ); s++ ) v = v * base + a2i[(int)*s]; if ( end != 0 ) @@ -936,7 +948,7 @@ s += 2; } - for ( v = 0; isdigok( dmap, *s ); s++ ) + for ( v = 0; sbitset( dmap, *s ); s++ ) v = v * base + a2i[(int)*s]; if ( end != 0 ) @@ -991,7 +1003,7 @@ s += 2; } - for ( v = 0; isdigok( dmap, *s ); s++ ) + for ( v = 0; sbitset( dmap, *s ); s++ ) v = (short)( v * base + a2i[(int)*s] ); if ( end != 0 ) @@ -1030,7 +1042,7 @@ size_t n; bdf_property_t* p; FT_Memory memory = font->memory; - FT_Error error = BDF_Err_Ok; + FT_Error error = FT_Err_Ok; /* First check whether the property has */ @@ -1049,7 +1061,7 @@ n = ft_strlen( name ) + 1; if ( n > FT_ULONG_MAX ) - return BDF_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); if ( FT_NEW_ARRAY( p->name, n ) ) goto Exit; @@ -1136,7 +1148,7 @@ { char* cp; FT_Memory memory = font->memory; - FT_Error error = BDF_Err_Ok; + FT_Error error = FT_Err_Ok; if ( FT_RENEW_ARRAY( font->comments, @@ -1167,12 +1179,14 @@ char name[256]; _bdf_list_t list; FT_Memory memory; - FT_Error error = BDF_Err_Ok; + FT_Error error = FT_Err_Ok; + + FT_UNUSED( lineno ); /* only used in debug mode */ if ( font == 0 || font->name == 0 || font->name[0] == 0 ) { - error = BDF_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Exit; } @@ -1187,13 +1201,13 @@ if ( len >= 256 ) { FT_ERROR(( "_bdf_set_default_spacing: " ERRMSG7, lineno )); - error = BDF_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Exit; } FT_MEM_COPY( name, font->name, len ); - error = _bdf_list_split( &list, (char *)"-", name, len ); + error = _bdf_list_split( &list, (char *)"-", name, (unsigned long)len ); if ( error ) goto Fail; @@ -1300,7 +1314,9 @@ hashnode hn; bdf_property_t *prop, *fp; FT_Memory memory = font->memory; - FT_Error error = BDF_Err_Ok; + FT_Error error = FT_Err_Ok; + + FT_UNUSED( lineno ); /* only used in debug mode */ /* First, check whether the property already exists in the font. */ @@ -1404,7 +1420,7 @@ /* If the property happens to be a comment, then it doesn't need */ /* to be added to the internal hash table. */ - if ( ft_memcmp( name, "COMMENT", 7 ) != 0 ) + if ( _bdf_strncmp( name, "COMMENT", 7 ) != 0 ) { /* Add the property to the font property table. */ error = hash_insert( fp->name, @@ -1422,18 +1438,18 @@ /* FONT_ASCENT and FONT_DESCENT need to be assigned if they are */ /* present, and the SPACING property should override the default */ /* spacing. */ - if ( ft_memcmp( name, "DEFAULT_CHAR", 12 ) == 0 ) + if ( _bdf_strncmp( name, "DEFAULT_CHAR", 12 ) == 0 ) font->default_char = fp->value.l; - else if ( ft_memcmp( name, "FONT_ASCENT", 11 ) == 0 ) + else if ( _bdf_strncmp( name, "FONT_ASCENT", 11 ) == 0 ) font->font_ascent = fp->value.l; - else if ( ft_memcmp( name, "FONT_DESCENT", 12 ) == 0 ) + else if ( _bdf_strncmp( name, "FONT_DESCENT", 12 ) == 0 ) font->font_descent = fp->value.l; - else if ( ft_memcmp( name, "SPACING", 7 ) == 0 ) + else if ( _bdf_strncmp( name, "SPACING", 7 ) == 0 ) { if ( !fp->value.atom ) { FT_ERROR(( "_bdf_add_property: " ERRMSG8, lineno, "SPACING" )); - error = BDF_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } @@ -1474,7 +1490,7 @@ bdf_font_t* font; FT_Memory memory; - FT_Error error = BDF_Err_Ok; + FT_Error error = FT_Err_Ok; FT_UNUSED( call_data ); FT_UNUSED( lineno ); /* only used in debug mode */ @@ -1486,7 +1502,7 @@ memory = font->memory; /* Check for a comment. */ - if ( ft_memcmp( line, "COMMENT", 7 ) == 0 ) + if ( _bdf_strncmp( line, "COMMENT", 7 ) == 0 ) { linelen -= 7; @@ -1503,10 +1519,10 @@ /* The very first thing expected is the number of glyphs. */ if ( !( p->flags & _BDF_GLYPHS ) ) { - if ( ft_memcmp( line, "CHARS", 5 ) != 0 ) + if ( _bdf_strncmp( line, "CHARS", 5 ) != 0 ) { FT_ERROR(( "_bdf_parse_glyphs: " ERRMSG1, lineno, "CHARS" )); - error = BDF_Err_Missing_Chars_Field; + error = FT_THROW( Missing_Chars_Field ); goto Exit; } @@ -1524,7 +1540,7 @@ if ( p->cnt >= 0x110000UL ) { FT_ERROR(( "_bdf_parse_glyphs: " ERRMSG5, lineno, "CHARS" )); - error = BDF_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Exit; } @@ -1537,8 +1553,16 @@ } /* Check for the ENDFONT field. */ - if ( ft_memcmp( line, "ENDFONT", 7 ) == 0 ) + if ( _bdf_strncmp( line, "ENDFONT", 7 ) == 0 ) { + if ( p->flags & _BDF_GLYPH_BITS ) + { + /* Missing ENDCHAR field. */ + FT_ERROR(( "_bdf_parse_glyphs: " ERRMSG1, lineno, "ENDCHAR" )); + error = FT_THROW( Corrupted_Font_Glyphs ); + goto Exit; + } + /* Sort the glyphs by encoding. */ ft_qsort( (char *)font->glyphs, font->glyphs_used, @@ -1551,7 +1575,7 @@ } /* Check for the ENDCHAR field. */ - if ( ft_memcmp( line, "ENDCHAR", 7 ) == 0 ) + if ( _bdf_strncmp( line, "ENDCHAR", 7 ) == 0 ) { p->glyph_enc = 0; p->flags &= ~_BDF_GLYPH_BITS; @@ -1567,7 +1591,7 @@ goto Exit; /* Check for the STARTCHAR field. */ - if ( ft_memcmp( line, "STARTCHAR", 9 ) == 0 ) + if ( _bdf_strncmp( line, "STARTCHAR", 9 ) == 0 ) { /* Set the character name in the parse info first until the */ /* encoding can be checked for an unencoded character. */ @@ -1584,7 +1608,7 @@ if ( !s ) { FT_ERROR(( "_bdf_parse_glyphs: " ERRMSG8, lineno, "STARTCHAR" )); - error = BDF_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } @@ -1601,13 +1625,13 @@ } /* Check for the ENCODING field. */ - if ( ft_memcmp( line, "ENCODING", 8 ) == 0 ) + if ( _bdf_strncmp( line, "ENCODING", 8 ) == 0 ) { if ( !( p->flags & _BDF_GLYPH ) ) { /* Missing STARTCHAR field. */ FT_ERROR(( "_bdf_parse_glyphs: " ERRMSG1, lineno, "STARTCHAR" )); - error = BDF_Err_Missing_Startchar_Field; + error = FT_THROW( Missing_Startchar_Field ); goto Exit; } @@ -1626,15 +1650,19 @@ if ( p->glyph_enc == -1 && p->list.used > 2 ) p->glyph_enc = _bdf_atol( p->list.field[2], 0, 10 ); + if ( p->glyph_enc < -1 ) + p->glyph_enc = -1; + FT_TRACE4(( DBGMSG2, p->glyph_enc )); /* Check that the encoding is in the Unicode range because */ /* otherwise p->have (a bitmap with static size) overflows. */ - if ( p->glyph_enc > 0 && - (size_t)p->glyph_enc >= sizeof ( p->have ) * 8 ) + if ( p->glyph_enc > 0 && + (size_t)p->glyph_enc >= sizeof ( p->have ) / + sizeof ( unsigned long ) * 32 ) { FT_ERROR(( "_bdf_parse_glyphs: " ERRMSG5, lineno, "ENCODING" )); - error = BDF_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } @@ -1746,7 +1774,7 @@ for ( i = 0; i < nibbles; i++ ) { c = line[i]; - if ( !isdigok( hdigits, c ) ) + if ( !sbitset( hdigits, c ) ) break; *bp = (FT_Byte)( ( *bp << 4 ) + a2i[c] ); if ( i + 1 < nibbles && ( i & 1 ) ) @@ -1770,7 +1798,7 @@ /* If any line has extra columns, indicate they have been removed. */ if ( i == nibbles && - isdigok( hdigits, line[nibbles] ) && + sbitset( hdigits, line[nibbles] ) && !( p->flags & _BDF_GLYPH_WIDTH_CHECK ) ) { FT_TRACE2(( "_bdf_parse_glyphs: " ACMSG14, glyph->encoding )); @@ -1783,7 +1811,7 @@ } /* Expect the SWIDTH (scalable width) field next. */ - if ( ft_memcmp( line, "SWIDTH", 6 ) == 0 ) + if ( _bdf_strncmp( line, "SWIDTH", 6 ) == 0 ) { if ( !( p->flags & _BDF_ENCODING ) ) goto Missing_Encoding; @@ -1799,7 +1827,7 @@ } /* Expect the DWIDTH (scalable width) field next. */ - if ( ft_memcmp( line, "DWIDTH", 6 ) == 0 ) + if ( _bdf_strncmp( line, "DWIDTH", 6 ) == 0 ) { if ( !( p->flags & _BDF_ENCODING ) ) goto Missing_Encoding; @@ -1827,7 +1855,7 @@ } /* Expect the BBX field next. */ - if ( ft_memcmp( line, "BBX", 3 ) == 0 ) + if ( _bdf_strncmp( line, "BBX", 3 ) == 0 ) { if ( !( p->flags & _BDF_ENCODING ) ) goto Missing_Encoding; @@ -1895,7 +1923,7 @@ } /* And finally, gather up the bitmap. */ - if ( ft_memcmp( line, "BITMAP", 6 ) == 0 ) + if ( _bdf_strncmp( line, "BITMAP", 6 ) == 0 ) { unsigned long bitmap_size; @@ -1904,7 +1932,7 @@ { /* Missing BBX field. */ FT_ERROR(( "_bdf_parse_glyphs: " ERRMSG1, lineno, "BBX" )); - error = BDF_Err_Missing_Bbx_Field; + error = FT_THROW( Missing_Bbx_Field ); goto Exit; } @@ -1915,7 +1943,7 @@ if ( glyph->bpr > 0xFFFFU || bitmap_size > 0xFFFFU ) { FT_ERROR(( "_bdf_parse_glyphs: " ERRMSG4, lineno )); - error = BDF_Err_Bbx_Too_Big; + error = FT_THROW( Bbx_Too_Big ); goto Exit; } else @@ -1931,13 +1959,13 @@ } FT_ERROR(( "_bdf_parse_glyphs: " ERRMSG9, lineno )); - error = BDF_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; Missing_Encoding: /* Missing ENCODING field. */ FT_ERROR(( "_bdf_parse_glyphs: " ERRMSG1, lineno, "ENCODING" )); - error = BDF_Err_Missing_Encoding_Field; + error = FT_THROW( Missing_Encoding_Field ); Exit: if ( error && ( p->flags & _BDF_GLYPH ) ) @@ -1961,7 +1989,7 @@ char* name; char* value; char nbuf[128]; - FT_Error error = BDF_Err_Ok; + FT_Error error = FT_Err_Ok; FT_UNUSED( lineno ); @@ -1970,7 +1998,7 @@ p = (_bdf_parse_t *) client_data; /* Check for the end of the properties. */ - if ( ft_memcmp( line, "ENDPROPERTIES", 13 ) == 0 ) + if ( _bdf_strncmp( line, "ENDPROPERTIES", 13 ) == 0 ) { /* If the FONT_ASCENT or FONT_DESCENT properties have not been */ /* encountered yet, then make sure they are added as properties and */ @@ -2011,12 +2039,12 @@ } /* Ignore the _XFREE86_GLYPH_RANGES properties. */ - if ( ft_memcmp( line, "_XFREE86_GLYPH_RANGES", 21 ) == 0 ) + if ( _bdf_strncmp( line, "_XFREE86_GLYPH_RANGES", 21 ) == 0 ) goto Exit; /* Handle COMMENT fields and properties in a special way to preserve */ /* the spacing. */ - if ( ft_memcmp( line, "COMMENT", 7 ) == 0 ) + if ( _bdf_strncmp( line, "COMMENT", 7 ) == 0 ) { name = value = line; value += 7; @@ -2067,7 +2095,7 @@ char *s; FT_Memory memory = NULL; - FT_Error error = BDF_Err_Ok; + FT_Error error = FT_Err_Ok; FT_UNUSED( lineno ); /* only used in debug mode */ @@ -2080,7 +2108,7 @@ /* Check for a comment. This is done to handle those fonts that have */ /* comments before the STARTFONT line for some reason. */ - if ( ft_memcmp( line, "COMMENT", 7 ) == 0 ) + if ( _bdf_strncmp( line, "COMMENT", 7 ) == 0 ) { if ( p->opts->keep_comments != 0 && p->font != 0 ) { @@ -2106,11 +2134,11 @@ { memory = p->memory; - if ( ft_memcmp( line, "STARTFONT", 9 ) != 0 ) + if ( _bdf_strncmp( line, "STARTFONT", 9 ) != 0 ) { /* we don't emit an error message since this code gets */ /* explicitly caught one level higher */ - error = BDF_Err_Missing_Startfont_Field; + error = FT_THROW( Missing_Startfont_Field ); goto Exit; } @@ -2154,13 +2182,13 @@ } /* Check for the start of the properties. */ - if ( ft_memcmp( line, "STARTPROPERTIES", 15 ) == 0 ) + if ( _bdf_strncmp( line, "STARTPROPERTIES", 15 ) == 0 ) { if ( !( p->flags & _BDF_FONT_BBX ) ) { /* Missing the FONTBOUNDINGBOX field. */ FT_ERROR(( "_bdf_parse_start: " ERRMSG1, lineno, "FONTBOUNDINGBOX" )); - error = BDF_Err_Missing_Fontboundingbox_Field; + error = FT_THROW( Missing_Fontboundingbox_Field ); goto Exit; } @@ -2171,7 +2199,10 @@ p->cnt = p->font->props_size = _bdf_atoul( p->list.field[1], 0, 10 ); if ( FT_NEW_ARRAY( p->font->props, p->cnt ) ) + { + p->font->props_size = 0; goto Exit; + } p->flags |= _BDF_PROPS; *next = _bdf_parse_properties; @@ -2180,13 +2211,13 @@ } /* Check for the FONTBOUNDINGBOX field. */ - if ( ft_memcmp( line, "FONTBOUNDINGBOX", 15 ) == 0 ) + if ( _bdf_strncmp( line, "FONTBOUNDINGBOX", 15 ) == 0 ) { if ( !( p->flags & _BDF_SIZE ) ) { /* Missing the SIZE field. */ FT_ERROR(( "_bdf_parse_start: " ERRMSG1, lineno, "SIZE" )); - error = BDF_Err_Missing_Size_Field; + error = FT_THROW( Missing_Size_Field ); goto Exit; } @@ -2211,7 +2242,7 @@ } /* The next thing to check for is the FONT field. */ - if ( ft_memcmp( line, "FONT", 4 ) == 0 ) + if ( _bdf_strncmp( line, "FONT", 4 ) == 0 ) { error = _bdf_list_split( &p->list, (char *)" +", line, linelen ); if ( error ) @@ -2223,7 +2254,7 @@ if ( !s ) { FT_ERROR(( "_bdf_parse_start: " ERRMSG8, lineno, "FONT" )); - error = BDF_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } @@ -2246,13 +2277,13 @@ } /* Check for the SIZE field. */ - if ( ft_memcmp( line, "SIZE", 4 ) == 0 ) + if ( _bdf_strncmp( line, "SIZE", 4 ) == 0 ) { if ( !( p->flags & _BDF_FONT_NAME ) ) { /* Missing the FONT field. */ FT_ERROR(( "_bdf_parse_start: " ERRMSG1, lineno, "FONT" )); - error = BDF_Err_Missing_Font_Field; + error = FT_THROW( Missing_Font_Field ); goto Exit; } @@ -2300,7 +2331,7 @@ } /* Check for the CHARS field -- font properties are optional */ - if ( ft_memcmp( line, "CHARS", 5 ) == 0 ) + if ( _bdf_strncmp( line, "CHARS", 5 ) == 0 ) { char nbuf[128]; @@ -2309,7 +2340,7 @@ { /* Missing the FONTBOUNDINGBOX field. */ FT_ERROR(( "_bdf_parse_start: " ERRMSG1, lineno, "FONTBOUNDINGBOX" )); - error = BDF_Err_Missing_Fontboundingbox_Field; + error = FT_THROW( Missing_Fontboundingbox_Field ); goto Exit; } @@ -2341,7 +2372,7 @@ } FT_ERROR(( "_bdf_parse_start: " ERRMSG9, lineno )); - error = BDF_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); Exit: return error; @@ -2364,8 +2395,8 @@ unsigned long lineno = 0; /* make compiler happy */ _bdf_parse_t *p = NULL; - FT_Memory memory = extmemory; - FT_Error error = BDF_Err_Ok; + FT_Memory memory = extmemory; /* needed for FT_NEW */ + FT_Error error = FT_Err_Ok; if ( FT_NEW( p ) ) @@ -2387,7 +2418,6 @@ { /* If the font is not proportional, set the font's monowidth */ /* field to the width of the font bounding box. */ - memory = p->font->memory; if ( p->font->spacing != BDF_PROPORTIONAL ) p->font->monowidth = p->font->bbx.width; @@ -2458,14 +2488,14 @@ { /* Error happened while parsing header. */ FT_ERROR(( "bdf_load_font: " ERRMSG2, lineno )); - error = BDF_Err_Corrupted_Font_Header; + error = FT_THROW( Corrupted_Font_Header ); goto Exit; } else { /* Error happened when parsing glyphs. */ FT_ERROR(( "bdf_load_font: " ERRMSG3, lineno )); - error = BDF_Err_Corrupted_Font_Glyphs; + error = FT_THROW( Corrupted_Font_Glyphs ); goto Exit; } } @@ -2485,8 +2515,8 @@ p->font->comments[p->font->comments_len] = 0; } } - else if ( error == BDF_Err_Ok ) - error = BDF_Err_Invalid_File_Format; + else if ( error == FT_Err_Ok ) + error = FT_THROW( Invalid_File_Format ); *font = p->font; diff --git a/src/bzip2/ftbzip2.c b/src/bzip2/ftbzip2.c index d60ee3e..7e406b1 100644 --- a/src/bzip2/ftbzip2.c +++ b/src/bzip2/ftbzip2.c @@ -8,7 +8,7 @@ /* parse compressed PCF fonts, as found with many X11 server */ /* distributions. */ /* */ -/* Copyright 2010, 2012 by */ +/* Copyright 2010, 2012-2014 by */ /* Joel Klinghed. */ /* */ /* Based on src/gzip/ftgzip.c, Copyright 2002 - 2010 by */ @@ -120,7 +120,7 @@ static FT_Error ft_bzip2_check_header( FT_Stream stream ) { - FT_Error error = Bzip2_Err_Ok; + FT_Error error = FT_Err_Ok; FT_Byte head[4]; @@ -131,10 +131,10 @@ /* head[0] && head[1] are the magic numbers; */ /* head[2] is the version, and head[3] the blocksize */ if ( head[0] != 0x42 || - head[1] != 0x5a || + head[1] != 0x5A || head[2] != 0x68 ) /* only support bzip2 (huffman) */ { - error = Bzip2_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } @@ -149,7 +149,7 @@ FT_Stream source ) { bz_stream* bzstream = &zip->bzstream; - FT_Error error = Bzip2_Err_Ok; + FT_Error error = FT_Err_Ok; zip->stream = stream; @@ -182,7 +182,7 @@ if ( BZ2_bzDecompressInit( bzstream, 0, 0 ) != BZ_OK || bzstream->next_in == NULL ) - error = Bzip2_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); Exit: return error; @@ -255,7 +255,7 @@ size = stream->read( stream, stream->pos, zip->input, FT_BZIP2_BUFFER_SIZE ); if ( size == 0 ) - return Bzip2_Err_Invalid_Stream_Operation; + return FT_THROW( Invalid_Stream_Operation ); } else { @@ -264,7 +264,7 @@ size = FT_BZIP2_BUFFER_SIZE; if ( size == 0 ) - return Bzip2_Err_Invalid_Stream_Operation; + return FT_THROW( Invalid_Stream_Operation ); FT_MEM_COPY( zip->input, stream->base + stream->pos, size ); } @@ -273,7 +273,7 @@ bzstream->next_in = (char*)zip->input; bzstream->avail_in = size; - return Bzip2_Err_Ok; + return FT_Err_Ok; } @@ -281,7 +281,7 @@ ft_bzip2_file_fill_output( FT_BZip2File zip ) { bz_stream* bzstream = &zip->bzstream; - FT_Error error = Bzip2_Err_Ok; + FT_Error error = FT_Err_Ok; zip->cursor = zip->buffer; @@ -306,12 +306,12 @@ { zip->limit = (FT_Byte*)bzstream->next_out; if ( zip->limit == zip->cursor ) - error = Bzip2_Err_Invalid_Stream_Operation; + error = FT_THROW( Invalid_Stream_Operation ); break; } else if ( err != BZ_OK ) { - error = Bzip2_Err_Invalid_Stream_Operation; + error = FT_THROW( Invalid_Stream_Operation ); break; } } @@ -325,7 +325,7 @@ ft_bzip2_file_skip_output( FT_BZip2File zip, FT_ULong count ) { - FT_Error error = Bzip2_Err_Ok; + FT_Error error = FT_Err_Ok; FT_ULong delta; @@ -456,10 +456,18 @@ FT_Stream source ) { FT_Error error; - FT_Memory memory = source->memory; + FT_Memory memory; FT_BZip2File zip = NULL; + if ( !stream || !source ) + { + error = FT_THROW( Invalid_Stream_Handle ); + goto Exit; + } + + memory = source->memory; + /* * check the header right now; this prevents allocating unnecessary * objects when we don't need them @@ -502,7 +510,7 @@ FT_UNUSED( stream ); FT_UNUSED( source ); - return Bzip2_Err_Unimplemented_Feature; + return FT_THROW( Unimplemented_Feature ); } #endif /* !FT_CONFIG_OPTION_USE_BZIP2 */ diff --git a/src/cache/Jamfile b/src/cache/Jamfile index 340cff7..6563991 100644 --- a/src/cache/Jamfile +++ b/src/cache/Jamfile @@ -1,6 +1,6 @@ # FreeType 2 src/cache Jamfile # -# Copyright 2001, 2003, 2004 by +# Copyright 2001, 2003, 2004, 2013 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -11,7 +11,7 @@ SubDir FT2_TOP $(FT2_SRC_DIR) cache ; -# The file <freetype/ftcache.h> contains some macro definitions that are +# The file <ftcache.h> contains some macro definitions that are # later used in #include statements related to the cache sub-system. It # needs to be parsed through a HDRMACRO rule for macro definitions. # diff --git a/src/cache/ftcbasic.c b/src/cache/ftcbasic.c index d4fc353..6bad39d 100644 --- a/src/cache/ftcbasic.c +++ b/src/cache/ftcbasic.c @@ -4,7 +4,7 @@ /* */ /* The FreeType basic cache interface (body). */ /* */ -/* Copyright 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2011 by */ +/* Copyright 2003-2007, 2009-2011, 2013, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -30,44 +30,6 @@ #define FT_COMPONENT trace_cache -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS - - /* - * These structures correspond to the FTC_Font and FTC_ImageDesc types - * that were defined in version 2.1.7. - */ - typedef struct FTC_OldFontRec_ - { - FTC_FaceID face_id; - FT_UShort pix_width; - FT_UShort pix_height; - - } FTC_OldFontRec, *FTC_OldFont; - - - typedef struct FTC_OldImageDescRec_ - { - FTC_OldFontRec font; - FT_UInt32 flags; - - } FTC_OldImageDescRec, *FTC_OldImageDesc; - - - /* - * Notice that FTC_OldImageDescRec and FTC_ImageTypeRec are nearly - * identical, bit-wise. The only difference is that the `width' and - * `height' fields are expressed as 16-bit integers in the old structure, - * and as normal `int' in the new one. - * - * We are going to perform a weird hack to detect which structure is - * being passed to the image and sbit caches. If the new structure's - * `width' is larger than 0x10000, we assume that we are really receiving - * an FTC_OldImageDesc. - */ - -#endif /* FT_CONFIG_OPTION_OLD_INTERNALS */ - - /* * Basic Families * @@ -148,10 +110,9 @@ return result; if ( (FT_ULong)face->num_glyphs > FT_UINT_MAX || 0 > face->num_glyphs ) - { - FT_TRACE1(( "ftc_basic_family_get_count: too large number of glyphs " )); - FT_TRACE1(( "in this face, truncated\n", face->num_glyphs )); - } + FT_TRACE1(( "ftc_basic_family_get_count:" + " too large number of glyphs in this face, truncated\n", + face->num_glyphs )); if ( !error ) result = (FT_UInt)face->num_glyphs; @@ -226,7 +187,7 @@ } } else - error = FTC_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); } } @@ -267,7 +228,7 @@ * */ - FT_CALLBACK_TABLE_DEF + static const FTC_IFamilyClassRec ftc_basic_image_family_class = { { @@ -281,7 +242,7 @@ }; - FT_CALLBACK_TABLE_DEF + static const FTC_GCacheClassRec ftc_basic_image_cache_class = { { @@ -325,10 +286,10 @@ FT_PtrDist hash; - /* some argument checks are delayed to FTC_Cache_Lookup */ + /* some argument checks are delayed to `FTC_Cache_Lookup' */ if ( !aglyph ) { - error = FTC_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Exit; } @@ -336,38 +297,15 @@ if ( anode ) *anode = NULL; -#if defined( FT_CONFIG_OPTION_OLD_INTERNALS ) && ( FT_INT_MAX > 0xFFFFU ) - - /* - * This one is a major hack used to detect whether we are passed a - * regular FTC_ImageType handle, or a legacy FTC_OldImageDesc one. - */ - if ( (FT_ULong)type->width >= 0x10000L ) - { - FTC_OldImageDesc desc = (FTC_OldImageDesc)type; - - - query.attrs.scaler.face_id = desc->font.face_id; - query.attrs.scaler.width = desc->font.pix_width; - query.attrs.scaler.height = desc->font.pix_height; - query.attrs.load_flags = desc->flags; - } - else - -#endif /* FT_CONFIG_OPTION_OLD_INTERNALS */ - - { - if ( (FT_ULong)(type->flags - FT_INT_MIN) > FT_UINT_MAX ) - { - FT_TRACE1(( "FTC_ImageCache_Lookup: higher bits in load_flags" )); - FT_TRACE1(( "0x%x are dropped\n", (type->flags & ~((FT_ULong)FT_UINT_MAX)) )); - } + if ( (FT_ULong)( type->flags - FT_INT_MIN ) > FT_UINT_MAX ) + FT_TRACE1(( "FTC_ImageCache_Lookup:" + " higher bits in load_flags 0x%x are dropped\n", + type->flags & ~((FT_ULong)FT_UINT_MAX) )); - query.attrs.scaler.face_id = type->face_id; - query.attrs.scaler.width = type->width; - query.attrs.scaler.height = type->height; - query.attrs.load_flags = (FT_UInt)type->flags; - } + query.attrs.scaler.face_id = type->face_id; + query.attrs.scaler.width = type->width; + query.attrs.scaler.height = type->height; + query.attrs.load_flags = (FT_UInt)type->flags; query.attrs.scaler.pixel = 1; query.attrs.scaler.x_res = 0; /* make compilers happy */ @@ -421,10 +359,10 @@ FT_PtrDist hash; - /* some argument checks are delayed to FTC_Cache_Lookup */ + /* some argument checks are delayed to `FTC_Cache_Lookup' */ if ( !aglyph || !scaler ) { - error = FTC_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Exit; } @@ -432,12 +370,11 @@ if ( anode ) *anode = NULL; - /* FT_Load_Glyph(), FT_Load_Char() take FT_UInt flags */ + /* `FT_Load_Glyph' and `FT_Load_Char' take FT_UInt flags */ if ( load_flags > FT_UINT_MAX ) - { - FT_TRACE1(( "FTC_ImageCache_LookupScaler: higher bits in load_flags" )); - FT_TRACE1(( "0x%x are dropped\n", (load_flags & ~((FT_ULong)FT_UINT_MAX)) )); - } + FT_TRACE1(( "FTC_ImageCache_LookupScaler:" + " higher bits in load_flags 0x%x are dropped\n", + load_flags & ~((FT_ULong)FT_UINT_MAX) )); query.attrs.scaler = scaler[0]; query.attrs.load_flags = (FT_UInt)load_flags; @@ -467,144 +404,13 @@ } + /* + * + * basic small bitmap cache + * + */ -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS - - /* yet another backwards-legacy structure */ - typedef struct FTC_OldImage_Desc_ - { - FTC_FontRec font; - FT_UInt image_type; - - } FTC_OldImage_Desc; - - -#define FTC_OLD_IMAGE_FORMAT( x ) ( (x) & 7 ) - - -#define ftc_old_image_format_bitmap 0x0000 -#define ftc_old_image_format_outline 0x0001 - -#define ftc_old_image_format_mask 0x000F - -#define ftc_old_image_flag_monochrome 0x0010 -#define ftc_old_image_flag_unhinted 0x0020 -#define ftc_old_image_flag_autohinted 0x0040 -#define ftc_old_image_flag_unscaled 0x0080 -#define ftc_old_image_flag_no_sbits 0x0100 - - /* monochrome bitmap */ -#define ftc_old_image_mono ftc_old_image_format_bitmap | \ - ftc_old_image_flag_monochrome - - /* anti-aliased bitmap */ -#define ftc_old_image_grays ftc_old_image_format_bitmap - - /* scaled outline */ -#define ftc_old_image_outline ftc_old_image_format_outline - - - static void - ftc_image_type_from_old_desc( FTC_ImageType typ, - FTC_OldImage_Desc* desc ) - { - typ->face_id = desc->font.face_id; - typ->width = desc->font.pix_width; - typ->height = desc->font.pix_height; - - /* convert image type flags to load flags */ - { - FT_UInt load_flags = FT_LOAD_DEFAULT; - FT_UInt type = desc->image_type; - - - /* determine load flags, depending on the font description's */ - /* image type */ - - if ( FTC_OLD_IMAGE_FORMAT( type ) == ftc_old_image_format_bitmap ) - { - if ( type & ftc_old_image_flag_monochrome ) - load_flags |= FT_LOAD_MONOCHROME; - - /* disable embedded bitmaps loading if necessary */ - if ( type & ftc_old_image_flag_no_sbits ) - load_flags |= FT_LOAD_NO_BITMAP; - } - else - { - /* we want an outline, don't load embedded bitmaps */ - load_flags |= FT_LOAD_NO_BITMAP; - - if ( type & ftc_old_image_flag_unscaled ) - load_flags |= FT_LOAD_NO_SCALE; - } - - /* always render glyphs to bitmaps */ - load_flags |= FT_LOAD_RENDER; - - if ( type & ftc_old_image_flag_unhinted ) - load_flags |= FT_LOAD_NO_HINTING; - - if ( type & ftc_old_image_flag_autohinted ) - load_flags |= FT_LOAD_FORCE_AUTOHINT; - - typ->flags = load_flags; - } - } - - - FT_EXPORT( FT_Error ) - FTC_Image_Cache_New( FTC_Manager manager, - FTC_ImageCache *acache ); - - FT_EXPORT( FT_Error ) - FTC_Image_Cache_Lookup( FTC_ImageCache icache, - FTC_OldImage_Desc* desc, - FT_UInt gindex, - FT_Glyph *aglyph ); - - - FT_EXPORT_DEF( FT_Error ) - FTC_Image_Cache_New( FTC_Manager manager, - FTC_ImageCache *acache ) - { - return FTC_ImageCache_New( manager, (FTC_ImageCache*)acache ); - } - - - - FT_EXPORT_DEF( FT_Error ) - FTC_Image_Cache_Lookup( FTC_ImageCache icache, - FTC_OldImage_Desc* desc, - FT_UInt gindex, - FT_Glyph *aglyph ) - { - FTC_ImageTypeRec type0; - - - if ( !desc ) - return FTC_Err_Invalid_Argument; - - ftc_image_type_from_old_desc( &type0, desc ); - - return FTC_ImageCache_Lookup( (FTC_ImageCache)icache, - &type0, - gindex, - aglyph, - NULL ); - } - -#endif /* FT_CONFIG_OPTION_OLD_INTERNALS */ - - - /* - * - * basic small bitmap cache - * - */ - - - FT_CALLBACK_TABLE_DEF + static const FTC_SFamilyClassRec ftc_basic_sbit_family_class = { { @@ -619,7 +425,7 @@ }; - FT_CALLBACK_TABLE_DEF + static const FTC_GCacheClassRec ftc_basic_sbit_cache_class = { { @@ -666,43 +472,21 @@ if ( anode ) *anode = NULL; - /* other argument checks delayed to FTC_Cache_Lookup */ + /* other argument checks delayed to `FTC_Cache_Lookup' */ if ( !ansbit ) - return FTC_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); *ansbit = NULL; -#if defined( FT_CONFIG_OPTION_OLD_INTERNALS ) && ( FT_INT_MAX > 0xFFFFU ) + if ( (FT_ULong)( type->flags - FT_INT_MIN ) > FT_UINT_MAX ) + FT_TRACE1(( "FTC_ImageCache_Lookup:" + " higher bits in load_flags 0x%x are dropped\n", + type->flags & ~((FT_ULong)FT_UINT_MAX) )); - /* This one is a major hack used to detect whether we are passed a - * regular FTC_ImageType handle, or a legacy FTC_OldImageDesc one. - */ - if ( (FT_ULong)type->width >= 0x10000L ) - { - FTC_OldImageDesc desc = (FTC_OldImageDesc)type; - - - query.attrs.scaler.face_id = desc->font.face_id; - query.attrs.scaler.width = desc->font.pix_width; - query.attrs.scaler.height = desc->font.pix_height; - query.attrs.load_flags = desc->flags; - } - else - -#endif /* FT_CONFIG_OPTION_OLD_INTERNALS */ - - { - if ( (FT_ULong)(type->flags - FT_INT_MIN) > FT_UINT_MAX ) - { - FT_TRACE1(( "FTC_ImageCache_Lookup: higher bits in load_flags" )); - FT_TRACE1(( "0x%x are dropped\n", (type->flags & ~((FT_ULong)FT_UINT_MAX)) )); - } - - query.attrs.scaler.face_id = type->face_id; - query.attrs.scaler.width = type->width; - query.attrs.scaler.height = type->height; - query.attrs.load_flags = (FT_UInt)type->flags; - } + query.attrs.scaler.face_id = type->face_id; + query.attrs.scaler.width = type->width; + query.attrs.scaler.height = type->height; + query.attrs.load_flags = (FT_UInt)type->flags; query.attrs.scaler.pixel = 1; query.attrs.scaler.x_res = 0; /* make compilers happy */ @@ -763,18 +547,17 @@ if ( anode ) *anode = NULL; - /* other argument checks delayed to FTC_Cache_Lookup */ + /* other argument checks delayed to `FTC_Cache_Lookup' */ if ( !ansbit || !scaler ) - return FTC_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); *ansbit = NULL; - /* FT_Load_Glyph(), FT_Load_Char() take FT_UInt flags */ + /* `FT_Load_Glyph' and `FT_Load_Char' take FT_UInt flags */ if ( load_flags > FT_UINT_MAX ) - { - FT_TRACE1(( "FTC_ImageCache_LookupScaler: higher bits in load_flags" )); - FT_TRACE1(( "0x%x are dropped\n", (load_flags & ~((FT_ULong)FT_UINT_MAX)) )); - } + FT_TRACE1(( "FTC_ImageCache_LookupScaler:" + " higher bits in load_flags 0x%x are dropped\n", + load_flags & ~((FT_ULong)FT_UINT_MAX) )); query.attrs.scaler = scaler[0]; query.attrs.load_flags = (FT_UInt)load_flags; @@ -807,49 +590,4 @@ } -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS - - FT_EXPORT( FT_Error ) - FTC_SBit_Cache_New( FTC_Manager manager, - FTC_SBitCache *acache ); - - FT_EXPORT( FT_Error ) - FTC_SBit_Cache_Lookup( FTC_SBitCache cache, - FTC_OldImage_Desc* desc, - FT_UInt gindex, - FTC_SBit *ansbit ); - - - FT_EXPORT_DEF( FT_Error ) - FTC_SBit_Cache_New( FTC_Manager manager, - FTC_SBitCache *acache ) - { - return FTC_SBitCache_New( manager, (FTC_SBitCache*)acache ); - } - - - FT_EXPORT_DEF( FT_Error ) - FTC_SBit_Cache_Lookup( FTC_SBitCache cache, - FTC_OldImage_Desc* desc, - FT_UInt gindex, - FTC_SBit *ansbit ) - { - FTC_ImageTypeRec type0; - - - if ( !desc ) - return FTC_Err_Invalid_Argument; - - ftc_image_type_from_old_desc( &type0, desc ); - - return FTC_SBitCache_Lookup( (FTC_SBitCache)cache, - &type0, - gindex, - ansbit, - NULL ); - } - -#endif /* FT_CONFIG_OPTION_OLD_INTERNALS */ - - /* END */ diff --git a/src/cache/ftccache.c b/src/cache/ftccache.c index f01c403..f20dd45 100644 --- a/src/cache/ftccache.c +++ b/src/cache/ftccache.c @@ -4,8 +4,7 @@ /* */ /* The FreeType internal cache interface (body). */ /* */ -/* Copyright 2000-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010, */ -/* 2011 by */ +/* Copyright 2000-2007, 2009-2011, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -270,11 +269,7 @@ /* remove a node from the cache manager */ -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS - FT_BASE_DEF( void ) -#else FT_LOCAL_DEF( void ) -#endif ftc_node_destroy( FTC_Node node, FTC_Manager manager ) { @@ -493,14 +488,14 @@ FTC_Node* bucket; FTC_Node* pnode; FTC_Node node; - FT_Error error = FTC_Err_Ok; + FT_Error error = FT_Err_Ok; FT_Bool list_changed = FALSE; FTC_Node_CompareFunc compare = cache->clazz.node_compare; if ( cache == NULL || anode == NULL ) - return FTC_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); /* Go to the `top' node of the list sharing same masked hash */ bucket = pnode = FTC_NODE__TOP_FOR_HASH( cache, hash ); diff --git a/src/cache/ftccache.h b/src/cache/ftccache.h index d60984f..4155f32 100644 --- a/src/cache/ftccache.h +++ b/src/cache/ftccache.h @@ -4,8 +4,7 @@ /* */ /* FreeType internal cache interface (specification). */ /* */ -/* Copyright 2000-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010, */ -/* 2011 by */ +/* Copyright 2000-2007, 2009-2011, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -87,12 +86,6 @@ FT_BEGIN_HEADER ftc_get_top_node_for_hash( ( cache ), ( hash ) ) #endif -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS - FT_BASE( void ) - ftc_node_destroy( FTC_Node node, - FTC_Manager manager ); -#endif - /*************************************************************************/ /*************************************************************************/ @@ -223,7 +216,7 @@ FT_BEGIN_HEADER FT_Bool _list_changed = FALSE; \ \ \ - error = FTC_Err_Ok; \ + error = FT_Err_Ok; \ node = NULL; \ \ /* Go to the `top' node of the list sharing same masked hash */ \ @@ -328,7 +321,7 @@ FT_BEGIN_HEADER #define FTC_CACHE_TRYLOOP_END( list_changed ) \ - if ( !error || error != FTC_Err_Out_Of_Memory ) \ + if ( !error || FT_ERR_NEQ( error, Out_Of_Memory ) ) \ break; \ \ _try_done = FTC_Manager_FlushN( _try_manager, _try_count ); \ diff --git a/src/cache/ftccback.h b/src/cache/ftccback.h index 80ec9ce..9528279 100644 --- a/src/cache/ftccback.h +++ b/src/cache/ftccback.h @@ -4,7 +4,7 @@ /* */ /* Callback functions of the caching sub-system (specification only). */ /* */ -/* Copyright 2004, 2005, 2006, 2011 by */ +/* Copyright 2004-2006, 2011, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -81,11 +81,10 @@ FT_LOCAL( void ) ftc_cache_done( FTC_Cache cache ); -#ifndef FT_CONFIG_OPTION_OLD_INTERNALS FT_LOCAL( void ) ftc_node_destroy( FTC_Node node, FTC_Manager manager ); -#endif + #endif /* __FTCCBACK_H__ */ diff --git a/src/cache/ftccmap.c b/src/cache/ftccmap.c index ad436ef..ab22366 100644 --- a/src/cache/ftccmap.c +++ b/src/cache/ftccmap.c @@ -4,8 +4,7 @@ /* */ /* FreeType CharMap cache (body) */ /* */ -/* Copyright 2000-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, */ -/* 2010, 2011 by */ +/* Copyright 2000-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -32,43 +31,6 @@ #define FT_COMPONENT trace_cache -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS - - typedef enum FTC_OldCMapType_ - { - FTC_OLD_CMAP_BY_INDEX = 0, - FTC_OLD_CMAP_BY_ENCODING = 1, - FTC_OLD_CMAP_BY_ID = 2 - - } FTC_OldCMapType; - - - typedef struct FTC_OldCMapIdRec_ - { - FT_UInt platform; - FT_UInt encoding; - - } FTC_OldCMapIdRec, *FTC_OldCMapId; - - - typedef struct FTC_OldCMapDescRec_ - { - FTC_FaceID face_id; - FTC_OldCMapType type; - - union - { - FT_UInt index; - FT_Encoding encoding; - FTC_OldCMapIdRec id; - - } u; - - } FTC_OldCMapDescRec, *FTC_OldCMapDesc; - -#endif /* FT_CONFIG_OLD_INTERNALS */ - - /*************************************************************************/ /* */ /* Each FTC_CMapNode contains a simple array to map a range of character */ @@ -121,7 +83,7 @@ /* if (indices[n] == FTC_CMAP_UNKNOWN), we assume that the corresponding */ /* glyph indices haven't been queried through FT_Get_Glyph_Index() yet */ -#define FTC_CMAP_UNKNOWN ( (FT_UInt16)-1 ) +#define FTC_CMAP_UNKNOWN (FT_UInt16)~0 /*************************************************************************/ @@ -240,7 +202,7 @@ /*************************************************************************/ - FT_CALLBACK_TABLE_DEF + static const FTC_CacheClassRec ftc_cmap_cache_class = { ftc_cmap_node_new, @@ -267,21 +229,6 @@ } -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS - - /* - * Unfortunately, it is not possible to support binary backwards - * compatibility in the cmap cache. The FTC_CMapCache_Lookup signature - * changes were too deep, and there is no clever hackish way to detect - * what kind of structure we are being passed. - * - * On the other hand it seems that no production code is using this - * function on Unix distributions. - */ - -#endif - - /* documentation is in ftcache.h */ FT_EXPORT_DEF( FT_UInt ) @@ -316,57 +263,12 @@ return 0; } -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS - - /* - * If cmap_index is greater than the maximum number of cachable - * charmaps, we assume the request is from a legacy rogue client - * using old internal header. See include/config/ftoption.h. - */ - if ( cmap_index > FT_MAX_CHARMAP_CACHEABLE && !no_cmap_change ) - { - FTC_OldCMapDesc desc = (FTC_OldCMapDesc) face_id; - - - char_code = (FT_UInt32)cmap_index; - query.face_id = desc->face_id; - - - switch ( desc->type ) - { - case FTC_OLD_CMAP_BY_INDEX: - query.cmap_index = desc->u.index; - query.char_code = (FT_UInt32)cmap_index; - break; - - case FTC_OLD_CMAP_BY_ENCODING: - { - FT_Face face; - - - error = FTC_Manager_LookupFace( cache->manager, desc->face_id, - &face ); - if ( error ) - return 0; - - FT_Select_Charmap( face, desc->u.encoding ); - - return FT_Get_Char_Index( face, char_code ); - } - - default: - return 0; - } - } - else - -#endif /* FT_CONFIG_OPTION_OLD_INTERNALS */ + if ( !face_id ) + return 0; - { - query.face_id = face_id; - query.cmap_index = (FT_UInt)cmap_index; - query.char_code = char_code; - } + query.face_id = face_id; + query.cmap_index = (FT_UInt)cmap_index; + query.char_code = char_code; hash = FTC_CMAP_HASH( face_id, cmap_index, char_code ); @@ -402,12 +304,6 @@ if ( error ) goto Exit; -#ifdef FT_MAX_CHARMAP_CACHEABLE - /* something rotten can happen with rogue clients */ - if ( cmap_index > FT_MAX_CHARMAP_CACHEABLE ) - return 0; /* XXX: should return appropriate error */ -#endif - if ( (FT_UInt)cmap_index < (FT_UInt)face->num_charmaps ) { FT_CharMap old, cmap = NULL; diff --git a/src/cache/ftcmanag.c b/src/cache/ftcmanag.c index 76a510d..fff7a08 100644 --- a/src/cache/ftcmanag.c +++ b/src/cache/ftcmanag.c @@ -4,7 +4,7 @@ /* */ /* FreeType Cache Manager (body). */ /* */ -/* Copyright 2000-2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010 by */ +/* Copyright 2000-2006, 2008-2010, 2013, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -151,7 +151,7 @@ } - FT_CALLBACK_TABLE_DEF + static const FTC_MruListClassRec ftc_size_list_class = { sizeof ( FTC_SizeNodeRec ), @@ -186,13 +186,13 @@ FTC_MruNode mrunode; - if ( asize == NULL ) - return FTC_Err_Invalid_Argument; + if ( !asize || !scaler ) + return FT_THROW( Invalid_Argument ); *asize = NULL; if ( !manager ) - return FTC_Err_Invalid_Cache_Handle; + return FT_THROW( Invalid_Cache_Handle ); #ifdef FTC_INLINE @@ -290,7 +290,7 @@ } - FT_CALLBACK_TABLE_DEF + static const FTC_MruListClassRec ftc_face_list_class = { sizeof ( FTC_FaceNodeRec), @@ -313,13 +313,13 @@ FTC_MruNode mrunode; - if ( aface == NULL ) - return FTC_Err_Invalid_Argument; + if ( !aface || !face_id ) + return FT_THROW( Invalid_Argument ); *aface = NULL; if ( !manager ) - return FTC_Err_Invalid_Cache_Handle; + return FT_THROW( Invalid_Cache_Handle ); /* we break encapsulation for the sake of speed */ #ifdef FTC_INLINE @@ -364,7 +364,10 @@ if ( !library ) - return FTC_Err_Invalid_Library_Handle; + return FT_THROW( Invalid_Library_Handle ); + + if ( !amanager || !requester ) + return FT_THROW( Invalid_Argument ); memory = library->memory; @@ -451,12 +454,13 @@ FT_EXPORT_DEF( void ) FTC_Manager_Reset( FTC_Manager manager ) { - if ( manager ) - { - FTC_MruList_Reset( &manager->sizes ); - FTC_MruList_Reset( &manager->faces ); - } - /* XXX: FIXME: flush the caches? */ + if ( !manager ) + return; + + FTC_MruList_Reset( &manager->sizes ); + FTC_MruList_Reset( &manager->faces ); + + FTC_Manager_FlushN( manager, manager->num_nodes ); } @@ -473,7 +477,7 @@ /* check node weights */ if ( first ) { - FT_ULong weight = 0; + FT_Offset weight = 0; node = first; @@ -575,7 +579,7 @@ FTC_CacheClass clazz, FTC_Cache *acache ) { - FT_Error error = FTC_Err_Invalid_Argument; + FT_Error error = FT_ERR( Invalid_Argument ); FTC_Cache cache = NULL; @@ -586,7 +590,7 @@ if ( manager->num_caches >= FTC_MAX_CACHES ) { - error = FTC_Err_Too_Many_Caches; + error = FT_THROW( Too_Many_Caches ); FT_ERROR(( "FTC_Manager_RegisterCache:" " too many registered caches\n" )); goto Exit; @@ -666,6 +670,10 @@ { FT_UInt nn; + + if ( !manager || !face_id ) + return; + /* this will remove all FTC_SizeNode that correspond to * the face_id as well */ @@ -684,60 +692,11 @@ FTC_Node_Unref( FTC_Node node, FTC_Manager manager ) { - if ( node && (FT_UInt)node->cache_index < manager->num_caches ) + if ( node && + manager && + (FT_UInt)node->cache_index < manager->num_caches ) node->ref_count--; } -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS - - FT_EXPORT_DEF( FT_Error ) - FTC_Manager_Lookup_Face( FTC_Manager manager, - FTC_FaceID face_id, - FT_Face *aface ) - { - return FTC_Manager_LookupFace( manager, face_id, aface ); - } - - - FT_EXPORT( FT_Error ) - FTC_Manager_Lookup_Size( FTC_Manager manager, - FTC_Font font, - FT_Face *aface, - FT_Size *asize ) - { - FTC_ScalerRec scaler; - FT_Error error; - FT_Size size; - FT_Face face; - - - scaler.face_id = font->face_id; - scaler.width = font->pix_width; - scaler.height = font->pix_height; - scaler.pixel = TRUE; - scaler.x_res = 0; - scaler.y_res = 0; - - error = FTC_Manager_LookupSize( manager, &scaler, &size ); - if ( error ) - { - face = NULL; - size = NULL; - } - else - face = size->face; - - if ( aface ) - *aface = face; - - if ( asize ) - *asize = size; - - return error; - } - -#endif /* FT_CONFIG_OPTION_OLD_INTERNALS */ - - /* END */ diff --git a/src/cache/ftcmanag.h b/src/cache/ftcmanag.h index d6c8516..0aec33c 100644 --- a/src/cache/ftcmanag.h +++ b/src/cache/ftcmanag.h @@ -4,7 +4,7 @@ /* */ /* FreeType Cache Manager (specification). */ /* */ -/* Copyright 2000-2001, 2003, 2004, 2006, 2010 by */ +/* Copyright 2000-2001, 2003, 2004, 2006, 2010, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -94,8 +94,8 @@ FT_BEGIN_HEADER FT_Memory memory; FTC_Node nodes_list; - FT_ULong max_weight; - FT_ULong cur_weight; + FT_Offset max_weight; + FT_Offset cur_weight; FT_UInt num_nodes; FTC_Cache caches[FTC_MAX_CACHES]; diff --git a/src/cache/ftcmru.h b/src/cache/ftcmru.h index 8c3797f..6fccf11 100644 --- a/src/cache/ftcmru.h +++ b/src/cache/ftcmru.h @@ -4,7 +4,7 @@ /* */ /* Simple MRU list-cache (specification). */ /* */ -/* Copyright 2000-2001, 2003, 2004, 2005, 2006, 2010 by */ +/* Copyright 2000-2001, 2003-2006, 2010, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -166,7 +166,7 @@ FT_BEGIN_HEADER FTC_MruNode _first, _node; \ \ \ - error = FTC_Err_Ok; \ + error = FT_Err_Ok; \ _first = *(_pfirst); \ _node = NULL; \ \ diff --git a/src/cache/ftcsbits.c b/src/cache/ftcsbits.c index 8bf8d60..59727d1 100644 --- a/src/cache/ftcsbits.c +++ b/src/cache/ftcsbits.c @@ -4,7 +4,7 @@ /* */ /* FreeType sbits manager (body). */ /* */ -/* Copyright 2000-2001, 2002, 2003, 2004, 2005, 2006, 2009, 2010, 2011 by */ +/* Copyright 2000-2006, 2009-2011, 2013, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -116,7 +116,7 @@ if ( (FT_UInt)(gindex - gnode->gindex) >= snode->count ) { FT_ERROR(( "ftc_snode_load: invalid glyph index" )); - return FTC_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); } sbit = snode->sbits + ( gindex - gnode->gindex ); @@ -142,12 +142,12 @@ goto BadGlyph; } - /* Check that our values fit into 8-bit containers! */ + /* Check whether our values fit into 8-bit containers! */ /* If this is not the case, our bitmap is too large */ /* and we will leave it as `missing' with sbit.buffer = 0 */ -#define CHECK_CHAR( d ) ( temp = (FT_Char)d, temp == d ) -#define CHECK_BYTE( d ) ( temp = (FT_Byte)d, temp == d ) +#define CHECK_CHAR( d ) ( temp = (FT_Char)d, (FT_Int) temp == (FT_Int) d ) +#define CHECK_BYTE( d ) ( temp = (FT_Byte)d, (FT_UInt)temp == (FT_UInt)d ) /* horizontal advance in pixels */ xadvance = ( slot->advance.x + 32 ) >> 6; @@ -189,13 +189,13 @@ /* we mark unloaded glyphs with `sbit.buffer == 0' */ /* and `width == 255', `height == 0' */ /* */ - if ( error && error != FTC_Err_Out_Of_Memory ) + if ( error && FT_ERR_NEQ( error, Out_Of_Memory ) ) { BadGlyph: sbit->width = 255; sbit->height = 0; sbit->buffer = NULL; - error = FTC_Err_Ok; + error = FT_Err_Ok; if ( asize ) *asize = 0; } @@ -223,7 +223,7 @@ total = clazz->family_get_count( family, cache->manager ); if ( total == 0 || gindex >= total ) { - error = FTC_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Exit; } diff --git a/src/cff/cf2arrst.c b/src/cff/cf2arrst.c new file mode 100644 index 0000000..c8d6f13 --- /dev/null +++ b/src/cff/cf2arrst.c @@ -0,0 +1,241 @@ +/***************************************************************************/ +/* */ +/* cf2arrst.c */ +/* */ +/* Adobe's code for Array Stacks (body). */ +/* */ +/* Copyright 2007-2013 Adobe Systems Incorporated. */ +/* */ +/* This software, and all works of authorship, whether in source or */ +/* object code form as indicated by the copyright notice(s) included */ +/* herein (collectively, the "Work") is made available, and may only be */ +/* used, modified, and distributed under the FreeType Project License, */ +/* LICENSE.TXT. Additionally, subject to the terms and conditions of the */ +/* FreeType Project License, each contributor to the Work hereby grants */ +/* to any individual or legal entity exercising permissions granted by */ +/* the FreeType Project License and this section (hereafter, "You" or */ +/* "Your") a perpetual, worldwide, non-exclusive, no-charge, */ +/* royalty-free, irrevocable (except as stated in this section) patent */ +/* license to make, have made, use, offer to sell, sell, import, and */ +/* otherwise transfer the Work, where such license applies only to those */ +/* patent claims licensable by such contributor that are necessarily */ +/* infringed by their contribution(s) alone or by combination of their */ +/* contribution(s) with the Work to which such contribution(s) was */ +/* submitted. If You institute patent litigation against any entity */ +/* (including a cross-claim or counterclaim in a lawsuit) alleging that */ +/* the Work or a contribution incorporated within the Work constitutes */ +/* direct or contributory patent infringement, then any patent licenses */ +/* granted to You under this License for that Work shall terminate as of */ +/* the date such litigation is filed. */ +/* */ +/* By using, modifying, or distributing the Work you indicate that you */ +/* have read and understood the terms and conditions of the */ +/* FreeType Project License as well as those provided in this section, */ +/* and you accept them fully. */ +/* */ +/***************************************************************************/ + + +#include "cf2ft.h" +#include FT_INTERNAL_DEBUG_H + +#include "cf2glue.h" +#include "cf2arrst.h" + +#include "cf2error.h" + + + /* + * CF2_ArrStack uses an error pointer, to enable shared errors. + * Shared errors are necessary when multiple objects allow the program + * to continue after detecting errors. Only the first error should be + * recorded. + */ + + FT_LOCAL_DEF( void ) + cf2_arrstack_init( CF2_ArrStack arrstack, + FT_Memory memory, + FT_Error* error, + size_t sizeItem ) + { + FT_ASSERT( arrstack != NULL ); + + /* initialize the structure */ + arrstack->memory = memory; + arrstack->error = error; + arrstack->sizeItem = sizeItem; + arrstack->allocated = 0; + arrstack->chunk = 10; /* chunks of 10 items */ + arrstack->count = 0; + arrstack->totalSize = 0; + arrstack->ptr = NULL; + } + + + FT_LOCAL_DEF( void ) + cf2_arrstack_finalize( CF2_ArrStack arrstack ) + { + FT_Memory memory = arrstack->memory; /* for FT_FREE */ + + + FT_ASSERT( arrstack != NULL ); + + arrstack->allocated = 0; + arrstack->count = 0; + arrstack->totalSize = 0; + + /* free the data buffer */ + FT_FREE( arrstack->ptr ); + } + + + /* allocate or reallocate the buffer size; */ + /* return false on memory error */ + static FT_Bool + cf2_arrstack_setNumElements( CF2_ArrStack arrstack, + size_t numElements ) + { + FT_ASSERT( arrstack != NULL ); + + { + FT_Error error = FT_Err_Ok; /* for FT_REALLOC */ + FT_Memory memory = arrstack->memory; /* for FT_REALLOC */ + + FT_Long newSize = (FT_Long)( numElements * arrstack->sizeItem ); + + + if ( numElements > LONG_MAX / arrstack->sizeItem ) + goto exit; + + + FT_ASSERT( newSize > 0 ); /* avoid realloc with zero size */ + + if ( !FT_REALLOC( arrstack->ptr, arrstack->totalSize, newSize ) ) + { + arrstack->allocated = numElements; + arrstack->totalSize = newSize; + + if ( arrstack->count > numElements ) + { + /* we truncated the list! */ + CF2_SET_ERROR( arrstack->error, Stack_Overflow ); + arrstack->count = numElements; + return FALSE; + } + + return TRUE; /* success */ + } + } + + exit: + /* if there's not already an error, store this one */ + CF2_SET_ERROR( arrstack->error, Out_Of_Memory ); + + return FALSE; + } + + + /* set the count, ensuring allocation is sufficient */ + FT_LOCAL_DEF( void ) + cf2_arrstack_setCount( CF2_ArrStack arrstack, + size_t numElements ) + { + FT_ASSERT( arrstack != NULL ); + + if ( numElements > arrstack->allocated ) + { + /* expand the allocation first */ + if ( !cf2_arrstack_setNumElements( arrstack, numElements ) ) + return; + } + + arrstack->count = numElements; + } + + + /* clear the count */ + FT_LOCAL_DEF( void ) + cf2_arrstack_clear( CF2_ArrStack arrstack ) + { + FT_ASSERT( arrstack != NULL ); + + arrstack->count = 0; + } + + + /* current number of items */ + FT_LOCAL_DEF( size_t ) + cf2_arrstack_size( const CF2_ArrStack arrstack ) + { + FT_ASSERT( arrstack != NULL ); + + return arrstack->count; + } + + + FT_LOCAL_DEF( void* ) + cf2_arrstack_getBuffer( const CF2_ArrStack arrstack ) + { + FT_ASSERT( arrstack != NULL ); + + return arrstack->ptr; + } + + + /* return pointer to the given element */ + FT_LOCAL_DEF( void* ) + cf2_arrstack_getPointer( const CF2_ArrStack arrstack, + size_t idx ) + { + void* newPtr; + + + FT_ASSERT( arrstack != NULL ); + + if ( idx >= arrstack->count ) + { + /* overflow */ + CF2_SET_ERROR( arrstack->error, Stack_Overflow ); + idx = 0; /* choose safe default */ + } + + newPtr = (FT_Byte*)arrstack->ptr + idx * arrstack->sizeItem; + + return newPtr; + } + + + /* push (append) an element at the end of the list; */ + /* return false on memory error */ + /* TODO: should there be a length param for extra checking? */ + FT_LOCAL_DEF( void ) + cf2_arrstack_push( CF2_ArrStack arrstack, + const void* ptr ) + { + FT_ASSERT( arrstack != NULL ); + + if ( arrstack->count == arrstack->allocated ) + { + /* grow the buffer by one chunk */ + if ( !cf2_arrstack_setNumElements( + arrstack, arrstack->allocated + arrstack->chunk ) ) + { + /* on error, ignore the push */ + return; + } + } + + FT_ASSERT( ptr != NULL ); + + { + size_t offset = arrstack->count * arrstack->sizeItem; + void* newPtr = (FT_Byte*)arrstack->ptr + offset; + + + FT_MEM_COPY( newPtr, ptr, arrstack->sizeItem ); + arrstack->count += 1; + } + } + + +/* END */ diff --git a/src/cff/cf2arrst.h b/src/cff/cf2arrst.h new file mode 100644 index 0000000..ff5ad8b --- /dev/null +++ b/src/cff/cf2arrst.h @@ -0,0 +1,100 @@ +/***************************************************************************/ +/* */ +/* cf2arrst.h */ +/* */ +/* Adobe's code for Array Stacks (specification). */ +/* */ +/* Copyright 2007-2013 Adobe Systems Incorporated. */ +/* */ +/* This software, and all works of authorship, whether in source or */ +/* object code form as indicated by the copyright notice(s) included */ +/* herein (collectively, the "Work") is made available, and may only be */ +/* used, modified, and distributed under the FreeType Project License, */ +/* LICENSE.TXT. Additionally, subject to the terms and conditions of the */ +/* FreeType Project License, each contributor to the Work hereby grants */ +/* to any individual or legal entity exercising permissions granted by */ +/* the FreeType Project License and this section (hereafter, "You" or */ +/* "Your") a perpetual, worldwide, non-exclusive, no-charge, */ +/* royalty-free, irrevocable (except as stated in this section) patent */ +/* license to make, have made, use, offer to sell, sell, import, and */ +/* otherwise transfer the Work, where such license applies only to those */ +/* patent claims licensable by such contributor that are necessarily */ +/* infringed by their contribution(s) alone or by combination of their */ +/* contribution(s) with the Work to which such contribution(s) was */ +/* submitted. If You institute patent litigation against any entity */ +/* (including a cross-claim or counterclaim in a lawsuit) alleging that */ +/* the Work or a contribution incorporated within the Work constitutes */ +/* direct or contributory patent infringement, then any patent licenses */ +/* granted to You under this License for that Work shall terminate as of */ +/* the date such litigation is filed. */ +/* */ +/* By using, modifying, or distributing the Work you indicate that you */ +/* have read and understood the terms and conditions of the */ +/* FreeType Project License as well as those provided in this section, */ +/* and you accept them fully. */ +/* */ +/***************************************************************************/ + + +#ifndef __CF2ARRST_H__ +#define __CF2ARRST_H__ + + +#include "cf2error.h" + + +FT_BEGIN_HEADER + + + /* need to define the struct here (not opaque) so it can be allocated by */ + /* clients */ + typedef struct CF2_ArrStackRec_ + { + FT_Memory memory; + FT_Error* error; + + size_t sizeItem; /* bytes per element */ + size_t allocated; /* items allocated */ + size_t chunk; /* allocation increment in items */ + size_t count; /* number of elements allocated */ + size_t totalSize; /* total bytes allocated */ + + void* ptr; /* ptr to data */ + + } CF2_ArrStackRec, *CF2_ArrStack; + + + FT_LOCAL( void ) + cf2_arrstack_init( CF2_ArrStack arrstack, + FT_Memory memory, + FT_Error* error, + size_t sizeItem ); + FT_LOCAL( void ) + cf2_arrstack_finalize( CF2_ArrStack arrstack ); + + FT_LOCAL( void ) + cf2_arrstack_setCount( CF2_ArrStack arrstack, + size_t numElements ); + FT_LOCAL( void ) + cf2_arrstack_clear( CF2_ArrStack arrstack ); + FT_LOCAL( size_t ) + cf2_arrstack_size( const CF2_ArrStack arrstack ); + + FT_LOCAL( void* ) + cf2_arrstack_getBuffer( const CF2_ArrStack arrstack ); + FT_LOCAL( void* ) + cf2_arrstack_getPointer( const CF2_ArrStack arrstack, + size_t idx ); + + FT_LOCAL( void ) + cf2_arrstack_push( CF2_ArrStack arrstack, + const void* ptr ); + + +FT_END_HEADER + + +#endif /* __CF2ARRST_H__ */ + + +/* END */ diff --git a/src/cff/cf2blues.c b/src/cff/cf2blues.c new file mode 100644 index 0000000..250f89e --- /dev/null +++ b/src/cff/cf2blues.c @@ -0,0 +1,579 @@ +/***************************************************************************/ +/* */ +/* cf2blues.c */ +/* */ +/* Adobe's code for handling Blue Zones (body). */ +/* */ +/* Copyright 2009-2014 Adobe Systems Incorporated. */ +/* */ +/* This software, and all works of authorship, whether in source or */ +/* object code form as indicated by the copyright notice(s) included */ +/* herein (collectively, the "Work") is made available, and may only be */ +/* used, modified, and distributed under the FreeType Project License, */ +/* LICENSE.TXT. Additionally, subject to the terms and conditions of the */ +/* FreeType Project License, each contributor to the Work hereby grants */ +/* to any individual or legal entity exercising permissions granted by */ +/* the FreeType Project License and this section (hereafter, "You" or */ +/* "Your") a perpetual, worldwide, non-exclusive, no-charge, */ +/* royalty-free, irrevocable (except as stated in this section) patent */ +/* license to make, have made, use, offer to sell, sell, import, and */ +/* otherwise transfer the Work, where such license applies only to those */ +/* patent claims licensable by such contributor that are necessarily */ +/* infringed by their contribution(s) alone or by combination of their */ +/* contribution(s) with the Work to which such contribution(s) was */ +/* submitted. If You institute patent litigation against any entity */ +/* (including a cross-claim or counterclaim in a lawsuit) alleging that */ +/* the Work or a contribution incorporated within the Work constitutes */ +/* direct or contributory patent infringement, then any patent licenses */ +/* granted to You under this License for that Work shall terminate as of */ +/* the date such litigation is filed. */ +/* */ +/* By using, modifying, or distributing the Work you indicate that you */ +/* have read and understood the terms and conditions of the */ +/* FreeType Project License as well as those provided in this section, */ +/* and you accept them fully. */ +/* */ +/***************************************************************************/ + + +#include "cf2ft.h" +#include FT_INTERNAL_DEBUG_H + +#include "cf2blues.h" +#include "cf2hints.h" +#include "cf2font.h" + + + /*************************************************************************/ + /* */ + /* The macro FT_COMPONENT is used in trace mode. It is an implicit */ + /* parameter of the FT_TRACE() and FT_ERROR() macros, used to print/log */ + /* messages during execution. */ + /* */ +#undef FT_COMPONENT +#define FT_COMPONENT trace_cf2blues + + + /* + * For blue values, the FreeType parser produces an array of integers, + * while the Adobe CFF engine produces an array of fixed. + * Define a macro to convert FreeType to fixed. + */ +#define cf2_blueToFixed( x ) cf2_intToFixed( x ) + + + FT_LOCAL_DEF( void ) + cf2_blues_init( CF2_Blues blues, + CF2_Font font ) + { + /* pointer to parsed font object */ + CFF_Decoder* decoder = font->decoder; + + CF2_Fixed zoneHeight; + CF2_Fixed maxZoneHeight = 0; + CF2_Fixed csUnitsPerPixel; + + size_t numBlueValues; + size_t numOtherBlues; + size_t numFamilyBlues; + size_t numFamilyOtherBlues; + + FT_Pos* blueValues; + FT_Pos* otherBlues; + FT_Pos* familyBlues; + FT_Pos* familyOtherBlues; + + size_t i; + CF2_Fixed emBoxBottom, emBoxTop; + +#if 0 + CF2_Int unitsPerEm = font->unitsPerEm; + + + if ( unitsPerEm == 0 ) + unitsPerEm = 1000; +#endif + + FT_ZERO( blues ); + blues->scale = font->innerTransform.d; + + cf2_getBlueMetrics( decoder, + &blues->blueScale, + &blues->blueShift, + &blues->blueFuzz ); + + cf2_getBlueValues( decoder, &numBlueValues, &blueValues ); + cf2_getOtherBlues( decoder, &numOtherBlues, &otherBlues ); + cf2_getFamilyBlues( decoder, &numFamilyBlues, &familyBlues ); + cf2_getFamilyOtherBlues( decoder, &numFamilyOtherBlues, &familyOtherBlues ); + + /* + * synthetic em box hint heuristic + * + * Apply this when ideographic dictionary (LanguageGroup 1) has no + * real alignment zones. Adobe tools generate dummy zones at -250 and + * 1100 for a 1000 unit em. Fonts with ICF-based alignment zones + * should not enable the heuristic. When the heuristic is enabled, + * the font's blue zones are ignored. + * + */ + + /* get em box from OS/2 typoAscender/Descender */ + /* TODO: FreeType does not parse these metrics. Skip them for now. */ +#if 0 + FCM_getHorizontalLineMetrics( &e, + font->font, + &ascender, + &descender, + &linegap ); + if ( ascender - descender == unitsPerEm ) + { + emBoxBottom = cf2_intToFixed( descender ); + emBoxTop = cf2_intToFixed( ascender ); + } + else +#endif + { + emBoxBottom = CF2_ICF_Bottom; + emBoxTop = CF2_ICF_Top; + } + + if ( cf2_getLanguageGroup( decoder ) == 1 && + ( numBlueValues == 0 || + ( numBlueValues == 4 && + cf2_blueToFixed( blueValues[0] ) < emBoxBottom && + cf2_blueToFixed( blueValues[1] ) < emBoxBottom && + cf2_blueToFixed( blueValues[2] ) > emBoxTop && + cf2_blueToFixed( blueValues[3] ) > emBoxTop ) ) ) + { + /* + * Construct hint edges suitable for synthetic ghost hints at top + * and bottom of em box. +-CF2_MIN_COUNTER allows for unhinted + * features above or below the last hinted edge. This also gives a + * net 1 pixel boost to the height of ideographic glyphs. + * + * Note: Adjust synthetic hints outward by epsilon (0x.0001) to + * avoid interference. E.g., some fonts have real hints at + * 880 and -120. + */ + + blues->emBoxBottomEdge.csCoord = emBoxBottom - CF2_FIXED_EPSILON; + blues->emBoxBottomEdge.dsCoord = cf2_fixedRound( + FT_MulFix( + blues->emBoxBottomEdge.csCoord, + blues->scale ) ) - + CF2_MIN_COUNTER; + blues->emBoxBottomEdge.scale = blues->scale; + blues->emBoxBottomEdge.flags = CF2_GhostBottom | + CF2_Locked | + CF2_Synthetic; + + blues->emBoxTopEdge.csCoord = emBoxTop + CF2_FIXED_EPSILON + + 2 * font->darkenY; + blues->emBoxTopEdge.dsCoord = cf2_fixedRound( + FT_MulFix( + blues->emBoxTopEdge.csCoord, + blues->scale ) ) + + CF2_MIN_COUNTER; + blues->emBoxTopEdge.scale = blues->scale; + blues->emBoxTopEdge.flags = CF2_GhostTop | + CF2_Locked | + CF2_Synthetic; + + blues->doEmBoxHints = TRUE; /* enable the heuristic */ + + return; + } + + /* copy `BlueValues' and `OtherBlues' to a combined array of top and */ + /* bottom zones */ + for ( i = 0; i < numBlueValues; i += 2 ) + { + blues->zone[blues->count].csBottomEdge = + cf2_blueToFixed( blueValues[i] ); + blues->zone[blues->count].csTopEdge = + cf2_blueToFixed( blueValues[i + 1] ); + + zoneHeight = blues->zone[blues->count].csTopEdge - + blues->zone[blues->count].csBottomEdge; + + if ( zoneHeight < 0 ) + { + FT_TRACE4(( "cf2_blues_init: ignoring negative zone height\n" )); + continue; /* reject this zone */ + } + + if ( zoneHeight > maxZoneHeight ) + { + /* take maximum before darkening adjustment */ + /* so overshoot suppression point doesn't change */ + maxZoneHeight = zoneHeight; + } + + /* adjust both edges of top zone upward by twice darkening amount */ + if ( i != 0 ) + { + blues->zone[blues->count].csTopEdge += 2 * font->darkenY; + blues->zone[blues->count].csBottomEdge += 2 * font->darkenY; + } + + /* first `BlueValue' is bottom zone; others are top */ + if ( i == 0 ) + { + blues->zone[blues->count].bottomZone = + TRUE; + blues->zone[blues->count].csFlatEdge = + blues->zone[blues->count].csTopEdge; + } + else + { + blues->zone[blues->count].bottomZone = + FALSE; + blues->zone[blues->count].csFlatEdge = + blues->zone[blues->count].csBottomEdge; + } + + blues->count += 1; + } + + for ( i = 0; i < numOtherBlues; i += 2 ) + { + blues->zone[blues->count].csBottomEdge = + cf2_blueToFixed( otherBlues[i] ); + blues->zone[blues->count].csTopEdge = + cf2_blueToFixed( otherBlues[i + 1] ); + + zoneHeight = blues->zone[blues->count].csTopEdge - + blues->zone[blues->count].csBottomEdge; + + if ( zoneHeight < 0 ) + { + FT_TRACE4(( "cf2_blues_init: ignoring negative zone height\n" )); + continue; /* reject this zone */ + } + + if ( zoneHeight > maxZoneHeight ) + { + /* take maximum before darkening adjustment */ + /* so overshoot suppression point doesn't change */ + maxZoneHeight = zoneHeight; + } + + /* Note: bottom zones are not adjusted for darkening amount */ + + /* all OtherBlues are bottom zone */ + blues->zone[blues->count].bottomZone = + TRUE; + blues->zone[blues->count].csFlatEdge = + blues->zone[blues->count].csTopEdge; + + blues->count += 1; + } + + /* Adjust for FamilyBlues */ + + /* Search for the nearest flat edge in `FamilyBlues' or */ + /* `FamilyOtherBlues'. According to the Black Book, any matching edge */ + /* must be within one device pixel */ + + csUnitsPerPixel = FT_DivFix( cf2_intToFixed( 1 ), blues->scale ); + + /* loop on all zones in this font */ + for ( i = 0; i < blues->count; i++ ) + { + size_t j; + CF2_Fixed minDiff; + CF2_Fixed flatFamilyEdge, diff; + /* value for this font */ + CF2_Fixed flatEdge = blues->zone[i].csFlatEdge; + + + if ( blues->zone[i].bottomZone ) + { + /* In a bottom zone, the top edge is the flat edge. */ + /* Search `FamilyOtherBlues' for bottom zones; look for closest */ + /* Family edge that is within the one pixel threshold. */ + + minDiff = CF2_FIXED_MAX; + + for ( j = 0; j < numFamilyOtherBlues; j += 2 ) + { + /* top edge */ + flatFamilyEdge = cf2_blueToFixed( familyOtherBlues[j + 1] ); + + diff = cf2_fixedAbs( flatEdge - flatFamilyEdge ); + + if ( diff < minDiff && diff < csUnitsPerPixel ) + { + blues->zone[i].csFlatEdge = flatFamilyEdge; + minDiff = diff; + + if ( diff == 0 ) + break; + } + } + + /* check the first member of FamilyBlues, which is a bottom zone */ + if ( numFamilyBlues >= 2 ) + { + /* top edge */ + flatFamilyEdge = cf2_blueToFixed( familyBlues[1] ); + + diff = cf2_fixedAbs( flatEdge - flatFamilyEdge ); + + if ( diff < minDiff && diff < csUnitsPerPixel ) + blues->zone[i].csFlatEdge = flatFamilyEdge; + } + } + else + { + /* In a top zone, the bottom edge is the flat edge. */ + /* Search `FamilyBlues' for top zones; skip first zone, which is a */ + /* bottom zone; look for closest Family edge that is within the */ + /* one pixel threshold */ + + minDiff = CF2_FIXED_MAX; + + for ( j = 2; j < numFamilyBlues; j += 2 ) + { + /* bottom edge */ + flatFamilyEdge = cf2_blueToFixed( familyBlues[j] ); + + /* adjust edges of top zone upward by twice darkening amount */ + flatFamilyEdge += 2 * font->darkenY; /* bottom edge */ + + diff = cf2_fixedAbs( flatEdge - flatFamilyEdge ); + + if ( diff < minDiff && diff < csUnitsPerPixel ) + { + blues->zone[i].csFlatEdge = flatFamilyEdge; + minDiff = diff; + + if ( diff == 0 ) + break; + } + } + } + } + + /* TODO: enforce separation of zones, including BlueFuzz */ + + /* Adjust BlueScale; similar to AdjustBlueScale() in coretype */ + /* `bcsetup.c'. */ + + if ( maxZoneHeight > 0 ) + { + if ( blues->blueScale > FT_DivFix( cf2_intToFixed( 1 ), + maxZoneHeight ) ) + { + /* clamp at maximum scale */ + blues->blueScale = FT_DivFix( cf2_intToFixed( 1 ), + maxZoneHeight ); + } + + /* + * TODO: Revisit the bug fix for 613448. The minimum scale + * requirement catches a number of library fonts. For + * example, with default BlueScale (.039625) and 0.4 minimum, + * the test below catches any font with maxZoneHeight < 10.1. + * There are library fonts ranging from 2 to 10 that get + * caught, including e.g., Eurostile LT Std Medium with + * maxZoneHeight of 6. + * + */ +#if 0 + if ( blueScale < .4 / maxZoneHeight ) + { + tetraphilia_assert( 0 ); + /* clamp at minimum scale, per bug 0613448 fix */ + blueScale = .4 / maxZoneHeight; + } +#endif + + } + + /* + * Suppress overshoot and boost blue zones at small sizes. Boost + * amount varies linearly from 0.5 pixel near 0 to 0 pixel at + * blueScale cutoff. + * Note: This boost amount is different from the coretype heuristic. + * + */ + + if ( blues->scale < blues->blueScale ) + { + blues->suppressOvershoot = TRUE; + + /* Change rounding threshold for `dsFlatEdge'. */ + /* Note: constant changed from 0.5 to 0.6 to avoid a problem with */ + /* 10ppem Arial */ + + blues->boost = cf2_floatToFixed( .6 ) - + FT_MulDiv( cf2_floatToFixed ( .6 ), + blues->scale, + blues->blueScale ); + if ( blues->boost > 0x7FFF ) + { + /* boost must remain less than 0.5, or baseline could go negative */ + blues->boost = 0x7FFF; + } + } + + /* boost and darkening have similar effects; don't do both */ + if ( font->stemDarkened ) + blues->boost = 0; + + /* set device space alignment for each zone; */ + /* apply boost amount before rounding flat edge */ + + for ( i = 0; i < blues->count; i++ ) + { + if ( blues->zone[i].bottomZone ) + blues->zone[i].dsFlatEdge = cf2_fixedRound( + FT_MulFix( + blues->zone[i].csFlatEdge, + blues->scale ) - + blues->boost ); + else + blues->zone[i].dsFlatEdge = cf2_fixedRound( + FT_MulFix( + blues->zone[i].csFlatEdge, + blues->scale ) + + blues->boost ); + } + } + + + /* + * Check whether `stemHint' is captured by one of the blue zones. + * + * Zero, one or both edges may be valid; only valid edges can be + * captured. For compatibility with CoolType, search top and bottom + * zones in the same pass (see `BlueLock'). If a hint is captured, + * return true and position the edge(s) in one of 3 ways: + * + * 1) If `BlueScale' suppresses overshoot, position the captured edge + * at the flat edge of the zone. + * 2) If overshoot is not suppressed and `BlueShift' requires + * overshoot, position the captured edge a minimum of 1 device pixel + * from the flat edge. + * 3) If overshoot is not suppressed or required, position the captured + * edge at the nearest device pixel. + * + */ + FT_LOCAL_DEF( FT_Bool ) + cf2_blues_capture( const CF2_Blues blues, + CF2_Hint bottomHintEdge, + CF2_Hint topHintEdge ) + { + /* TODO: validate? */ + CF2_Fixed csFuzz = blues->blueFuzz; + + /* new position of captured edge */ + CF2_Fixed dsNew; + + /* amount that hint is moved when positioned */ + CF2_Fixed dsMove = 0; + + FT_Bool captured = FALSE; + CF2_UInt i; + + + /* assert edge flags are consistent */ + FT_ASSERT( !cf2_hint_isTop( bottomHintEdge ) && + !cf2_hint_isBottom( topHintEdge ) ); + + /* TODO: search once without blue fuzz for compatibility with coretype? */ + for ( i = 0; i < blues->count; i++ ) + { + if ( blues->zone[i].bottomZone && + cf2_hint_isBottom( bottomHintEdge ) ) + { + if ( ( blues->zone[i].csBottomEdge - csFuzz ) <= + bottomHintEdge->csCoord && + bottomHintEdge->csCoord <= + ( blues->zone[i].csTopEdge + csFuzz ) ) + { + /* bottom edge captured by bottom zone */ + + if ( blues->suppressOvershoot ) + dsNew = blues->zone[i].dsFlatEdge; + + else if ( ( blues->zone[i].csTopEdge - bottomHintEdge->csCoord ) >= + blues->blueShift ) + { + /* guarantee minimum of 1 pixel overshoot */ + dsNew = FT_MIN( + cf2_fixedRound( bottomHintEdge->dsCoord ), + blues->zone[i].dsFlatEdge - cf2_intToFixed( 1 ) ); + } + + else + { + /* simply round captured edge */ + dsNew = cf2_fixedRound( bottomHintEdge->dsCoord ); + } + + dsMove = dsNew - bottomHintEdge->dsCoord; + captured = TRUE; + + break; + } + } + + if ( !blues->zone[i].bottomZone && cf2_hint_isTop( topHintEdge ) ) + { + if ( ( blues->zone[i].csBottomEdge - csFuzz ) <= + topHintEdge->csCoord && + topHintEdge->csCoord <= + ( blues->zone[i].csTopEdge + csFuzz ) ) + { + /* top edge captured by top zone */ + + if ( blues->suppressOvershoot ) + dsNew = blues->zone[i].dsFlatEdge; + + else if ( ( topHintEdge->csCoord - blues->zone[i].csBottomEdge ) >= + blues->blueShift ) + { + /* guarantee minimum of 1 pixel overshoot */ + dsNew = FT_MAX( + cf2_fixedRound( topHintEdge->dsCoord ), + blues->zone[i].dsFlatEdge + cf2_intToFixed( 1 ) ); + } + + else + { + /* simply round captured edge */ + dsNew = cf2_fixedRound( topHintEdge->dsCoord ); + } + + dsMove = dsNew - topHintEdge->dsCoord; + captured = TRUE; + + break; + } + } + } + + if ( captured ) + { + /* move both edges and flag them `locked' */ + if ( cf2_hint_isValid( bottomHintEdge ) ) + { + bottomHintEdge->dsCoord += dsMove; + cf2_hint_lock( bottomHintEdge ); + } + + if ( cf2_hint_isValid( topHintEdge ) ) + { + topHintEdge->dsCoord += dsMove; + cf2_hint_lock( topHintEdge ); + } + } + + return captured; + } + + +/* END */ diff --git a/src/cff/cf2blues.h b/src/cff/cf2blues.h new file mode 100644 index 0000000..2f38fca --- /dev/null +++ b/src/cff/cf2blues.h @@ -0,0 +1,185 @@ +/***************************************************************************/ +/* */ +/* cf2blues.h */ +/* */ +/* Adobe's code for handling Blue Zones (specification). */ +/* */ +/* Copyright 2009-2013 Adobe Systems Incorporated. */ +/* */ +/* This software, and all works of authorship, whether in source or */ +/* object code form as indicated by the copyright notice(s) included */ +/* herein (collectively, the "Work") is made available, and may only be */ +/* used, modified, and distributed under the FreeType Project License, */ +/* LICENSE.TXT. Additionally, subject to the terms and conditions of the */ +/* FreeType Project License, each contributor to the Work hereby grants */ +/* to any individual or legal entity exercising permissions granted by */ +/* the FreeType Project License and this section (hereafter, "You" or */ +/* "Your") a perpetual, worldwide, non-exclusive, no-charge, */ +/* royalty-free, irrevocable (except as stated in this section) patent */ +/* license to make, have made, use, offer to sell, sell, import, and */ +/* otherwise transfer the Work, where such license applies only to those */ +/* patent claims licensable by such contributor that are necessarily */ +/* infringed by their contribution(s) alone or by combination of their */ +/* contribution(s) with the Work to which such contribution(s) was */ +/* submitted. If You institute patent litigation against any entity */ +/* (including a cross-claim or counterclaim in a lawsuit) alleging that */ +/* the Work or a contribution incorporated within the Work constitutes */ +/* direct or contributory patent infringement, then any patent licenses */ +/* granted to You under this License for that Work shall terminate as of */ +/* the date such litigation is filed. */ +/* */ +/* By using, modifying, or distributing the Work you indicate that you */ +/* have read and understood the terms and conditions of the */ +/* FreeType Project License as well as those provided in this section, */ +/* and you accept them fully. */ +/* */ +/***************************************************************************/ + + + /* + * A `CF2_Blues' object stores the blue zones (horizontal alignment + * zones) of a font. These are specified in the CFF private dictionary + * by `BlueValues', `OtherBlues', `FamilyBlues', and `FamilyOtherBlues'. + * Each zone is defined by a top and bottom edge in character space. + * Further, each zone is either a top zone or a bottom zone, as recorded + * by `bottomZone'. + * + * The maximum number of `BlueValues' and `FamilyBlues' is 7 each. + * However, these are combined to produce a total of 7 zones. + * Similarly, the maximum number of `OtherBlues' and `FamilyOtherBlues' + * is 5 and these are combined to produce an additional 5 zones. + * + * Blue zones are used to `capture' hints and force them to a common + * alignment point. This alignment is recorded in device space in + * `dsFlatEdge'. Except for this value, a `CF2_Blues' object could be + * constructed independently of scaling. Construction may occur once + * the matrix is known. Other features implemented in the Capture + * method are overshoot suppression, overshoot enforcement, and Blue + * Boost. + * + * Capture is determined by `BlueValues' and `OtherBlues', but the + * alignment point may be adjusted to the scaled flat edge of + * `FamilyBlues' or `FamilyOtherBlues'. No alignment is done to the + * curved edge of a zone. + * + */ + + +#ifndef __CF2BLUES_H__ +#define __CF2BLUES_H__ + + +#include "cf2glue.h" + + +FT_BEGIN_HEADER + + + /* + * `CF2_Hint' is shared by `cf2hints.h' and + * `cf2blues.h', but `cf2blues.h' depends on + * `cf2hints.h', so define it here. Note: The typedef is in + * `cf2glue.h'. + * + */ + enum + { + CF2_GhostBottom = 0x1, /* a single bottom edge */ + CF2_GhostTop = 0x2, /* a single top edge */ + CF2_PairBottom = 0x4, /* the bottom edge of a stem hint */ + CF2_PairTop = 0x8, /* the top edge of a stem hint */ + CF2_Locked = 0x10, /* this edge has been aligned */ + /* by a blue zone */ + CF2_Synthetic = 0x20 /* this edge was synthesized */ + }; + + + /* + * Default value for OS/2 typoAscender/Descender when their difference + * is not equal to `unitsPerEm'. The default is based on -250 and 1100 + * in `CF2_Blues', assuming 1000 units per em here. + * + */ + enum + { + CF2_ICF_Top = cf2_intToFixed( 880 ), + CF2_ICF_Bottom = cf2_intToFixed( -120 ) + }; + + + /* + * Constant used for hint adjustment and for synthetic em box hint + * placement. + */ +#define CF2_MIN_COUNTER cf2_floatToFixed( 0.5 ) + + + /* shared typedef is in cf2glue.h */ + struct CF2_HintRec_ + { + CF2_UInt flags; /* attributes of the edge */ + size_t index; /* index in original stem hint array */ + /* (if not synthetic) */ + CF2_Fixed csCoord; + CF2_Fixed dsCoord; + CF2_Fixed scale; + }; + + + typedef struct CF2_BlueRec_ + { + CF2_Fixed csBottomEdge; + CF2_Fixed csTopEdge; + CF2_Fixed csFlatEdge; /* may be from either local or Family zones */ + CF2_Fixed dsFlatEdge; /* top edge of bottom zone or bottom edge */ + /* of top zone (rounded) */ + FT_Bool bottomZone; + + } CF2_BlueRec; + + + /* max total blue zones is 12 */ + enum + { + CF2_MAX_BLUES = 7, + CF2_MAX_OTHERBLUES = 5 + }; + + + typedef struct CF2_BluesRec_ + { + CF2_Fixed scale; + CF2_UInt count; + FT_Bool suppressOvershoot; + FT_Bool doEmBoxHints; + + CF2_Fixed blueScale; + CF2_Fixed blueShift; + CF2_Fixed blueFuzz; + + CF2_Fixed boost; + + CF2_HintRec emBoxTopEdge; + CF2_HintRec emBoxBottomEdge; + + CF2_BlueRec zone[CF2_MAX_BLUES + CF2_MAX_OTHERBLUES]; + + } CF2_BluesRec, *CF2_Blues; + + + FT_LOCAL( void ) + cf2_blues_init( CF2_Blues blues, + CF2_Font font ); + FT_LOCAL( FT_Bool ) + cf2_blues_capture( const CF2_Blues blues, + CF2_Hint bottomHintEdge, + CF2_Hint topHintEdge ); + + +FT_END_HEADER + + +#endif /* __CF2BLUES_H__ */ + + +/* END */ diff --git a/src/cff/cf2error.c b/src/cff/cf2error.c new file mode 100644 index 0000000..b5595a3 --- /dev/null +++ b/src/cff/cf2error.c @@ -0,0 +1,52 @@ +/***************************************************************************/ +/* */ +/* cf2error.c */ +/* */ +/* Adobe's code for error handling (body). */ +/* */ +/* Copyright 2006-2013 Adobe Systems Incorporated. */ +/* */ +/* This software, and all works of authorship, whether in source or */ +/* object code form as indicated by the copyright notice(s) included */ +/* herein (collectively, the "Work") is made available, and may only be */ +/* used, modified, and distributed under the FreeType Project License, */ +/* LICENSE.TXT. Additionally, subject to the terms and conditions of the */ +/* FreeType Project License, each contributor to the Work hereby grants */ +/* to any individual or legal entity exercising permissions granted by */ +/* the FreeType Project License and this section (hereafter, "You" or */ +/* "Your") a perpetual, worldwide, non-exclusive, no-charge, */ +/* royalty-free, irrevocable (except as stated in this section) patent */ +/* license to make, have made, use, offer to sell, sell, import, and */ +/* otherwise transfer the Work, where such license applies only to those */ +/* patent claims licensable by such contributor that are necessarily */ +/* infringed by their contribution(s) alone or by combination of their */ +/* contribution(s) with the Work to which such contribution(s) was */ +/* submitted. If You institute patent litigation against any entity */ +/* (including a cross-claim or counterclaim in a lawsuit) alleging that */ +/* the Work or a contribution incorporated within the Work constitutes */ +/* direct or contributory patent infringement, then any patent licenses */ +/* granted to You under this License for that Work shall terminate as of */ +/* the date such litigation is filed. */ +/* */ +/* By using, modifying, or distributing the Work you indicate that you */ +/* have read and understood the terms and conditions of the */ +/* FreeType Project License as well as those provided in this section, */ +/* and you accept them fully. */ +/* */ +/***************************************************************************/ + + +#include "cf2ft.h" +#include "cf2error.h" + + + FT_LOCAL_DEF( void ) + cf2_setError( FT_Error* error, + FT_Error value ) + { + if ( error && *error == 0 ) + *error = value; + } + + +/* END */ diff --git a/src/cff/cf2error.h b/src/cff/cf2error.h new file mode 100644 index 0000000..6453ebc --- /dev/null +++ b/src/cff/cf2error.h @@ -0,0 +1,119 @@ +/***************************************************************************/ +/* */ +/* cf2error.h */ +/* */ +/* Adobe's code for error handling (specification). */ +/* */ +/* Copyright 2006-2013 Adobe Systems Incorporated. */ +/* */ +/* This software, and all works of authorship, whether in source or */ +/* object code form as indicated by the copyright notice(s) included */ +/* herein (collectively, the "Work") is made available, and may only be */ +/* used, modified, and distributed under the FreeType Project License, */ +/* LICENSE.TXT. Additionally, subject to the terms and conditions of the */ +/* FreeType Project License, each contributor to the Work hereby grants */ +/* to any individual or legal entity exercising permissions granted by */ +/* the FreeType Project License and this section (hereafter, "You" or */ +/* "Your") a perpetual, worldwide, non-exclusive, no-charge, */ +/* royalty-free, irrevocable (except as stated in this section) patent */ +/* license to make, have made, use, offer to sell, sell, import, and */ +/* otherwise transfer the Work, where such license applies only to those */ +/* patent claims licensable by such contributor that are necessarily */ +/* infringed by their contribution(s) alone or by combination of their */ +/* contribution(s) with the Work to which such contribution(s) was */ +/* submitted. If You institute patent litigation against any entity */ +/* (including a cross-claim or counterclaim in a lawsuit) alleging that */ +/* the Work or a contribution incorporated within the Work constitutes */ +/* direct or contributory patent infringement, then any patent licenses */ +/* granted to You under this License for that Work shall terminate as of */ +/* the date such litigation is filed. */ +/* */ +/* By using, modifying, or distributing the Work you indicate that you */ +/* have read and understood the terms and conditions of the */ +/* FreeType Project License as well as those provided in this section, */ +/* and you accept them fully. */ +/* */ +/***************************************************************************/ + + +#ifndef __CF2ERROR_H__ +#define __CF2ERROR_H__ + + +#include FT_MODULE_ERRORS_H + +#undef __FTERRORS_H__ + +#undef FT_ERR_PREFIX +#define FT_ERR_PREFIX CF2_Err_ +#define FT_ERR_BASE FT_Mod_Err_CF2 + + +#include FT_ERRORS_H +#include "cf2ft.h" + + +FT_BEGIN_HEADER + + + /* + * A poor-man error facility. + * + * This code being written in vanilla C, doesn't have the luxury of a + * language-supported exception mechanism such as the one available in + * Java. Instead, we are stuck with using error codes that must be + * carefully managed and preserved. However, it is convenient for us to + * model our error mechanism on a Java-like exception mechanism. + * When we assign an error code we are thus `throwing' an error. + * + * The perservation of an error code is done by coding convention. + * Upon a function call if the error code is anything other than + * `FT_Err_Ok', which is guaranteed to be zero, we + * will return without altering that error. This will allow the + * error to propogate and be handled at the appropriate location in + * the code. + * + * This allows a style of code where the error code is initialized + * up front and a block of calls are made with the error code only + * being checked after the block. If a new error occurs, the original + * error will be preserved and a functional no-op should result in any + * subsequent function that has an initial error code not equal to + * `FT_Err_Ok'. + * + * Errors are encoded by calling the `FT_THROW' macro. For example, + * + * { + * FT_Error e; + * + * + * ... + * e = FT_THROW( Out_Of_Memory ); + * } + * + */ + + + /* Set error code to a particular value. */ + FT_LOCAL( void ) + cf2_setError( FT_Error* error, + FT_Error value ); + + + /* + * A macro that conditionally sets an error code. + * + * This macro will first check whether `error' is set; + * if not, it will set it to `e'. + * + */ +#define CF2_SET_ERROR( error, e ) \ + cf2_setError( error, FT_THROW( e ) ) + + +FT_END_HEADER + + +#endif /* __CF2ERROR_H__ */ + + +/* END */ diff --git a/src/cff/cf2fixed.h b/src/cff/cf2fixed.h new file mode 100644 index 0000000..ed1452a --- /dev/null +++ b/src/cff/cf2fixed.h @@ -0,0 +1,95 @@ +/***************************************************************************/ +/* */ +/* cf2fixed.h */ +/* */ +/* Adobe's code for Fixed Point Mathematics (specification only). */ +/* */ +/* Copyright 2007-2013 Adobe Systems Incorporated. */ +/* */ +/* This software, and all works of authorship, whether in source or */ +/* object code form as indicated by the copyright notice(s) included */ +/* herein (collectively, the "Work") is made available, and may only be */ +/* used, modified, and distributed under the FreeType Project License, */ +/* LICENSE.TXT. Additionally, subject to the terms and conditions of the */ +/* FreeType Project License, each contributor to the Work hereby grants */ +/* to any individual or legal entity exercising permissions granted by */ +/* the FreeType Project License and this section (hereafter, "You" or */ +/* "Your") a perpetual, worldwide, non-exclusive, no-charge, */ +/* royalty-free, irrevocable (except as stated in this section) patent */ +/* license to make, have made, use, offer to sell, sell, import, and */ +/* otherwise transfer the Work, where such license applies only to those */ +/* patent claims licensable by such contributor that are necessarily */ +/* infringed by their contribution(s) alone or by combination of their */ +/* contribution(s) with the Work to which such contribution(s) was */ +/* submitted. If You institute patent litigation against any entity */ +/* (including a cross-claim or counterclaim in a lawsuit) alleging that */ +/* the Work or a contribution incorporated within the Work constitutes */ +/* direct or contributory patent infringement, then any patent licenses */ +/* granted to You under this License for that Work shall terminate as of */ +/* the date such litigation is filed. */ +/* */ +/* By using, modifying, or distributing the Work you indicate that you */ +/* have read and understood the terms and conditions of the */ +/* FreeType Project License as well as those provided in this section, */ +/* and you accept them fully. */ +/* */ +/***************************************************************************/ + + +#ifndef __CF2FIXED_H__ +#define __CF2FIXED_H__ + + +FT_BEGIN_HEADER + + + /* rasterizer integer and fixed point arithmetic must be 32-bit */ + +#define CF2_Fixed CF2_F16Dot16 + typedef FT_Int32 CF2_Frac; /* 2.30 fixed point */ + + +#define CF2_FIXED_MAX ( (CF2_Fixed)0x7FFFFFFFL ) +#define CF2_FIXED_MIN ( (CF2_Fixed)0x80000000L ) +#define CF2_FIXED_ONE 0x10000L +#define CF2_FIXED_EPSILON 0x0001 + + /* in C 89, left and right shift of negative numbers is */ + /* implementation specific behaviour in the general case */ + +#define cf2_intToFixed( i ) \ + ( (CF2_Fixed)( (FT_UInt32)(i) << 16 ) ) +#define cf2_fixedToInt( x ) \ + ( (FT_Short)( ( (FT_UInt32)(x) + 0x8000U ) >> 16 ) ) +#define cf2_fixedRound( x ) \ + ( (CF2_Fixed)( ( (x) + 0x8000 ) & 0xFFFF0000L ) ) +#define cf2_floatToFixed( f ) \ + ( (CF2_Fixed)( (f) * 65536.0 + 0.5 ) ) +#define cf2_fixedAbs( x ) \ + ( (x) < 0 ? -(x) : (x) ) +#define cf2_fixedFloor( x ) \ + ( (CF2_Fixed)( (x) & 0xFFFF0000L ) ) +#define cf2_fixedFraction( x ) \ + ( (x) - cf2_fixedFloor( x ) ) +#define cf2_fracToFixed( x ) \ + ( (x) < 0 ? -( ( -(x) + 0x2000 ) >> 14 ) \ + : ( ( (x) + 0x2000 ) >> 14 ) ) + + + /* signed numeric types */ + typedef enum CF2_NumberType_ + { + CF2_NumberFixed, /* 16.16 */ + CF2_NumberFrac, /* 2.30 */ + CF2_NumberInt /* 32.0 */ + + } CF2_NumberType; + + +FT_END_HEADER + + +#endif /* __CF2FIXED_H__ */ + + +/* END */ diff --git a/src/cff/cf2font.c b/src/cff/cf2font.c new file mode 100644 index 0000000..83fd348 --- /dev/null +++ b/src/cff/cf2font.c @@ -0,0 +1,512 @@ +/***************************************************************************/ +/* */ +/* cf2font.c */ +/* */ +/* Adobe's code for font instances (body). */ +/* */ +/* Copyright 2007-2014 Adobe Systems Incorporated. */ +/* */ +/* This software, and all works of authorship, whether in source or */ +/* object code form as indicated by the copyright notice(s) included */ +/* herein (collectively, the "Work") is made available, and may only be */ +/* used, modified, and distributed under the FreeType Project License, */ +/* LICENSE.TXT. Additionally, subject to the terms and conditions of the */ +/* FreeType Project License, each contributor to the Work hereby grants */ +/* to any individual or legal entity exercising permissions granted by */ +/* the FreeType Project License and this section (hereafter, "You" or */ +/* "Your") a perpetual, worldwide, non-exclusive, no-charge, */ +/* royalty-free, irrevocable (except as stated in this section) patent */ +/* license to make, have made, use, offer to sell, sell, import, and */ +/* otherwise transfer the Work, where such license applies only to those */ +/* patent claims licensable by such contributor that are necessarily */ +/* infringed by their contribution(s) alone or by combination of their */ +/* contribution(s) with the Work to which such contribution(s) was */ +/* submitted. If You institute patent litigation against any entity */ +/* (including a cross-claim or counterclaim in a lawsuit) alleging that */ +/* the Work or a contribution incorporated within the Work constitutes */ +/* direct or contributory patent infringement, then any patent licenses */ +/* granted to You under this License for that Work shall terminate as of */ +/* the date such litigation is filed. */ +/* */ +/* By using, modifying, or distributing the Work you indicate that you */ +/* have read and understood the terms and conditions of the */ +/* FreeType Project License as well as those provided in this section, */ +/* and you accept them fully. */ +/* */ +/***************************************************************************/ + + +#include <ft2build.h> +#include FT_INTERNAL_CALC_H + +#include "cf2ft.h" + +#include "cf2glue.h" +#include "cf2font.h" +#include "cf2error.h" +#include "cf2intrp.h" + + + /* Compute a stem darkening amount in character space. */ + static void + cf2_computeDarkening( CF2_Fixed emRatio, + CF2_Fixed ppem, + CF2_Fixed stemWidth, + CF2_Fixed* darkenAmount, + CF2_Fixed boldenAmount, + FT_Bool stemDarkened, + FT_Int* darkenParams ) + { + /* + * Total darkening amount is computed in 1000 unit character space + * using the modified 5 part curve as Adobe's Avalon rasterizer. + * The darkening amount is smaller for thicker stems. + * It becomes zero when the stem is thicker than 2.333 pixels. + * + * By default, we use + * + * darkenAmount = 0.4 pixels if scaledStem <= 0.5 pixels, + * darkenAmount = 0.275 pixels if 1 <= scaledStem <= 1.667 pixels, + * darkenAmount = 0 pixel if scaledStem >= 2.333 pixels, + * + * and piecewise linear in-between: + * + * + * darkening + * ^ + * | + * | (x1,y1) + * |--------+ + * | \ + * | \ + * | \ (x3,y3) + * | +----------+ + * | (x2,y2) \ + * | \ + * | \ + * | +----------------- + * | (x4,y4) + * +---------------------------------------------> stem + * thickness + * + * + * This corresponds to the following values for the + * `darkening-parameters' property: + * + * (x1, y1) = (500, 400) + * (x2, y2) = (1000, 275) + * (x3, y3) = (1667, 275) + * (x4, y4) = (2333, 0) + * + */ + + /* Internal calculations are done in units per thousand for */ + /* convenience. The x axis is scaled stem width in */ + /* thousandths of a pixel. That is, 1000 is 1 pixel. */ + /* The y axis is darkening amount in thousandths of a pixel.*/ + /* In the code, below, dividing by ppem and */ + /* adjusting for emRatio converts darkenAmount to character */ + /* space (font units). */ + CF2_Fixed stemWidthPer1000, scaledStem; + FT_Int logBase2; + + + *darkenAmount = 0; + + if ( boldenAmount == 0 && !stemDarkened ) + return; + + /* protect against range problems and divide by zero */ + if ( emRatio < cf2_floatToFixed( .01 ) ) + return; + + if ( stemDarkened ) + { + FT_Int x1 = darkenParams[0]; + FT_Int y1 = darkenParams[1]; + FT_Int x2 = darkenParams[2]; + FT_Int y2 = darkenParams[3]; + FT_Int x3 = darkenParams[4]; + FT_Int y3 = darkenParams[5]; + FT_Int x4 = darkenParams[6]; + FT_Int y4 = darkenParams[7]; + + + /* convert from true character space to 1000 unit character space; */ + /* add synthetic emboldening effect */ + + /* `stemWidthPer1000' will not overflow for a legitimate font */ + + stemWidthPer1000 = FT_MulFix( stemWidth + boldenAmount, emRatio ); + + /* `scaledStem' can easily overflow, so we must clamp its maximum */ + /* value; the test doesn't need to be precise, but must be */ + /* conservative. The clamp value (default 2333) where */ + /* `darkenAmount' is zero is well below the overflow value of */ + /* 32767. */ + /* */ + /* FT_MSB computes the integer part of the base 2 logarithm. The */ + /* number of bits for the product is 1 or 2 more than the sum of */ + /* logarithms; remembering that the 16 lowest bits of the fraction */ + /* are dropped this is correct to within a factor of almost 4. */ + /* For example, 0x80.0000 * 0x80.0000 = 0x4000.0000 is 23+23 and */ + /* is flagged as possible overflow because 0xFF.FFFF * 0xFF.FFFF = */ + /* 0xFFFF.FE00 is also 23+23. */ + + logBase2 = FT_MSB( (FT_UInt32)stemWidthPer1000 ) + + FT_MSB( (FT_UInt32)ppem ); + + if ( logBase2 >= 46 ) + /* possible overflow */ + scaledStem = cf2_intToFixed( x4 ); + else + scaledStem = FT_MulFix( stemWidthPer1000, ppem ); + + /* now apply the darkening parameters */ + + if ( scaledStem < cf2_intToFixed( x1 ) ) + *darkenAmount = FT_DivFix( cf2_intToFixed( y1 ), ppem ); + + else if ( scaledStem < cf2_intToFixed( x2 ) ) + { + FT_Int xdelta = x2 - x1; + FT_Int ydelta = y2 - y1; + FT_Int x = stemWidthPer1000 - + FT_DivFix( cf2_intToFixed( x1 ), ppem ); + + + if ( !xdelta ) + goto Try_x3; + + *darkenAmount = FT_MulDiv( x, ydelta, xdelta ) + + FT_DivFix( cf2_intToFixed( y1 ), ppem ); + } + + else if ( scaledStem < cf2_intToFixed( x3 ) ) + { + Try_x3: + { + FT_Int xdelta = x3 - x2; + FT_Int ydelta = y3 - y2; + FT_Int x = stemWidthPer1000 - + FT_DivFix( cf2_intToFixed( x2 ), ppem ); + + + if ( !xdelta ) + goto Try_x4; + + *darkenAmount = FT_MulDiv( x, ydelta, xdelta ) + + FT_DivFix( cf2_intToFixed( y2 ), ppem ); + } + } + + else if ( scaledStem < cf2_intToFixed( x4 ) ) + { + Try_x4: + { + FT_Int xdelta = x4 - x3; + FT_Int ydelta = y4 - y3; + FT_Int x = stemWidthPer1000 - + FT_DivFix( cf2_intToFixed( x3 ), ppem ); + + + if ( !xdelta ) + goto Use_y4; + + *darkenAmount = FT_MulDiv( x, ydelta, xdelta ) + + FT_DivFix( cf2_intToFixed( y3 ), ppem ); + } + } + + else + { + Use_y4: + *darkenAmount = FT_DivFix( cf2_intToFixed( y4 ), ppem ); + } + + /* use half the amount on each side and convert back to true */ + /* character space */ + *darkenAmount = FT_DivFix( *darkenAmount, 2 * emRatio ); + } + + /* add synthetic emboldening effect in character space */ + *darkenAmount += boldenAmount / 2; + } + + + /* set up values for the current FontDict and matrix */ + + /* caller's transform is adjusted for subpixel positioning */ + static void + cf2_font_setup( CF2_Font font, + const CF2_Matrix* transform ) + { + /* pointer to parsed font object */ + CFF_Decoder* decoder = font->decoder; + + FT_Bool needExtraSetup = FALSE; + + /* character space units */ + CF2_Fixed boldenX = font->syntheticEmboldeningAmountX; + CF2_Fixed boldenY = font->syntheticEmboldeningAmountY; + + CFF_SubFont subFont; + CF2_Fixed ppem; + + + /* clear previous error */ + font->error = FT_Err_Ok; + + /* if a CID fontDict has changed, we need to recompute some cached */ + /* data */ + subFont = cf2_getSubfont( decoder ); + if ( font->lastSubfont != subFont ) + { + font->lastSubfont = subFont; + needExtraSetup = TRUE; + } + + /* if ppem has changed, we need to recompute some cached data */ + /* note: because of CID font matrix concatenation, ppem and transform */ + /* do not necessarily track. */ + ppem = cf2_getPpemY( decoder ); + if ( font->ppem != ppem ) + { + font->ppem = ppem; + needExtraSetup = TRUE; + } + + /* copy hinted flag on each call */ + font->hinted = (FT_Bool)( font->renderingFlags & CF2_FlagsHinted ); + + /* determine if transform has changed; */ + /* include Fontmatrix but ignore translation */ + if ( ft_memcmp( transform, + &font->currentTransform, + 4 * sizeof ( CF2_Fixed ) ) != 0 ) + { + /* save `key' information for `cache of one' matrix data; */ + /* save client transform, without the translation */ + font->currentTransform = *transform; + font->currentTransform.tx = + font->currentTransform.ty = cf2_intToFixed( 0 ); + + /* TODO: FreeType transform is simple scalar; for now, use identity */ + /* for outer */ + font->innerTransform = *transform; + font->outerTransform.a = + font->outerTransform.d = cf2_intToFixed( 1 ); + font->outerTransform.b = + font->outerTransform.c = cf2_intToFixed( 0 ); + + needExtraSetup = TRUE; + } + + /* + * font->darkened is set to true if there is a stem darkening request or + * the font is synthetic emboldened. + * font->darkened controls whether to adjust blue zones, winding order, + * and hinting. + * + */ + if ( font->stemDarkened != ( font->renderingFlags & CF2_FlagsDarkened ) ) + { + font->stemDarkened = + (FT_Bool)( font->renderingFlags & CF2_FlagsDarkened ); + + /* blue zones depend on darkened flag */ + needExtraSetup = TRUE; + } + + /* recompute variables that are dependent on transform or FontDict or */ + /* darken flag */ + if ( needExtraSetup ) + { + /* StdVW is found in the private dictionary; */ + /* recompute darkening amounts whenever private dictionary or */ + /* transform change */ + /* Note: a rendering flag turns darkening on or off, so we want to */ + /* store the `on' amounts; */ + /* darkening amount is computed in character space */ + /* TODO: testing size-dependent darkening here; */ + /* what to do for rotations? */ + + CF2_Fixed emRatio; + CF2_Fixed stdHW; + CF2_Int unitsPerEm = font->unitsPerEm; + + + if ( unitsPerEm == 0 ) + unitsPerEm = 1000; + + ppem = FT_MAX( cf2_intToFixed( 4 ), + font->ppem ); /* use minimum ppem of 4 */ + +#if 0 + /* since vstem is measured in the x-direction, we use the `a' member */ + /* of the fontMatrix */ + emRatio = cf2_fixedFracMul( cf2_intToFixed( 1000 ), fontMatrix->a ); +#endif + + /* Freetype does not preserve the fontMatrix when parsing; use */ + /* unitsPerEm instead. */ + /* TODO: check precision of this */ + emRatio = cf2_intToFixed( 1000 ) / unitsPerEm; + font->stdVW = cf2_getStdVW( decoder ); + + if ( font->stdVW <= 0 ) + font->stdVW = FT_DivFix( cf2_intToFixed( 75 ), emRatio ); + + if ( boldenX > 0 ) + { + /* Ensure that boldenX is at least 1 pixel for synthetic bold font */ + /* (similar to what Avalon does) */ + boldenX = FT_MAX( boldenX, + FT_DivFix( cf2_intToFixed( unitsPerEm ), ppem ) ); + + /* Synthetic emboldening adds at least 1 pixel to darkenX, while */ + /* stem darkening adds at most half pixel. Since the purpose of */ + /* stem darkening (readability at small sizes) is met with */ + /* synthetic emboldening, no need to add stem darkening for a */ + /* synthetic bold font. */ + cf2_computeDarkening( emRatio, + ppem, + font->stdVW, + &font->darkenX, + boldenX, + FALSE, + font->darkenParams ); + } + else + cf2_computeDarkening( emRatio, + ppem, + font->stdVW, + &font->darkenX, + 0, + font->stemDarkened, + font->darkenParams ); + +#if 0 + /* since hstem is measured in the y-direction, we use the `d' member */ + /* of the fontMatrix */ + /* TODO: use the same units per em as above; check this */ + emRatio = cf2_fixedFracMul( cf2_intToFixed( 1000 ), fontMatrix->d ); +#endif + + /* set the default stem width, because it must be the same for all */ + /* family members; */ + /* choose a constant for StdHW that depends on font contrast */ + stdHW = cf2_getStdHW( decoder ); + + if ( stdHW > 0 && font->stdVW > 2 * stdHW ) + font->stdHW = FT_DivFix( cf2_intToFixed( 75 ), emRatio ); + else + { + /* low contrast font gets less hstem darkening */ + font->stdHW = FT_DivFix( cf2_intToFixed( 110 ), emRatio ); + } + + cf2_computeDarkening( emRatio, + ppem, + font->stdHW, + &font->darkenY, + boldenY, + font->stemDarkened, + font->darkenParams ); + + if ( font->darkenX != 0 || font->darkenY != 0 ) + font->darkened = TRUE; + else + font->darkened = FALSE; + + font->reverseWinding = FALSE; /* initial expectation is CCW */ + + /* compute blue zones for this instance */ + cf2_blues_init( &font->blues, font ); + } + } + + + /* equivalent to AdobeGetOutline */ + FT_LOCAL_DEF( FT_Error ) + cf2_getGlyphOutline( CF2_Font font, + CF2_Buffer charstring, + const CF2_Matrix* transform, + CF2_F16Dot16* glyphWidth ) + { + FT_Error lastError = FT_Err_Ok; + + FT_Vector translation; + +#if 0 + FT_Vector advancePoint; +#endif + + CF2_Fixed advWidth = 0; + FT_Bool needWinding; + + + /* Note: use both integer and fraction for outlines. This allows bbox */ + /* to come out directly. */ + + translation.x = transform->tx; + translation.y = transform->ty; + + /* set up values based on transform */ + cf2_font_setup( font, transform ); + if ( font->error ) + goto exit; /* setup encountered an error */ + + /* reset darken direction */ + font->reverseWinding = FALSE; + + /* winding order only affects darkening */ + needWinding = font->darkened; + + while ( 1 ) + { + /* reset output buffer */ + cf2_outline_reset( &font->outline ); + + /* build the outline, passing the full translation */ + cf2_interpT2CharString( font, + charstring, + (CF2_OutlineCallbacks)&font->outline, + &translation, + FALSE, + 0, + 0, + &advWidth ); + + if ( font->error ) + goto exit; + + if ( !needWinding ) + break; + + /* check winding order */ + if ( font->outline.root.windingMomentum >= 0 ) /* CFF is CCW */ + break; + + /* invert darkening and render again */ + /* TODO: this should be a parameter to getOutline-computeOffset */ + font->reverseWinding = TRUE; + + needWinding = FALSE; /* exit after next iteration */ + } + + /* finish storing client outline */ + cf2_outline_close( &font->outline ); + + exit: + /* FreeType just wants the advance width; there is no translation */ + *glyphWidth = advWidth; + + /* free resources and collect errors from objects we've used */ + cf2_setError( &font->error, lastError ); + + return font->error; + } + + +/* END */ diff --git a/src/cff/cf2font.h b/src/cff/cf2font.h new file mode 100644 index 0000000..d8860ce --- /dev/null +++ b/src/cff/cf2font.h @@ -0,0 +1,116 @@ +/***************************************************************************/ +/* */ +/* cf2font.h */ +/* */ +/* Adobe's code for font instances (specification). */ +/* */ +/* Copyright 2007-2013 Adobe Systems Incorporated. */ +/* */ +/* This software, and all works of authorship, whether in source or */ +/* object code form as indicated by the copyright notice(s) included */ +/* herein (collectively, the "Work") is made available, and may only be */ +/* used, modified, and distributed under the FreeType Project License, */ +/* LICENSE.TXT. Additionally, subject to the terms and conditions of the */ +/* FreeType Project License, each contributor to the Work hereby grants */ +/* to any individual or legal entity exercising permissions granted by */ +/* the FreeType Project License and this section (hereafter, "You" or */ +/* "Your") a perpetual, worldwide, non-exclusive, no-charge, */ +/* royalty-free, irrevocable (except as stated in this section) patent */ +/* license to make, have made, use, offer to sell, sell, import, and */ +/* otherwise transfer the Work, where such license applies only to those */ +/* patent claims licensable by such contributor that are necessarily */ +/* infringed by their contribution(s) alone or by combination of their */ +/* contribution(s) with the Work to which such contribution(s) was */ +/* submitted. If You institute patent litigation against any entity */ +/* (including a cross-claim or counterclaim in a lawsuit) alleging that */ +/* the Work or a contribution incorporated within the Work constitutes */ +/* direct or contributory patent infringement, then any patent licenses */ +/* granted to You under this License for that Work shall terminate as of */ +/* the date such litigation is filed. */ +/* */ +/* By using, modifying, or distributing the Work you indicate that you */ +/* have read and understood the terms and conditions of the */ +/* FreeType Project License as well as those provided in this section, */ +/* and you accept them fully. */ +/* */ +/***************************************************************************/ + + +#ifndef __CF2FONT_H__ +#define __CF2FONT_H__ + + +#include "cf2ft.h" +#include "cf2blues.h" + + +FT_BEGIN_HEADER + + +#define CF2_OPERAND_STACK_SIZE 48 +#define CF2_MAX_SUBR 10 /* maximum subroutine nesting */ + + + /* typedef is in `cf2glue.h' */ + struct CF2_FontRec_ + { + FT_Memory memory; + FT_Error error; /* shared error for this instance */ + + CF2_RenderingFlags renderingFlags; + + /* variables that depend on Transform: */ + /* the following have zero translation; */ + /* inner * outer = font * original */ + + CF2_Matrix currentTransform; /* original client matrix */ + CF2_Matrix innerTransform; /* for hinting; erect, scaled */ + CF2_Matrix outerTransform; /* post hinting; includes rotations */ + CF2_Fixed ppem; /* transform-dependent */ + + CF2_Int unitsPerEm; + + CF2_Fixed syntheticEmboldeningAmountX; /* character space units */ + CF2_Fixed syntheticEmboldeningAmountY; /* character space units */ + + /* FreeType related members */ + CF2_OutlineRec outline; /* freetype glyph outline functions */ + CFF_Decoder* decoder; + CFF_SubFont lastSubfont; /* FreeType parsed data; */ + /* top font or subfont */ + + /* these flags can vary from one call to the next */ + FT_Bool hinted; + FT_Bool darkened; /* true if stemDarkened or synthetic bold */ + /* i.e. darkenX != 0 || darkenY != 0 */ + FT_Bool stemDarkened; + + FT_Int darkenParams[8]; /* 1000 unit character space */ + + /* variables that depend on both FontDict and Transform */ + CF2_Fixed stdVW; /* in character space; depends on dict entry */ + CF2_Fixed stdHW; /* in character space; depends on dict entry */ + CF2_Fixed darkenX; /* character space units */ + CF2_Fixed darkenY; /* depends on transform */ + /* and private dict (StdVW) */ + FT_Bool reverseWinding; /* darken assuming */ + /* counterclockwise winding */ + + CF2_BluesRec blues; /* computed zone data */ + }; + + + FT_LOCAL( FT_Error ) + cf2_getGlyphOutline( CF2_Font font, + CF2_Buffer charstring, + const CF2_Matrix* transform, + CF2_F16Dot16* glyphWidth ); + + +FT_END_HEADER + + +#endif /* __CF2FONT_H__ */ + + +/* END */ diff --git a/src/cff/cf2ft.c b/src/cff/cf2ft.c new file mode 100644 index 0000000..ebba469 --- /dev/null +++ b/src/cff/cf2ft.c @@ -0,0 +1,691 @@ +/***************************************************************************/ +/* */ +/* cf2ft.c */ +/* */ +/* FreeType Glue Component to Adobe's Interpreter (body). */ +/* */ +/* Copyright 2013-2014 Adobe Systems Incorporated. */ +/* */ +/* This software, and all works of authorship, whether in source or */ +/* object code form as indicated by the copyright notice(s) included */ +/* herein (collectively, the "Work") is made available, and may only be */ +/* used, modified, and distributed under the FreeType Project License, */ +/* LICENSE.TXT. Additionally, subject to the terms and conditions of the */ +/* FreeType Project License, each contributor to the Work hereby grants */ +/* to any individual or legal entity exercising permissions granted by */ +/* the FreeType Project License and this section (hereafter, "You" or */ +/* "Your") a perpetual, worldwide, non-exclusive, no-charge, */ +/* royalty-free, irrevocable (except as stated in this section) patent */ +/* license to make, have made, use, offer to sell, sell, import, and */ +/* otherwise transfer the Work, where such license applies only to those */ +/* patent claims licensable by such contributor that are necessarily */ +/* infringed by their contribution(s) alone or by combination of their */ +/* contribution(s) with the Work to which such contribution(s) was */ +/* submitted. If You institute patent litigation against any entity */ +/* (including a cross-claim or counterclaim in a lawsuit) alleging that */ +/* the Work or a contribution incorporated within the Work constitutes */ +/* direct or contributory patent infringement, then any patent licenses */ +/* granted to You under this License for that Work shall terminate as of */ +/* the date such litigation is filed. */ +/* */ +/* By using, modifying, or distributing the Work you indicate that you */ +/* have read and understood the terms and conditions of the */ +/* FreeType Project License as well as those provided in this section, */ +/* and you accept them fully. */ +/* */ +/***************************************************************************/ + + +#include "cf2ft.h" +#include FT_INTERNAL_DEBUG_H + +#include "cf2font.h" +#include "cf2error.h" + + +#define CF2_MAX_SIZE cf2_intToFixed( 2000 ) /* max ppem */ + + + /* + * This check should avoid most internal overflow cases. Clients should + * generally respond to `Glyph_Too_Big' by getting a glyph outline + * at EM size, scaling it and filling it as a graphics operation. + * + */ + static FT_Error + cf2_checkTransform( const CF2_Matrix* transform, + CF2_Int unitsPerEm ) + { + CF2_Fixed maxScale; + + + FT_ASSERT( unitsPerEm > 0 ); + + if ( transform->a <= 0 || transform->d <= 0 ) + return FT_THROW( Invalid_Size_Handle ); + + FT_ASSERT( transform->b == 0 && transform->c == 0 ); + FT_ASSERT( transform->tx == 0 && transform->ty == 0 ); + + if ( unitsPerEm > 0x7FFF ) + return FT_THROW( Glyph_Too_Big ); + + maxScale = FT_DivFix( CF2_MAX_SIZE, cf2_intToFixed( unitsPerEm ) ); + + if ( transform->a > maxScale || transform->d > maxScale ) + return FT_THROW( Glyph_Too_Big ); + + return FT_Err_Ok; + } + + + static void + cf2_setGlyphWidth( CF2_Outline outline, + CF2_Fixed width ) + { + CFF_Decoder* decoder = outline->decoder; + + + FT_ASSERT( decoder ); + + decoder->glyph_width = cf2_fixedToInt( width ); + } + + + /* Clean up font instance. */ + static void + cf2_free_instance( void* ptr ) + { + CF2_Font font = (CF2_Font)ptr; + + + if ( font ) + { + FT_Memory memory = font->memory; + + + (void)memory; + } + } + + + /********************************************/ + /* */ + /* functions for handling client outline; */ + /* FreeType uses coordinates in 26.6 format */ + /* */ + /********************************************/ + + static void + cf2_builder_moveTo( CF2_OutlineCallbacks callbacks, + const CF2_CallbackParams params ) + { + /* downcast the object pointer */ + CF2_Outline outline = (CF2_Outline)callbacks; + CFF_Builder* builder; + + (void)params; /* only used in debug mode */ + + + FT_ASSERT( outline && outline->decoder ); + FT_ASSERT( params->op == CF2_PathOpMoveTo ); + + builder = &outline->decoder->builder; + + /* note: two successive moves simply close the contour twice */ + cff_builder_close_contour( builder ); + builder->path_begun = 0; + } + + + static void + cf2_builder_lineTo( CF2_OutlineCallbacks callbacks, + const CF2_CallbackParams params ) + { + FT_Error error; + + /* downcast the object pointer */ + CF2_Outline outline = (CF2_Outline)callbacks; + CFF_Builder* builder; + + + FT_ASSERT( outline && outline->decoder ); + FT_ASSERT( params->op == CF2_PathOpLineTo ); + + builder = &outline->decoder->builder; + + if ( !builder->path_begun ) + { + /* record the move before the line; also check points and set */ + /* `path_begun' */ + error = cff_builder_start_point( builder, + params->pt0.x, + params->pt0.y ); + if ( error ) + { + if ( !*callbacks->error ) + *callbacks->error = error; + return; + } + } + + /* `cff_builder_add_point1' includes a check_points call for one point */ + error = cff_builder_add_point1( builder, + params->pt1.x, + params->pt1.y ); + if ( error ) + { + if ( !*callbacks->error ) + *callbacks->error = error; + return; + } + } + + + static void + cf2_builder_cubeTo( CF2_OutlineCallbacks callbacks, + const CF2_CallbackParams params ) + { + FT_Error error; + + /* downcast the object pointer */ + CF2_Outline outline = (CF2_Outline)callbacks; + CFF_Builder* builder; + + + FT_ASSERT( outline && outline->decoder ); + FT_ASSERT( params->op == CF2_PathOpCubeTo ); + + builder = &outline->decoder->builder; + + if ( !builder->path_begun ) + { + /* record the move before the line; also check points and set */ + /* `path_begun' */ + error = cff_builder_start_point( builder, + params->pt0.x, + params->pt0.y ); + if ( error ) + { + if ( !*callbacks->error ) + *callbacks->error = error; + return; + } + } + + /* prepare room for 3 points: 2 off-curve, 1 on-curve */ + error = cff_check_points( builder, 3 ); + if ( error ) + { + if ( !*callbacks->error ) + *callbacks->error = error; + return; + } + + cff_builder_add_point( builder, + params->pt1.x, + params->pt1.y, 0 ); + cff_builder_add_point( builder, + params->pt2.x, + params->pt2.y, 0 ); + cff_builder_add_point( builder, + params->pt3.x, + params->pt3.y, 1 ); + } + + + static void + cf2_outline_init( CF2_Outline outline, + FT_Memory memory, + FT_Error* error ) + { + FT_MEM_ZERO( outline, sizeof ( CF2_OutlineRec ) ); + + outline->root.memory = memory; + outline->root.error = error; + + outline->root.moveTo = cf2_builder_moveTo; + outline->root.lineTo = cf2_builder_lineTo; + outline->root.cubeTo = cf2_builder_cubeTo; + } + + + /* get scaling and hint flag from GlyphSlot */ + static void + cf2_getScaleAndHintFlag( CFF_Decoder* decoder, + CF2_Fixed* x_scale, + CF2_Fixed* y_scale, + FT_Bool* hinted, + FT_Bool* scaled ) + { + FT_ASSERT( decoder && decoder->builder.glyph ); + + /* note: FreeType scale includes a factor of 64 */ + *hinted = decoder->builder.glyph->hint; + *scaled = decoder->builder.glyph->scaled; + + if ( *hinted ) + { + *x_scale = ( decoder->builder.glyph->x_scale + 32 ) / 64; + *y_scale = ( decoder->builder.glyph->y_scale + 32 ) / 64; + } + else + { + /* for unhinted outlines, `cff_slot_load' does the scaling, */ + /* thus render at `unity' scale */ + + *x_scale = 0x0400; /* 1/64 as 16.16 */ + *y_scale = 0x0400; + } + } + + + /* get units per em from `FT_Face' */ + /* TODO: should handle font matrix concatenation? */ + static FT_UShort + cf2_getUnitsPerEm( CFF_Decoder* decoder ) + { + FT_ASSERT( decoder && decoder->builder.face ); + FT_ASSERT( decoder->builder.face->root.units_per_EM ); + + return decoder->builder.face->root.units_per_EM; + } + + + /* Main entry point: Render one glyph. */ + FT_LOCAL_DEF( FT_Error ) + cf2_decoder_parse_charstrings( CFF_Decoder* decoder, + FT_Byte* charstring_base, + FT_ULong charstring_len ) + { + FT_Memory memory; + FT_Error error = FT_Err_Ok; + CF2_Font font; + + + FT_ASSERT( decoder && decoder->cff ); + + memory = decoder->builder.memory; + + /* CF2 data is saved here across glyphs */ + font = (CF2_Font)decoder->cff->cf2_instance.data; + + /* on first glyph, allocate instance structure */ + if ( decoder->cff->cf2_instance.data == NULL ) + { + decoder->cff->cf2_instance.finalizer = + (FT_Generic_Finalizer)cf2_free_instance; + + if ( FT_ALLOC( decoder->cff->cf2_instance.data, + sizeof ( CF2_FontRec ) ) ) + return FT_THROW( Out_Of_Memory ); + + font = (CF2_Font)decoder->cff->cf2_instance.data; + + font->memory = memory; + + /* initialize a client outline, to be shared by each glyph rendered */ + cf2_outline_init( &font->outline, font->memory, &font->error ); + } + + /* save decoder; it is a stack variable and will be different on each */ + /* call */ + font->decoder = decoder; + font->outline.decoder = decoder; + + { + /* build parameters for Adobe engine */ + + CFF_Builder* builder = &decoder->builder; + CFF_Driver driver = (CFF_Driver)FT_FACE_DRIVER( builder->face ); + + /* local error */ + FT_Error error2 = FT_Err_Ok; + CF2_BufferRec buf; + CF2_Matrix transform; + CF2_F16Dot16 glyphWidth; + + FT_Bool hinted; + FT_Bool scaled; + + + /* FreeType has already looked up the GID; convert to */ + /* `RegionBuffer', assuming that the input has been validated */ + FT_ASSERT( charstring_base + charstring_len >= charstring_base ); + + FT_ZERO( &buf ); + buf.start = + buf.ptr = charstring_base; + buf.end = charstring_base + charstring_len; + + FT_ZERO( &transform ); + + cf2_getScaleAndHintFlag( decoder, + &transform.a, + &transform.d, + &hinted, + &scaled ); + + font->renderingFlags = 0; + if ( hinted ) + font->renderingFlags |= CF2_FlagsHinted; + if ( scaled && !driver->no_stem_darkening ) + font->renderingFlags |= CF2_FlagsDarkened; + + font->darkenParams[0] = driver->darken_params[0]; + font->darkenParams[1] = driver->darken_params[1]; + font->darkenParams[2] = driver->darken_params[2]; + font->darkenParams[3] = driver->darken_params[3]; + font->darkenParams[4] = driver->darken_params[4]; + font->darkenParams[5] = driver->darken_params[5]; + font->darkenParams[6] = driver->darken_params[6]; + font->darkenParams[7] = driver->darken_params[7]; + + /* now get an outline for this glyph; */ + /* also get units per em to validate scale */ + font->unitsPerEm = (CF2_Int)cf2_getUnitsPerEm( decoder ); + + if ( scaled ) + { + error2 = cf2_checkTransform( &transform, font->unitsPerEm ); + if ( error2 ) + return error2; + } + + error2 = cf2_getGlyphOutline( font, &buf, &transform, &glyphWidth ); + if ( error2 ) + return FT_ERR( Invalid_File_Format ); + + cf2_setGlyphWidth( &font->outline, glyphWidth ); + + return FT_Err_Ok; + } + } + + + /* get pointer to current FreeType subfont (based on current glyphID) */ + FT_LOCAL_DEF( CFF_SubFont ) + cf2_getSubfont( CFF_Decoder* decoder ) + { + FT_ASSERT( decoder && decoder->current_subfont ); + + return decoder->current_subfont; + } + + + /* get `y_ppem' from `CFF_Size' */ + FT_LOCAL_DEF( CF2_Fixed ) + cf2_getPpemY( CFF_Decoder* decoder ) + { + FT_ASSERT( decoder && + decoder->builder.face && + decoder->builder.face->root.size ); + + /* + * Note that `y_ppem' can be zero if there wasn't a call to + * `FT_Set_Char_Size' or something similar. However, this isn't a + * problem since we come to this place in the code only if + * FT_LOAD_NO_SCALE is set (the other case gets caught by + * `cf2_checkTransform'). The ppem value is needed to compute the stem + * darkening, which is disabled for getting the unscaled outline. + * + */ + return cf2_intToFixed( + decoder->builder.face->root.size->metrics.y_ppem ); + } + + + /* get standard stem widths for the current subfont; */ + /* FreeType stores these as integer font units */ + /* (note: variable names seem swapped) */ + FT_LOCAL_DEF( CF2_Fixed ) + cf2_getStdVW( CFF_Decoder* decoder ) + { + FT_ASSERT( decoder && decoder->current_subfont ); + + return cf2_intToFixed( + decoder->current_subfont->private_dict.standard_height ); + } + + + FT_LOCAL_DEF( CF2_Fixed ) + cf2_getStdHW( CFF_Decoder* decoder ) + { + FT_ASSERT( decoder && decoder->current_subfont ); + + return cf2_intToFixed( + decoder->current_subfont->private_dict.standard_width ); + } + + + /* note: FreeType stores 1000 times the actual value for `BlueScale' */ + FT_LOCAL_DEF( void ) + cf2_getBlueMetrics( CFF_Decoder* decoder, + CF2_Fixed* blueScale, + CF2_Fixed* blueShift, + CF2_Fixed* blueFuzz ) + { + FT_ASSERT( decoder && decoder->current_subfont ); + + *blueScale = FT_DivFix( + decoder->current_subfont->private_dict.blue_scale, + cf2_intToFixed( 1000 ) ); + *blueShift = cf2_intToFixed( + decoder->current_subfont->private_dict.blue_shift ); + *blueFuzz = cf2_intToFixed( + decoder->current_subfont->private_dict.blue_fuzz ); + } + + + /* get blue values counts and arrays; the FreeType parser has validated */ + /* the counts and verified that each is an even number */ + FT_LOCAL_DEF( void ) + cf2_getBlueValues( CFF_Decoder* decoder, + size_t* count, + FT_Pos* *data ) + { + FT_ASSERT( decoder && decoder->current_subfont ); + + *count = decoder->current_subfont->private_dict.num_blue_values; + *data = (FT_Pos*) + &decoder->current_subfont->private_dict.blue_values; + } + + + FT_LOCAL_DEF( void ) + cf2_getOtherBlues( CFF_Decoder* decoder, + size_t* count, + FT_Pos* *data ) + { + FT_ASSERT( decoder && decoder->current_subfont ); + + *count = decoder->current_subfont->private_dict.num_other_blues; + *data = (FT_Pos*) + &decoder->current_subfont->private_dict.other_blues; + } + + + FT_LOCAL_DEF( void ) + cf2_getFamilyBlues( CFF_Decoder* decoder, + size_t* count, + FT_Pos* *data ) + { + FT_ASSERT( decoder && decoder->current_subfont ); + + *count = decoder->current_subfont->private_dict.num_family_blues; + *data = (FT_Pos*) + &decoder->current_subfont->private_dict.family_blues; + } + + + FT_LOCAL_DEF( void ) + cf2_getFamilyOtherBlues( CFF_Decoder* decoder, + size_t* count, + FT_Pos* *data ) + { + FT_ASSERT( decoder && decoder->current_subfont ); + + *count = decoder->current_subfont->private_dict.num_family_other_blues; + *data = (FT_Pos*) + &decoder->current_subfont->private_dict.family_other_blues; + } + + + FT_LOCAL_DEF( CF2_Int ) + cf2_getLanguageGroup( CFF_Decoder* decoder ) + { + FT_ASSERT( decoder && decoder->current_subfont ); + + return decoder->current_subfont->private_dict.language_group; + } + + + /* convert unbiased subroutine index to `CF2_Buffer' and */ + /* return 0 on success */ + FT_LOCAL_DEF( CF2_Int ) + cf2_initGlobalRegionBuffer( CFF_Decoder* decoder, + CF2_UInt idx, + CF2_Buffer buf ) + { + FT_ASSERT( decoder ); + + FT_ZERO( buf ); + + idx += decoder->globals_bias; + if ( idx >= decoder->num_globals ) + return TRUE; /* error */ + + FT_ASSERT( decoder->globals ); + + buf->start = + buf->ptr = decoder->globals[idx]; + buf->end = decoder->globals[idx + 1]; + + return FALSE; /* success */ + } + + + /* convert AdobeStandardEncoding code to CF2_Buffer; */ + /* used for seac component */ + FT_LOCAL_DEF( FT_Error ) + cf2_getSeacComponent( CFF_Decoder* decoder, + CF2_UInt code, + CF2_Buffer buf ) + { + CF2_Int gid; + FT_Byte* charstring; + FT_ULong len; + FT_Error error; + + + FT_ASSERT( decoder ); + + FT_ZERO( buf ); + + gid = cff_lookup_glyph_by_stdcharcode( decoder->cff, code ); + if ( gid < 0 ) + return FT_THROW( Invalid_Glyph_Format ); + + error = cff_get_glyph_data( decoder->builder.face, + gid, + &charstring, + &len ); + /* TODO: for now, just pass the FreeType error through */ + if ( error ) + return error; + + /* assume input has been validated */ + FT_ASSERT( charstring + len >= charstring ); + + buf->start = charstring; + buf->end = charstring + len; + buf->ptr = buf->start; + + return FT_Err_Ok; + } + + + FT_LOCAL_DEF( void ) + cf2_freeSeacComponent( CFF_Decoder* decoder, + CF2_Buffer buf ) + { + FT_ASSERT( decoder ); + + cff_free_glyph_data( decoder->builder.face, + (FT_Byte**)&buf->start, + (FT_ULong)( buf->end - buf->start ) ); + } + + + FT_LOCAL_DEF( CF2_Int ) + cf2_initLocalRegionBuffer( CFF_Decoder* decoder, + CF2_UInt idx, + CF2_Buffer buf ) + { + FT_ASSERT( decoder ); + + FT_ZERO( buf ); + + idx += decoder->locals_bias; + if ( idx >= decoder->num_locals ) + return TRUE; /* error */ + + FT_ASSERT( decoder->locals ); + + buf->start = + buf->ptr = decoder->locals[idx]; + buf->end = decoder->locals[idx + 1]; + + return FALSE; /* success */ + } + + + FT_LOCAL_DEF( CF2_Fixed ) + cf2_getDefaultWidthX( CFF_Decoder* decoder ) + { + FT_ASSERT( decoder && decoder->current_subfont ); + + return cf2_intToFixed( + decoder->current_subfont->private_dict.default_width ); + } + + + FT_LOCAL_DEF( CF2_Fixed ) + cf2_getNominalWidthX( CFF_Decoder* decoder ) + { + FT_ASSERT( decoder && decoder->current_subfont ); + + return cf2_intToFixed( + decoder->current_subfont->private_dict.nominal_width ); + } + + + FT_LOCAL_DEF( void ) + cf2_outline_reset( CF2_Outline outline ) + { + CFF_Decoder* decoder = outline->decoder; + + + FT_ASSERT( decoder ); + + outline->root.windingMomentum = 0; + + FT_GlyphLoader_Rewind( decoder->builder.loader ); + } + + + FT_LOCAL_DEF( void ) + cf2_outline_close( CF2_Outline outline ) + { + CFF_Decoder* decoder = outline->decoder; + + + FT_ASSERT( decoder ); + + cff_builder_close_contour( &decoder->builder ); + + FT_GlyphLoader_Add( decoder->builder.loader ); + } + + +/* END */ diff --git a/src/cff/cf2ft.h b/src/cff/cf2ft.h new file mode 100644 index 0000000..731da3c --- /dev/null +++ b/src/cff/cf2ft.h @@ -0,0 +1,147 @@ +/***************************************************************************/ +/* */ +/* cf2ft.h */ +/* */ +/* FreeType Glue Component to Adobe's Interpreter (specification). */ +/* */ +/* Copyright 2013 Adobe Systems Incorporated. */ +/* */ +/* This software, and all works of authorship, whether in source or */ +/* object code form as indicated by the copyright notice(s) included */ +/* herein (collectively, the "Work") is made available, and may only be */ +/* used, modified, and distributed under the FreeType Project License, */ +/* LICENSE.TXT. Additionally, subject to the terms and conditions of the */ +/* FreeType Project License, each contributor to the Work hereby grants */ +/* to any individual or legal entity exercising permissions granted by */ +/* the FreeType Project License and this section (hereafter, "You" or */ +/* "Your") a perpetual, worldwide, non-exclusive, no-charge, */ +/* royalty-free, irrevocable (except as stated in this section) patent */ +/* license to make, have made, use, offer to sell, sell, import, and */ +/* otherwise transfer the Work, where such license applies only to those */ +/* patent claims licensable by such contributor that are necessarily */ +/* infringed by their contribution(s) alone or by combination of their */ +/* contribution(s) with the Work to which such contribution(s) was */ +/* submitted. If You institute patent litigation against any entity */ +/* (including a cross-claim or counterclaim in a lawsuit) alleging that */ +/* the Work or a contribution incorporated within the Work constitutes */ +/* direct or contributory patent infringement, then any patent licenses */ +/* granted to You under this License for that Work shall terminate as of */ +/* the date such litigation is filed. */ +/* */ +/* By using, modifying, or distributing the Work you indicate that you */ +/* have read and understood the terms and conditions of the */ +/* FreeType Project License as well as those provided in this section, */ +/* and you accept them fully. */ +/* */ +/***************************************************************************/ + + +#ifndef __CF2FT_H__ +#define __CF2FT_H__ + + +#include "cf2types.h" + + + /* TODO: disable asserts for now */ +#define CF2_NDEBUG + + +#include FT_SYSTEM_H + +#include "cf2glue.h" +#include "cffgload.h" /* for CFF_Decoder */ + + +FT_BEGIN_HEADER + + + FT_LOCAL( FT_Error ) + cf2_decoder_parse_charstrings( CFF_Decoder* decoder, + FT_Byte* charstring_base, + FT_ULong charstring_len ); + + FT_LOCAL( CFF_SubFont ) + cf2_getSubfont( CFF_Decoder* decoder ); + + + FT_LOCAL( CF2_Fixed ) + cf2_getPpemY( CFF_Decoder* decoder ); + FT_LOCAL( CF2_Fixed ) + cf2_getStdVW( CFF_Decoder* decoder ); + FT_LOCAL( CF2_Fixed ) + cf2_getStdHW( CFF_Decoder* decoder ); + + FT_LOCAL( void ) + cf2_getBlueMetrics( CFF_Decoder* decoder, + CF2_Fixed* blueScale, + CF2_Fixed* blueShift, + CF2_Fixed* blueFuzz ); + FT_LOCAL( void ) + cf2_getBlueValues( CFF_Decoder* decoder, + size_t* count, + FT_Pos* *data ); + FT_LOCAL( void ) + cf2_getOtherBlues( CFF_Decoder* decoder, + size_t* count, + FT_Pos* *data ); + FT_LOCAL( void ) + cf2_getFamilyBlues( CFF_Decoder* decoder, + size_t* count, + FT_Pos* *data ); + FT_LOCAL( void ) + cf2_getFamilyOtherBlues( CFF_Decoder* decoder, + size_t* count, + FT_Pos* *data ); + + FT_LOCAL( CF2_Int ) + cf2_getLanguageGroup( CFF_Decoder* decoder ); + + FT_LOCAL( CF2_Int ) + cf2_initGlobalRegionBuffer( CFF_Decoder* decoder, + CF2_UInt idx, + CF2_Buffer buf ); + FT_LOCAL( FT_Error ) + cf2_getSeacComponent( CFF_Decoder* decoder, + CF2_UInt code, + CF2_Buffer buf ); + FT_LOCAL( void ) + cf2_freeSeacComponent( CFF_Decoder* decoder, + CF2_Buffer buf ); + FT_LOCAL( CF2_Int ) + cf2_initLocalRegionBuffer( CFF_Decoder* decoder, + CF2_UInt idx, + CF2_Buffer buf ); + + FT_LOCAL( CF2_Fixed ) + cf2_getDefaultWidthX( CFF_Decoder* decoder ); + FT_LOCAL( CF2_Fixed ) + cf2_getNominalWidthX( CFF_Decoder* decoder ); + + + /* + * FreeType client outline + * + * process output from the charstring interpreter + */ + typedef struct CF2_OutlineRec_ + { + CF2_OutlineCallbacksRec root; /* base class must be first */ + CFF_Decoder* decoder; + + } CF2_OutlineRec, *CF2_Outline; + + + FT_LOCAL( void ) + cf2_outline_reset( CF2_Outline outline ); + FT_LOCAL( void ) + cf2_outline_close( CF2_Outline outline ); + + +FT_END_HEADER + + +#endif /* __CF2FT_H__ */ + + +/* END */ diff --git a/src/cff/cf2glue.h b/src/cff/cf2glue.h new file mode 100644 index 0000000..a24da39 --- /dev/null +++ b/src/cff/cf2glue.h @@ -0,0 +1,144 @@ +/***************************************************************************/ +/* */ +/* cf2glue.h */ +/* */ +/* Adobe's code for shared stuff (specification only). */ +/* */ +/* Copyright 2007-2013 Adobe Systems Incorporated. */ +/* */ +/* This software, and all works of authorship, whether in source or */ +/* object code form as indicated by the copyright notice(s) included */ +/* herein (collectively, the "Work") is made available, and may only be */ +/* used, modified, and distributed under the FreeType Project License, */ +/* LICENSE.TXT. Additionally, subject to the terms and conditions of the */ +/* FreeType Project License, each contributor to the Work hereby grants */ +/* to any individual or legal entity exercising permissions granted by */ +/* the FreeType Project License and this section (hereafter, "You" or */ +/* "Your") a perpetual, worldwide, non-exclusive, no-charge, */ +/* royalty-free, irrevocable (except as stated in this section) patent */ +/* license to make, have made, use, offer to sell, sell, import, and */ +/* otherwise transfer the Work, where such license applies only to those */ +/* patent claims licensable by such contributor that are necessarily */ +/* infringed by their contribution(s) alone or by combination of their */ +/* contribution(s) with the Work to which such contribution(s) was */ +/* submitted. If You institute patent litigation against any entity */ +/* (including a cross-claim or counterclaim in a lawsuit) alleging that */ +/* the Work or a contribution incorporated within the Work constitutes */ +/* direct or contributory patent infringement, then any patent licenses */ +/* granted to You under this License for that Work shall terminate as of */ +/* the date such litigation is filed. */ +/* */ +/* By using, modifying, or distributing the Work you indicate that you */ +/* have read and understood the terms and conditions of the */ +/* FreeType Project License as well as those provided in this section, */ +/* and you accept them fully. */ +/* */ +/***************************************************************************/ + + +#ifndef __CF2GLUE_H__ +#define __CF2GLUE_H__ + + +/* common includes for other modules */ +#include "cf2error.h" +#include "cf2fixed.h" +#include "cf2arrst.h" +#include "cf2read.h" + + +FT_BEGIN_HEADER + + + /* rendering parameters */ + + /* apply hints to rendered glyphs */ +#define CF2_FlagsHinted 1 + /* for testing */ +#define CF2_FlagsDarkened 2 + + /* type for holding the flags */ + typedef CF2_Int CF2_RenderingFlags; + + + /* elements of a glyph outline */ + typedef enum CF2_PathOp_ + { + CF2_PathOpMoveTo = 1, /* change the current point */ + CF2_PathOpLineTo = 2, /* line */ + CF2_PathOpQuadTo = 3, /* quadratic curve */ + CF2_PathOpCubeTo = 4 /* cubic curve */ + + } CF2_PathOp; + + + /* a matrix of fixed point values */ + typedef struct CF2_Matrix_ + { + CF2_F16Dot16 a; + CF2_F16Dot16 b; + CF2_F16Dot16 c; + CF2_F16Dot16 d; + CF2_F16Dot16 tx; + CF2_F16Dot16 ty; + + } CF2_Matrix; + + + /* these typedefs are needed by more than one header file */ + /* and gcc compiler doesn't allow redefinition */ + typedef struct CF2_FontRec_ CF2_FontRec, *CF2_Font; + typedef struct CF2_HintRec_ CF2_HintRec, *CF2_Hint; + + + /* A common structure for all callback parameters. */ + /* */ + /* Some members may be unused. For example, `pt0' is not used for */ + /* `moveTo' and `pt3' is not used for `quadTo'. The initial point `pt0' */ + /* is included for each path element for generality; curve conversions */ + /* need it. The `op' parameter allows one function to handle multiple */ + /* element types. */ + + typedef struct CF2_CallbackParamsRec_ + { + FT_Vector pt0; + FT_Vector pt1; + FT_Vector pt2; + FT_Vector pt3; + + CF2_Int op; + + } CF2_CallbackParamsRec, *CF2_CallbackParams; + + + /* forward reference */ + typedef struct CF2_OutlineCallbacksRec_ CF2_OutlineCallbacksRec, + *CF2_OutlineCallbacks; + + /* callback function pointers */ + typedef void + (*CF2_Callback_Type)( CF2_OutlineCallbacks callbacks, + const CF2_CallbackParams params ); + + + struct CF2_OutlineCallbacksRec_ + { + CF2_Callback_Type moveTo; + CF2_Callback_Type lineTo; + CF2_Callback_Type quadTo; + CF2_Callback_Type cubeTo; + + CF2_Int windingMomentum; /* for winding order detection */ + + FT_Memory memory; + FT_Error* error; + }; + + +FT_END_HEADER + + +#endif /* __CF2GLUE_H__ */ + + +/* END */ diff --git a/src/cff/cf2hints.c b/src/cff/cf2hints.c new file mode 100644 index 0000000..040d193 --- /dev/null +++ b/src/cff/cf2hints.c @@ -0,0 +1,1847 @@ +/***************************************************************************/ +/* */ +/* cf2hints.c */ +/* */ +/* Adobe's code for handling CFF hints (body). */ +/* */ +/* Copyright 2007-2014 Adobe Systems Incorporated. */ +/* */ +/* This software, and all works of authorship, whether in source or */ +/* object code form as indicated by the copyright notice(s) included */ +/* herein (collectively, the "Work") is made available, and may only be */ +/* used, modified, and distributed under the FreeType Project License, */ +/* LICENSE.TXT. Additionally, subject to the terms and conditions of the */ +/* FreeType Project License, each contributor to the Work hereby grants */ +/* to any individual or legal entity exercising permissions granted by */ +/* the FreeType Project License and this section (hereafter, "You" or */ +/* "Your") a perpetual, worldwide, non-exclusive, no-charge, */ +/* royalty-free, irrevocable (except as stated in this section) patent */ +/* license to make, have made, use, offer to sell, sell, import, and */ +/* otherwise transfer the Work, where such license applies only to those */ +/* patent claims licensable by such contributor that are necessarily */ +/* infringed by their contribution(s) alone or by combination of their */ +/* contribution(s) with the Work to which such contribution(s) was */ +/* submitted. If You institute patent litigation against any entity */ +/* (including a cross-claim or counterclaim in a lawsuit) alleging that */ +/* the Work or a contribution incorporated within the Work constitutes */ +/* direct or contributory patent infringement, then any patent licenses */ +/* granted to You under this License for that Work shall terminate as of */ +/* the date such litigation is filed. */ +/* */ +/* By using, modifying, or distributing the Work you indicate that you */ +/* have read and understood the terms and conditions of the */ +/* FreeType Project License as well as those provided in this section, */ +/* and you accept them fully. */ +/* */ +/***************************************************************************/ + + +#include "cf2ft.h" +#include FT_INTERNAL_DEBUG_H + +#include "cf2glue.h" +#include "cf2font.h" +#include "cf2hints.h" +#include "cf2intrp.h" + + + /*************************************************************************/ + /* */ + /* The macro FT_COMPONENT is used in trace mode. It is an implicit */ + /* parameter of the FT_TRACE() and FT_ERROR() macros, used to print/log */ + /* messages during execution. */ + /* */ +#undef FT_COMPONENT +#define FT_COMPONENT trace_cf2hints + + + typedef struct CF2_HintMoveRec_ + { + size_t j; /* index of upper hint map edge */ + CF2_Fixed moveUp; /* adjustment to optimum position */ + + } CF2_HintMoveRec, *CF2_HintMove; + + + /* Compute angular momentum for winding order detection. It is called */ + /* for all lines and curves, but not necessarily in element order. */ + static CF2_Int + cf2_getWindingMomentum( CF2_Fixed x1, + CF2_Fixed y1, + CF2_Fixed x2, + CF2_Fixed y2 ) + { + /* cross product of pt1 position from origin with pt2 position from */ + /* pt1; we reduce the precision so that the result fits into 32 bits */ + + return ( x1 >> 16 ) * ( ( y2 - y1 ) >> 16 ) - + ( y1 >> 16 ) * ( ( x2 - x1 ) >> 16 ); + } + + + /* + * Construct from a StemHint; this is used as a parameter to + * `cf2_blues_capture'. + * `hintOrigin' is the character space displacement of a seac accent. + * Adjust stem hint for darkening here. + * + */ + static void + cf2_hint_init( CF2_Hint hint, + const CF2_ArrStack stemHintArray, + size_t indexStemHint, + const CF2_Font font, + CF2_Fixed hintOrigin, + CF2_Fixed scale, + FT_Bool bottom ) + { + CF2_Fixed width; + const CF2_StemHintRec* stemHint; + + + FT_ZERO( hint ); + + stemHint = (const CF2_StemHintRec*)cf2_arrstack_getPointer( + stemHintArray, + indexStemHint ); + + width = stemHint->max - stemHint->min; + + if ( width == cf2_intToFixed( -21 ) ) + { + /* ghost bottom */ + + if ( bottom ) + { + hint->csCoord = stemHint->max; + hint->flags = CF2_GhostBottom; + } + else + hint->flags = 0; + } + + else if ( width == cf2_intToFixed( -20 ) ) + { + /* ghost top */ + + if ( bottom ) + hint->flags = 0; + else + { + hint->csCoord = stemHint->min; + hint->flags = CF2_GhostTop; + } + } + + else if ( width < 0 ) + { + /* inverted pair */ + + /* + * Hints with negative widths were produced by an early version of a + * non-Adobe font tool. The Type 2 spec allows edge (ghost) hints + * with negative widths, but says + * + * All other negative widths have undefined meaning. + * + * CoolType has a silent workaround that negates the hint width; for + * permissive mode, we do the same here. + * + * Note: Such fonts cannot use ghost hints, but should otherwise work. + * Note: Some poor hints in our faux fonts can produce negative + * widths at some blends. For example, see a light weight of + * `u' in ASerifMM. + * + */ + if ( bottom ) + { + hint->csCoord = stemHint->max; + hint->flags = CF2_PairBottom; + } + else + { + hint->csCoord = stemHint->min; + hint->flags = CF2_PairTop; + } + } + + else + { + /* normal pair */ + + if ( bottom ) + { + hint->csCoord = stemHint->min; + hint->flags = CF2_PairBottom; + } + else + { + hint->csCoord = stemHint->max; + hint->flags = CF2_PairTop; + } + } + + /* Now that ghost hints have been detected, adjust this edge for */ + /* darkening. Bottoms are not changed; tops are incremented by twice */ + /* `darkenY'. */ + if ( cf2_hint_isTop( hint ) ) + hint->csCoord += 2 * font->darkenY; + + hint->csCoord += hintOrigin; + hint->scale = scale; + hint->index = indexStemHint; /* index in original stem hint array */ + + /* if original stem hint has been used, use the same position */ + if ( hint->flags != 0 && stemHint->used ) + { + if ( cf2_hint_isTop( hint ) ) + hint->dsCoord = stemHint->maxDS; + else + hint->dsCoord = stemHint->minDS; + + cf2_hint_lock( hint ); + } + else + hint->dsCoord = FT_MulFix( hint->csCoord, scale ); + } + + + /* initialize an invalid hint map element */ + static void + cf2_hint_initZero( CF2_Hint hint ) + { + FT_ZERO( hint ); + } + + + FT_LOCAL_DEF( FT_Bool ) + cf2_hint_isValid( const CF2_Hint hint ) + { + return (FT_Bool)( hint->flags != 0 ); + } + + + static FT_Bool + cf2_hint_isPair( const CF2_Hint hint ) + { + return (FT_Bool)( ( hint->flags & + ( CF2_PairBottom | CF2_PairTop ) ) != 0 ); + } + + + static FT_Bool + cf2_hint_isPairTop( const CF2_Hint hint ) + { + return (FT_Bool)( ( hint->flags & CF2_PairTop ) != 0 ); + } + + + FT_LOCAL_DEF( FT_Bool ) + cf2_hint_isTop( const CF2_Hint hint ) + { + return (FT_Bool)( ( hint->flags & + ( CF2_PairTop | CF2_GhostTop ) ) != 0 ); + } + + + FT_LOCAL_DEF( FT_Bool ) + cf2_hint_isBottom( const CF2_Hint hint ) + { + return (FT_Bool)( ( hint->flags & + ( CF2_PairBottom | CF2_GhostBottom ) ) != 0 ); + } + + + static FT_Bool + cf2_hint_isLocked( const CF2_Hint hint ) + { + return (FT_Bool)( ( hint->flags & CF2_Locked ) != 0 ); + } + + + static FT_Bool + cf2_hint_isSynthetic( const CF2_Hint hint ) + { + return (FT_Bool)( ( hint->flags & CF2_Synthetic ) != 0 ); + } + + + FT_LOCAL_DEF( void ) + cf2_hint_lock( CF2_Hint hint ) + { + hint->flags |= CF2_Locked; + } + + + FT_LOCAL_DEF( void ) + cf2_hintmap_init( CF2_HintMap hintmap, + CF2_Font font, + CF2_HintMap initialMap, + CF2_ArrStack hintMoves, + CF2_Fixed scale ) + { + FT_ZERO( hintmap ); + + /* copy parameters from font instance */ + hintmap->hinted = font->hinted; + hintmap->scale = scale; + hintmap->font = font; + hintmap->initialHintMap = initialMap; + /* will clear in `cf2_hintmap_adjustHints' */ + hintmap->hintMoves = hintMoves; + } + + + static FT_Bool + cf2_hintmap_isValid( const CF2_HintMap hintmap ) + { + return hintmap->isValid; + } + + + /* transform character space coordinate to device space using hint map */ + static CF2_Fixed + cf2_hintmap_map( CF2_HintMap hintmap, + CF2_Fixed csCoord ) + { + if ( hintmap->count == 0 || ! hintmap->hinted ) + { + /* there are no hints; use uniform scale and zero offset */ + return FT_MulFix( csCoord, hintmap->scale ); + } + else + { + /* start linear search from last hit */ + CF2_UInt i = hintmap->lastIndex; + + FT_ASSERT( hintmap->lastIndex < CF2_MAX_HINT_EDGES ); + + /* search up */ + while ( i < hintmap->count - 1 && + csCoord >= hintmap->edge[i + 1].csCoord ) + i += 1; + + /* search down */ + while ( i > 0 && csCoord < hintmap->edge[i].csCoord ) + i -= 1; + + hintmap->lastIndex = i; + + if ( i == 0 && csCoord < hintmap->edge[0].csCoord ) + { + /* special case for points below first edge: use uniform scale */ + return FT_MulFix( csCoord - hintmap->edge[0].csCoord, + hintmap->scale ) + + hintmap->edge[0].dsCoord; + } + else + { + /* + * Note: entries with duplicate csCoord are allowed. + * Use edge[i], the highest entry where csCoord >= entry[i].csCoord + */ + return FT_MulFix( csCoord - hintmap->edge[i].csCoord, + hintmap->edge[i].scale ) + + hintmap->edge[i].dsCoord; + } + } + } + + + /* + * This hinting policy moves a hint pair in device space so that one of + * its two edges is on a device pixel boundary (its fractional part is + * zero). `cf2_hintmap_insertHint' guarantees no overlap in CS + * space. Ensure here that there is no overlap in DS. + * + * In the first pass, edges are adjusted relative to adjacent hints. + * Those that are below have already been adjusted. Those that are + * above have not yet been adjusted. If a hint above blocks an + * adjustment to an optimal position, we will try again in a second + * pass. The second pass is top-down. + * + */ + + static void + cf2_hintmap_adjustHints( CF2_HintMap hintmap ) + { + size_t i, j; + + + cf2_arrstack_clear( hintmap->hintMoves ); /* working storage */ + + /* + * First pass is bottom-up (font hint order) without look-ahead. + * Locked edges are already adjusted. + * Unlocked edges begin with dsCoord from `initialHintMap'. + * Save edges that are not optimally adjusted in `hintMoves' array, + * and process them in second pass. + */ + + for ( i = 0; i < hintmap->count; i++ ) + { + FT_Bool isPair = cf2_hint_isPair( &hintmap->edge[i] ); + + + /* index of upper edge (same value for ghost hint) */ + j = isPair ? i + 1 : i; + + FT_ASSERT( j < hintmap->count ); + FT_ASSERT( cf2_hint_isValid( &hintmap->edge[i] ) ); + FT_ASSERT( cf2_hint_isValid( &hintmap->edge[j] ) ); + FT_ASSERT( cf2_hint_isLocked( &hintmap->edge[i] ) == + cf2_hint_isLocked( &hintmap->edge[j] ) ); + + if ( !cf2_hint_isLocked( &hintmap->edge[i] ) ) + { + /* hint edge is not locked, we can adjust it */ + CF2_Fixed fracDown = cf2_fixedFraction( hintmap->edge[i].dsCoord ); + CF2_Fixed fracUp = cf2_fixedFraction( hintmap->edge[j].dsCoord ); + + /* calculate all four possibilities; moves down are negative */ + CF2_Fixed downMoveDown = 0 - fracDown; + CF2_Fixed upMoveDown = 0 - fracUp; + CF2_Fixed downMoveUp = fracDown == 0 + ? 0 + : cf2_intToFixed( 1 ) - fracDown; + CF2_Fixed upMoveUp = fracUp == 0 + ? 0 + : cf2_intToFixed( 1 ) - fracUp; + + /* smallest move up */ + CF2_Fixed moveUp = FT_MIN( downMoveUp, upMoveUp ); + /* smallest move down */ + CF2_Fixed moveDown = FT_MAX( downMoveDown, upMoveDown ); + + /* final amount to move edge or edge pair */ + CF2_Fixed move; + + CF2_Fixed downMinCounter = CF2_MIN_COUNTER; + CF2_Fixed upMinCounter = CF2_MIN_COUNTER; + FT_Bool saveEdge = FALSE; + + + /* minimum counter constraint doesn't apply when adjacent edges */ + /* are synthetic */ + /* TODO: doesn't seem a big effect; for now, reduce the code */ +#if 0 + if ( i == 0 || + cf2_hint_isSynthetic( &hintmap->edge[i - 1] ) ) + downMinCounter = 0; + + if ( j >= hintmap->count - 1 || + cf2_hint_isSynthetic( &hintmap->edge[j + 1] ) ) + upMinCounter = 0; +#endif + + /* is there room to move up? */ + /* there is if we are at top of array or the next edge is at or */ + /* beyond proposed move up? */ + if ( j >= hintmap->count - 1 || + hintmap->edge[j + 1].dsCoord >= + hintmap->edge[j].dsCoord + moveUp + upMinCounter ) + { + /* there is room to move up; is there also room to move down? */ + if ( i == 0 || + hintmap->edge[i - 1].dsCoord <= + hintmap->edge[i].dsCoord + moveDown - downMinCounter ) + { + /* move smaller absolute amount */ + move = ( -moveDown < moveUp ) ? moveDown : moveUp; /* optimum */ + } + else + move = moveUp; + } + else + { + /* is there room to move down? */ + if ( i == 0 || + hintmap->edge[i - 1].dsCoord <= + hintmap->edge[i].dsCoord + moveDown - downMinCounter ) + { + move = moveDown; + /* true if non-optimum move */ + saveEdge = (FT_Bool)( moveUp < -moveDown ); + } + else + { + /* no room to move either way without overlapping or reducing */ + /* the counter too much */ + move = 0; + saveEdge = TRUE; + } + } + + /* Identify non-moves and moves down that aren't optimal, and save */ + /* them for second pass. */ + /* Do this only if there is an unlocked edge above (which could */ + /* possibly move). */ + if ( saveEdge && + j < hintmap->count - 1 && + !cf2_hint_isLocked( &hintmap->edge[j + 1] ) ) + { + CF2_HintMoveRec savedMove; + + + savedMove.j = j; + /* desired adjustment in second pass */ + savedMove.moveUp = moveUp - move; + + cf2_arrstack_push( hintmap->hintMoves, &savedMove ); + } + + /* move the edge(s) */ + hintmap->edge[i].dsCoord += move; + if ( isPair ) + hintmap->edge[j].dsCoord += move; + } + + /* assert there are no overlaps in device space */ + FT_ASSERT( i == 0 || + hintmap->edge[i - 1].dsCoord <= hintmap->edge[i].dsCoord ); + FT_ASSERT( i < j || + hintmap->edge[i].dsCoord <= hintmap->edge[j].dsCoord ); + + /* adjust the scales, avoiding divide by zero */ + if ( i > 0 ) + { + if ( hintmap->edge[i].csCoord != hintmap->edge[i - 1].csCoord ) + hintmap->edge[i - 1].scale = + FT_DivFix( + hintmap->edge[i].dsCoord - hintmap->edge[i - 1].dsCoord, + hintmap->edge[i].csCoord - hintmap->edge[i - 1].csCoord ); + } + + if ( isPair ) + { + if ( hintmap->edge[j].csCoord != hintmap->edge[j - 1].csCoord ) + hintmap->edge[j - 1].scale = + FT_DivFix( + hintmap->edge[j].dsCoord - hintmap->edge[j - 1].dsCoord, + hintmap->edge[j].csCoord - hintmap->edge[j - 1].csCoord ); + + i += 1; /* skip upper edge on next loop */ + } + } + + /* second pass tries to move non-optimal hints up, in case there is */ + /* room now */ + for ( i = cf2_arrstack_size( hintmap->hintMoves ); i > 0; i-- ) + { + CF2_HintMove hintMove = (CF2_HintMove) + cf2_arrstack_getPointer( hintmap->hintMoves, i - 1 ); + + + j = hintMove->j; + + /* this was tested before the push, above */ + FT_ASSERT( j < hintmap->count - 1 ); + + /* is there room to move up? */ + if ( hintmap->edge[j + 1].dsCoord >= + hintmap->edge[j].dsCoord + hintMove->moveUp + CF2_MIN_COUNTER ) + { + /* there is more room now, move edge up */ + hintmap->edge[j].dsCoord += hintMove->moveUp; + + if ( cf2_hint_isPair( &hintmap->edge[j] ) ) + { + FT_ASSERT( j > 0 ); + hintmap->edge[j - 1].dsCoord += hintMove->moveUp; + } + } + } + } + + + /* insert hint edges into map, sorted by csCoord */ + static void + cf2_hintmap_insertHint( CF2_HintMap hintmap, + CF2_Hint bottomHintEdge, + CF2_Hint topHintEdge ) + { + CF2_UInt indexInsert; + + /* set default values, then check for edge hints */ + FT_Bool isPair = TRUE; + CF2_Hint firstHintEdge = bottomHintEdge; + CF2_Hint secondHintEdge = topHintEdge; + + + /* one or none of the input params may be invalid when dealing with */ + /* edge hints; at least one edge must be valid */ + FT_ASSERT( cf2_hint_isValid( bottomHintEdge ) || + cf2_hint_isValid( topHintEdge ) ); + + /* determine how many and which edges to insert */ + if ( !cf2_hint_isValid( bottomHintEdge ) ) + { + /* insert only the top edge */ + firstHintEdge = topHintEdge; + isPair = FALSE; + } + else if ( !cf2_hint_isValid( topHintEdge ) ) + { + /* insert only the bottom edge */ + isPair = FALSE; + } + + /* paired edges must be in proper order */ + FT_ASSERT( !isPair || + topHintEdge->csCoord >= bottomHintEdge->csCoord ); + + /* linear search to find index value of insertion point */ + indexInsert = 0; + for ( ; indexInsert < hintmap->count; indexInsert++ ) + { + if ( hintmap->edge[indexInsert].csCoord >= firstHintEdge->csCoord ) + break; + } + + /* + * Discard any hints that overlap in character space. Most often, this + * is while building the initial map, where captured hints from all + * zones are combined. Define overlap to include hints that `touch' + * (overlap zero). Hiragino Sans/Gothic fonts have numerous hints that + * touch. Some fonts have non-ideographic glyphs that overlap our + * synthetic hints. + * + * Overlap also occurs when darkening stem hints that are close. + * + */ + if ( indexInsert < hintmap->count ) + { + /* we are inserting before an existing edge: */ + /* verify that an existing edge is not the same */ + if ( hintmap->edge[indexInsert].csCoord == firstHintEdge->csCoord ) + return; /* ignore overlapping stem hint */ + + /* verify that a new pair does not straddle the next edge */ + if ( isPair && + hintmap->edge[indexInsert].csCoord <= secondHintEdge->csCoord ) + return; /* ignore overlapping stem hint */ + + /* verify that we are not inserting between paired edges */ + if ( cf2_hint_isPairTop( &hintmap->edge[indexInsert] ) ) + return; /* ignore overlapping stem hint */ + } + + /* recompute device space locations using initial hint map */ + if ( cf2_hintmap_isValid( hintmap->initialHintMap ) && + !cf2_hint_isLocked( firstHintEdge ) ) + { + if ( isPair ) + { + /* Use hint map to position the center of stem, and nominal scale */ + /* to position the two edges. This preserves the stem width. */ + CF2_Fixed midpoint = cf2_hintmap_map( + hintmap->initialHintMap, + ( secondHintEdge->csCoord + + firstHintEdge->csCoord ) / 2 ); + CF2_Fixed halfWidth = FT_MulFix( + ( secondHintEdge->csCoord - + firstHintEdge->csCoord ) / 2, + hintmap->scale ); + + + firstHintEdge->dsCoord = midpoint - halfWidth; + secondHintEdge->dsCoord = midpoint + halfWidth; + } + else + firstHintEdge->dsCoord = cf2_hintmap_map( hintmap->initialHintMap, + firstHintEdge->csCoord ); + } + + /* + * Discard any hints that overlap in device space; this can occur + * because locked hints have been moved to align with blue zones. + * + * TODO: Although we might correct this later during adjustment, we + * don't currently have a way to delete a conflicting hint once it has + * been inserted. See v2.030 MinionPro-Regular, 12 ppem darkened, + * initial hint map for second path, glyph 945 (the perispomeni (tilde) + * in U+1F6E, Greek omega with psili and perispomeni). Darkening is + * 25. Pair 667,747 initially conflicts in design space with top edge + * 660. This is because 667 maps to 7.87, and the top edge was + * captured by a zone at 8.0. The pair is later successfully inserted + * in a zone without the top edge. In this zone it is adjusted to 8.0, + * and no longer conflicts with the top edge in design space. This + * means it can be included in yet a later zone which does have the top + * edge hint. This produces a small mismatch between the first and + * last points of this path, even though the hint masks are the same. + * The density map difference is tiny (1/256). + * + */ + + if ( indexInsert > 0 ) + { + /* we are inserting after an existing edge */ + if ( firstHintEdge->dsCoord < hintmap->edge[indexInsert - 1].dsCoord ) + return; + } + + if ( indexInsert < hintmap->count ) + { + /* we are inserting before an existing edge */ + if ( isPair ) + { + if ( secondHintEdge->dsCoord > hintmap->edge[indexInsert].dsCoord ) + return; + } + else + { + if ( firstHintEdge->dsCoord > hintmap->edge[indexInsert].dsCoord ) + return; + } + } + + /* make room to insert */ + { + CF2_Int iSrc = hintmap->count - 1; + CF2_Int iDst = isPair ? hintmap->count + 1 : hintmap->count; + + CF2_Int count = hintmap->count - indexInsert; + + + if ( iDst >= CF2_MAX_HINT_EDGES ) + { + FT_TRACE4(( "cf2_hintmap_insertHint: too many hintmaps\n" )); + return; + } + + while ( count-- ) + hintmap->edge[iDst--] = hintmap->edge[iSrc--]; + + /* insert first edge */ + hintmap->edge[indexInsert] = *firstHintEdge; /* copy struct */ + hintmap->count += 1; + + if ( isPair ) + { + /* insert second edge */ + hintmap->edge[indexInsert + 1] = *secondHintEdge; /* copy struct */ + hintmap->count += 1; + } + } + + return; + } + + + /* + * Build a map from hints and mask. + * + * This function may recur one level if `hintmap->initialHintMap' is not yet + * valid. + * If `initialMap' is true, simply build initial map. + * + * Synthetic hints are used in two ways. A hint at zero is inserted, if + * needed, in the initial hint map, to prevent translations from + * propagating across the origin. If synthetic em box hints are enabled + * for ideographic dictionaries, then they are inserted in all hint + * maps, including the initial one. + * + */ + FT_LOCAL_DEF( void ) + cf2_hintmap_build( CF2_HintMap hintmap, + CF2_ArrStack hStemHintArray, + CF2_ArrStack vStemHintArray, + CF2_HintMask hintMask, + CF2_Fixed hintOrigin, + FT_Bool initialMap ) + { + FT_Byte* maskPtr; + + CF2_Font font = hintmap->font; + CF2_HintMaskRec tempHintMask; + + size_t bitCount, i; + FT_Byte maskByte; + + + /* check whether initial map is constructed */ + if ( !initialMap && !cf2_hintmap_isValid( hintmap->initialHintMap ) ) + { + /* make recursive call with initialHintMap and temporary mask; */ + /* temporary mask will get all bits set, below */ + cf2_hintmask_init( &tempHintMask, hintMask->error ); + cf2_hintmap_build( hintmap->initialHintMap, + hStemHintArray, + vStemHintArray, + &tempHintMask, + hintOrigin, + TRUE ); + } + + if ( !cf2_hintmask_isValid( hintMask ) ) + { + /* without a hint mask, assume all hints are active */ + cf2_hintmask_setAll( hintMask, + cf2_arrstack_size( hStemHintArray ) + + cf2_arrstack_size( vStemHintArray ) ); + if ( !cf2_hintmask_isValid( hintMask ) ) + return; /* too many stem hints */ + } + + /* begin by clearing the map */ + hintmap->count = 0; + hintmap->lastIndex = 0; + + /* make a copy of the hint mask so we can modify it */ + tempHintMask = *hintMask; + maskPtr = cf2_hintmask_getMaskPtr( &tempHintMask ); + + /* use the hStem hints only, which are first in the mask */ + bitCount = cf2_arrstack_size( hStemHintArray ); + + /* Defense-in-depth. Should never return here. */ + if ( bitCount > hintMask->bitCount ) + return; + + /* synthetic embox hints get highest priority */ + if ( font->blues.doEmBoxHints ) + { + CF2_HintRec dummy; + + + cf2_hint_initZero( &dummy ); /* invalid hint map element */ + + /* ghost bottom */ + cf2_hintmap_insertHint( hintmap, + &font->blues.emBoxBottomEdge, + &dummy ); + /* ghost top */ + cf2_hintmap_insertHint( hintmap, + &dummy, + &font->blues.emBoxTopEdge ); + } + + /* insert hints captured by a blue zone or already locked (higher */ + /* priority) */ + for ( i = 0, maskByte = 0x80; i < bitCount; i++ ) + { + if ( maskByte & *maskPtr ) + { + /* expand StemHint into two `CF2_Hint' elements */ + CF2_HintRec bottomHintEdge, topHintEdge; + + + cf2_hint_init( &bottomHintEdge, + hStemHintArray, + i, + font, + hintOrigin, + hintmap->scale, + TRUE /* bottom */ ); + cf2_hint_init( &topHintEdge, + hStemHintArray, + i, + font, + hintOrigin, + hintmap->scale, + FALSE /* top */ ); + + if ( cf2_hint_isLocked( &bottomHintEdge ) || + cf2_hint_isLocked( &topHintEdge ) || + cf2_blues_capture( &font->blues, + &bottomHintEdge, + &topHintEdge ) ) + { + /* insert captured hint into map */ + cf2_hintmap_insertHint( hintmap, &bottomHintEdge, &topHintEdge ); + + *maskPtr &= ~maskByte; /* turn off the bit for this hint */ + } + } + + if ( ( i & 7 ) == 7 ) + { + /* move to next mask byte */ + maskPtr++; + maskByte = 0x80; + } + else + maskByte >>= 1; + } + + /* initial hint map includes only captured hints plus maybe one at 0 */ + + /* + * TODO: There is a problem here because we are trying to build a + * single hint map containing all captured hints. It is + * possible for there to be conflicts between captured hints, + * either because of darkening or because the hints are in + * separate hint zones (we are ignoring hint zones for the + * initial map). An example of the latter is MinionPro-Regular + * v2.030 glyph 883 (Greek Capital Alpha with Psili) at 15ppem. + * A stem hint for the psili conflicts with the top edge hint + * for the base character. The stem hint gets priority because + * of its sort order. In glyph 884 (Greek Capital Alpha with + * Psili and Oxia), the top of the base character gets a stem + * hint, and the psili does not. This creates different initial + * maps for the two glyphs resulting in different renderings of + * the base character. Will probably defer this either as not + * worth the cost or as a font bug. I don't think there is any + * good reason for an accent to be captured by an alignment + * zone. -darnold 2/12/10 + */ + + if ( initialMap ) + { + /* Apply a heuristic that inserts a point for (0,0), unless it's */ + /* already covered by a mapping. This locks the baseline for glyphs */ + /* that have no baseline hints. */ + + if ( hintmap->count == 0 || + hintmap->edge[0].csCoord > 0 || + hintmap->edge[hintmap->count - 1].csCoord < 0 ) + { + /* all edges are above 0 or all edges are below 0; */ + /* construct a locked edge hint at 0 */ + + CF2_HintRec edge, invalid; + + + cf2_hint_initZero( &edge ); + + edge.flags = CF2_GhostBottom | + CF2_Locked | + CF2_Synthetic; + edge.scale = hintmap->scale; + + cf2_hint_initZero( &invalid ); + cf2_hintmap_insertHint( hintmap, &edge, &invalid ); + } + } + else + { + /* insert remaining hints */ + + maskPtr = cf2_hintmask_getMaskPtr( &tempHintMask ); + + for ( i = 0, maskByte = 0x80; i < bitCount; i++ ) + { + if ( maskByte & *maskPtr ) + { + CF2_HintRec bottomHintEdge, topHintEdge; + + + cf2_hint_init( &bottomHintEdge, + hStemHintArray, + i, + font, + hintOrigin, + hintmap->scale, + TRUE /* bottom */ ); + cf2_hint_init( &topHintEdge, + hStemHintArray, + i, + font, + hintOrigin, + hintmap->scale, + FALSE /* top */ ); + + cf2_hintmap_insertHint( hintmap, &bottomHintEdge, &topHintEdge ); + } + + if ( ( i & 7 ) == 7 ) + { + /* move to next mask byte */ + maskPtr++; + maskByte = 0x80; + } + else + maskByte >>= 1; + } + } + + /* + * Note: The following line is a convenient place to break when + * debugging hinting. Examine `hintmap->edge' for the list of + * enabled hints, then step over the call to see the effect of + * adjustment. We stop here first on the recursive call that + * creates the initial map, and then on each counter group and + * hint zone. + */ + + /* adjust positions of hint edges that are not locked to blue zones */ + cf2_hintmap_adjustHints( hintmap ); + + /* save the position of all hints that were used in this hint map; */ + /* if we use them again, we'll locate them in the same position */ + if ( !initialMap ) + { + for ( i = 0; i < hintmap->count; i++ ) + { + if ( !cf2_hint_isSynthetic( &hintmap->edge[i] ) ) + { + /* Note: include both valid and invalid edges */ + /* Note: top and bottom edges are copied back separately */ + CF2_StemHint stemhint = (CF2_StemHint) + cf2_arrstack_getPointer( hStemHintArray, + hintmap->edge[i].index ); + + + if ( cf2_hint_isTop( &hintmap->edge[i] ) ) + stemhint->maxDS = hintmap->edge[i].dsCoord; + else + stemhint->minDS = hintmap->edge[i].dsCoord; + + stemhint->used = TRUE; + } + } + } + + /* hint map is ready to use */ + hintmap->isValid = TRUE; + + /* remember this mask has been used */ + cf2_hintmask_setNew( hintMask, FALSE ); + } + + + FT_LOCAL_DEF( void ) + cf2_glyphpath_init( CF2_GlyphPath glyphpath, + CF2_Font font, + CF2_OutlineCallbacks callbacks, + CF2_Fixed scaleY, + /* CF2_Fixed hShift, */ + CF2_ArrStack hStemHintArray, + CF2_ArrStack vStemHintArray, + CF2_HintMask hintMask, + CF2_Fixed hintOriginY, + const CF2_Blues blues, + const FT_Vector* fractionalTranslation ) + { + FT_ZERO( glyphpath ); + + glyphpath->font = font; + glyphpath->callbacks = callbacks; + + cf2_arrstack_init( &glyphpath->hintMoves, + font->memory, + &font->error, + sizeof ( CF2_HintMoveRec ) ); + + cf2_hintmap_init( &glyphpath->initialHintMap, + font, + &glyphpath->initialHintMap, + &glyphpath->hintMoves, + scaleY ); + cf2_hintmap_init( &glyphpath->firstHintMap, + font, + &glyphpath->initialHintMap, + &glyphpath->hintMoves, + scaleY ); + cf2_hintmap_init( &glyphpath->hintMap, + font, + &glyphpath->initialHintMap, + &glyphpath->hintMoves, + scaleY ); + + glyphpath->scaleX = font->innerTransform.a; + glyphpath->scaleC = font->innerTransform.c; + glyphpath->scaleY = font->innerTransform.d; + + glyphpath->fractionalTranslation = *fractionalTranslation; + +#if 0 + glyphpath->hShift = hShift; /* for fauxing */ +#endif + + glyphpath->hStemHintArray = hStemHintArray; + glyphpath->vStemHintArray = vStemHintArray; + glyphpath->hintMask = hintMask; /* ptr to current mask */ + glyphpath->hintOriginY = hintOriginY; + glyphpath->blues = blues; + glyphpath->darken = font->darkened; /* TODO: should we make copies? */ + glyphpath->xOffset = font->darkenX; + glyphpath->yOffset = font->darkenY; + glyphpath->miterLimit = 2 * FT_MAX( + cf2_fixedAbs( glyphpath->xOffset ), + cf2_fixedAbs( glyphpath->yOffset ) ); + + /* .1 character space unit */ + glyphpath->snapThreshold = cf2_floatToFixed( 0.1f ); + + glyphpath->moveIsPending = TRUE; + glyphpath->pathIsOpen = FALSE; + glyphpath->pathIsClosing = FALSE; + glyphpath->elemIsQueued = FALSE; + } + + + FT_LOCAL_DEF( void ) + cf2_glyphpath_finalize( CF2_GlyphPath glyphpath ) + { + cf2_arrstack_finalize( &glyphpath->hintMoves ); + } + + + /* + * Hint point in y-direction and apply outerTransform. + * Input `current' hint map (which is actually delayed by one element). + * Input x,y point in Character Space. + * Output x,y point in Device Space, including translation. + */ + static void + cf2_glyphpath_hintPoint( CF2_GlyphPath glyphpath, + CF2_HintMap hintmap, + FT_Vector* ppt, + CF2_Fixed x, + CF2_Fixed y ) + { + FT_Vector pt; /* hinted point in upright DS */ + + + pt.x = FT_MulFix( glyphpath->scaleX, x ) + + FT_MulFix( glyphpath->scaleC, y ); + pt.y = cf2_hintmap_map( hintmap, y ); + + ppt->x = FT_MulFix( glyphpath->font->outerTransform.a, pt.x ) + + FT_MulFix( glyphpath->font->outerTransform.c, pt.y ) + + glyphpath->fractionalTranslation.x; + ppt->y = FT_MulFix( glyphpath->font->outerTransform.b, pt.x ) + + FT_MulFix( glyphpath->font->outerTransform.d, pt.y ) + + glyphpath->fractionalTranslation.y; + } + + + /* + * From two line segments, (u1,u2) and (v1,v2), compute a point of + * intersection on the corresponding lines. + * Return false if no intersection is found, or if the intersection is + * too far away from the ends of the line segments, u2 and v1. + * + */ + static FT_Bool + cf2_glyphpath_computeIntersection( CF2_GlyphPath glyphpath, + const FT_Vector* u1, + const FT_Vector* u2, + const FT_Vector* v1, + const FT_Vector* v2, + FT_Vector* intersection ) + { + /* + * Let `u' be a zero-based vector from the first segment, `v' from the + * second segment. + * Let `w 'be the zero-based vector from `u1' to `v1'. + * `perp' is the `perpendicular dot product'; see + * http://mathworld.wolfram.com/PerpDotProduct.html. + * `s' is the parameter for the parametric line for the first segment + * (`u'). + * + * See notation in + * http://softsurfer.com/Archive/algorithm_0104/algorithm_0104B.htm. + * Calculations are done in 16.16, but must handle the squaring of + * line lengths in character space. We scale all vectors by 1/32 to + * avoid overflow. This allows values up to 4095 to be squared. The + * scale factor cancels in the divide. + * + * TODO: the scale factor could be computed from UnitsPerEm. + * + */ + +#define cf2_perp( a, b ) \ + ( FT_MulFix( a.x, b.y ) - FT_MulFix( a.y, b.x ) ) + + /* round and divide by 32 */ +#define CF2_CS_SCALE( x ) \ + ( ( (x) + 0x10 ) >> 5 ) + + FT_Vector u, v, w; /* scaled vectors */ + CF2_Fixed denominator, s; + + + u.x = CF2_CS_SCALE( u2->x - u1->x ); + u.y = CF2_CS_SCALE( u2->y - u1->y ); + v.x = CF2_CS_SCALE( v2->x - v1->x ); + v.y = CF2_CS_SCALE( v2->y - v1->y ); + w.x = CF2_CS_SCALE( v1->x - u1->x ); + w.y = CF2_CS_SCALE( v1->y - u1->y ); + + denominator = cf2_perp( u, v ); + + if ( denominator == 0 ) + return FALSE; /* parallel or coincident lines */ + + s = FT_DivFix( cf2_perp( w, v ), denominator ); + + intersection->x = u1->x + FT_MulFix( s, u2->x - u1->x ); + intersection->y = u1->y + FT_MulFix( s, u2->y - u1->y ); + + /* + * Special case snapping for horizontal and vertical lines. + * This cleans up intersections and reduces problems with winding + * order detection. + * Sample case is sbc cd KozGoPr6N-Medium.otf 20 16685. + * Note: these calculations are in character space. + * + */ + + if ( u1->x == u2->x && + cf2_fixedAbs( intersection->x - u1->x ) < glyphpath->snapThreshold ) + intersection->x = u1->x; + if ( u1->y == u2->y && + cf2_fixedAbs( intersection->y - u1->y ) < glyphpath->snapThreshold ) + intersection->y = u1->y; + + if ( v1->x == v2->x && + cf2_fixedAbs( intersection->x - v1->x ) < glyphpath->snapThreshold ) + intersection->x = v1->x; + if ( v1->y == v2->y && + cf2_fixedAbs( intersection->y - v1->y ) < glyphpath->snapThreshold ) + intersection->y = v1->y; + + /* limit the intersection distance from midpoint of u2 and v1 */ + if ( cf2_fixedAbs( intersection->x - ( u2->x + v1->x ) / 2 ) > + glyphpath->miterLimit || + cf2_fixedAbs( intersection->y - ( u2->y + v1->y ) / 2 ) > + glyphpath->miterLimit ) + return FALSE; + + return TRUE; + } + + + /* + * Push the cached element (glyphpath->prevElem*) to the outline + * consumer. When a darkening offset is used, the end point of the + * cached element may be adjusted to an intersection point or we may + * synthesize a connecting line to the current element. If we are + * closing a subpath, we may also generate a connecting line to the start + * point. + * + * This is where Character Space (CS) is converted to Device Space (DS) + * using a hint map. This calculation must use a HintMap that was valid + * at the time the element was saved. For the first point in a subpath, + * that is a saved HintMap. For most elements, it just means the caller + * has delayed building a HintMap from the current HintMask. + * + * Transform each point with outerTransform and call the outline + * callbacks. This is a general 3x3 transform: + * + * x' = a*x + c*y + tx, y' = b*x + d*y + ty + * + * but it uses 4 elements from CF2_Font and the translation part + * from CF2_GlyphPath. + * + */ + static void + cf2_glyphpath_pushPrevElem( CF2_GlyphPath glyphpath, + CF2_HintMap hintmap, + FT_Vector* nextP0, + FT_Vector nextP1, + FT_Bool close ) + { + CF2_CallbackParamsRec params; + + FT_Vector* prevP0; + FT_Vector* prevP1; + + FT_Vector intersection = { 0, 0 }; + FT_Bool useIntersection = FALSE; + + + FT_ASSERT( glyphpath->prevElemOp == CF2_PathOpLineTo || + glyphpath->prevElemOp == CF2_PathOpCubeTo ); + + if ( glyphpath->prevElemOp == CF2_PathOpLineTo ) + { + prevP0 = &glyphpath->prevElemP0; + prevP1 = &glyphpath->prevElemP1; + } + else + { + prevP0 = &glyphpath->prevElemP2; + prevP1 = &glyphpath->prevElemP3; + } + + /* optimization: if previous and next elements are offset by the same */ + /* amount, then there will be no gap, and no need to compute an */ + /* intersection. */ + if ( prevP1->x != nextP0->x || prevP1->y != nextP0->y ) + { + /* previous element does not join next element: */ + /* adjust end point of previous element to the intersection */ + useIntersection = cf2_glyphpath_computeIntersection( glyphpath, + prevP0, + prevP1, + nextP0, + &nextP1, + &intersection ); + if ( useIntersection ) + { + /* modify the last point of the cached element (either line or */ + /* curve) */ + *prevP1 = intersection; + } + } + + params.pt0 = glyphpath->currentDS; + + switch( glyphpath->prevElemOp ) + { + case CF2_PathOpLineTo: + params.op = CF2_PathOpLineTo; + + /* note: pt2 and pt3 are unused */ + + if ( close ) + { + /* use first hint map if closing */ + cf2_glyphpath_hintPoint( glyphpath, + &glyphpath->firstHintMap, + ¶ms.pt1, + glyphpath->prevElemP1.x, + glyphpath->prevElemP1.y ); + } + else + { + cf2_glyphpath_hintPoint( glyphpath, + hintmap, + ¶ms.pt1, + glyphpath->prevElemP1.x, + glyphpath->prevElemP1.y ); + } + + /* output only non-zero length lines */ + if ( params.pt0.x != params.pt1.x || params.pt0.y != params.pt1.y ) + { + glyphpath->callbacks->lineTo( glyphpath->callbacks, ¶ms ); + + glyphpath->currentDS = params.pt1; + } + break; + + case CF2_PathOpCubeTo: + params.op = CF2_PathOpCubeTo; + + /* TODO: should we intersect the interior joins (p1-p2 and p2-p3)? */ + cf2_glyphpath_hintPoint( glyphpath, + hintmap, + ¶ms.pt1, + glyphpath->prevElemP1.x, + glyphpath->prevElemP1.y ); + cf2_glyphpath_hintPoint( glyphpath, + hintmap, + ¶ms.pt2, + glyphpath->prevElemP2.x, + glyphpath->prevElemP2.y ); + cf2_glyphpath_hintPoint( glyphpath, + hintmap, + ¶ms.pt3, + glyphpath->prevElemP3.x, + glyphpath->prevElemP3.y ); + + glyphpath->callbacks->cubeTo( glyphpath->callbacks, ¶ms ); + + glyphpath->currentDS = params.pt3; + + break; + } + + if ( !useIntersection || close ) + { + /* insert connecting line between end of previous element and start */ + /* of current one */ + /* note: at the end of a subpath, we might do both, so use `nextP0' */ + /* before we change it, below */ + + if ( close ) + { + /* if we are closing the subpath, then nextP0 is in the first */ + /* hint zone */ + cf2_glyphpath_hintPoint( glyphpath, + &glyphpath->firstHintMap, + ¶ms.pt1, + nextP0->x, + nextP0->y ); + } + else + { + cf2_glyphpath_hintPoint( glyphpath, + hintmap, + ¶ms.pt1, + nextP0->x, + nextP0->y ); + } + + if ( params.pt1.x != glyphpath->currentDS.x || + params.pt1.y != glyphpath->currentDS.y ) + { + /* length is nonzero */ + params.op = CF2_PathOpLineTo; + params.pt0 = glyphpath->currentDS; + + /* note: pt2 and pt3 are unused */ + glyphpath->callbacks->lineTo( glyphpath->callbacks, ¶ms ); + + glyphpath->currentDS = params.pt1; + } + } + + if ( useIntersection ) + { + /* return intersection point to caller */ + *nextP0 = intersection; + } + } + + + /* push a MoveTo element based on current point and offset of current */ + /* element */ + static void + cf2_glyphpath_pushMove( CF2_GlyphPath glyphpath, + FT_Vector start ) + { + CF2_CallbackParamsRec params; + + + params.op = CF2_PathOpMoveTo; + params.pt0 = glyphpath->currentDS; + + /* Test if move has really happened yet; it would have called */ + /* `cf2_hintmap_build' to set `isValid'. */ + if ( !cf2_hintmap_isValid( &glyphpath->hintMap ) ) + { + /* we are here iff first subpath is missing a moveto operator: */ + /* synthesize first moveTo to finish initialization of hintMap */ + cf2_glyphpath_moveTo( glyphpath, + glyphpath->start.x, + glyphpath->start.y ); + } + + cf2_glyphpath_hintPoint( glyphpath, + &glyphpath->hintMap, + ¶ms.pt1, + start.x, + start.y ); + + /* note: pt2 and pt3 are unused */ + glyphpath->callbacks->moveTo( glyphpath->callbacks, ¶ms ); + + glyphpath->currentDS = params.pt1; + glyphpath->offsetStart0 = start; + } + + + /* + * All coordinates are in character space. + * On input, (x1, y1) and (x2, y2) give line segment. + * On output, (x, y) give offset vector. + * We use a piecewise approximation to trig functions. + * + * TODO: Offset true perpendicular and proper length + * supply the y-translation for hinting here, too, + * that adds yOffset unconditionally to *y. + */ + static void + cf2_glyphpath_computeOffset( CF2_GlyphPath glyphpath, + CF2_Fixed x1, + CF2_Fixed y1, + CF2_Fixed x2, + CF2_Fixed y2, + CF2_Fixed* x, + CF2_Fixed* y ) + { + CF2_Fixed dx = x2 - x1; + CF2_Fixed dy = y2 - y1; + + + /* note: negative offsets don't work here; negate deltas to change */ + /* quadrants, below */ + if ( glyphpath->font->reverseWinding ) + { + dx = -dx; + dy = -dy; + } + + *x = *y = 0; + + if ( !glyphpath->darken ) + return; + + /* add momentum for this path element */ + glyphpath->callbacks->windingMomentum += + cf2_getWindingMomentum( x1, y1, x2, y2 ); + + /* note: allow mixed integer and fixed multiplication here */ + if ( dx >= 0 ) + { + if ( dy >= 0 ) + { + /* first quadrant, +x +y */ + + if ( dx > 2 * dy ) + { + /* +x */ + *x = 0; + *y = 0; + } + else if ( dy > 2 * dx ) + { + /* +y */ + *x = glyphpath->xOffset; + *y = glyphpath->yOffset; + } + else + { + /* +x +y */ + *x = FT_MulFix( cf2_floatToFixed( 0.7 ), + glyphpath->xOffset ); + *y = FT_MulFix( cf2_floatToFixed( 1.0 - 0.7 ), + glyphpath->yOffset ); + } + } + else + { + /* fourth quadrant, +x -y */ + + if ( dx > -2 * dy ) + { + /* +x */ + *x = 0; + *y = 0; + } + else if ( -dy > 2 * dx ) + { + /* -y */ + *x = -glyphpath->xOffset; + *y = glyphpath->yOffset; + } + else + { + /* +x -y */ + *x = FT_MulFix( cf2_floatToFixed( -0.7 ), + glyphpath->xOffset ); + *y = FT_MulFix( cf2_floatToFixed( 1.0 - 0.7 ), + glyphpath->yOffset ); + } + } + } + else + { + if ( dy >= 0 ) + { + /* second quadrant, -x +y */ + + if ( -dx > 2 * dy ) + { + /* -x */ + *x = 0; + *y = 2 * glyphpath->yOffset; + } + else if ( dy > -2 * dx ) + { + /* +y */ + *x = glyphpath->xOffset; + *y = glyphpath->yOffset; + } + else + { + /* -x +y */ + *x = FT_MulFix( cf2_floatToFixed( 0.7 ), + glyphpath->xOffset ); + *y = FT_MulFix( cf2_floatToFixed( 1.0 + 0.7 ), + glyphpath->yOffset ); + } + } + else + { + /* third quadrant, -x -y */ + + if ( -dx > -2 * dy ) + { + /* -x */ + *x = 0; + *y = 2 * glyphpath->yOffset; + } + else if ( -dy > -2 * dx ) + { + /* -y */ + *x = -glyphpath->xOffset; + *y = glyphpath->yOffset; + } + else + { + /* -x -y */ + *x = FT_MulFix( cf2_floatToFixed( -0.7 ), + glyphpath->xOffset ); + *y = FT_MulFix( cf2_floatToFixed( 1.0 + 0.7 ), + glyphpath->yOffset ); + } + } + } + } + + + /* + * The functions cf2_glyphpath_{moveTo,lineTo,curveTo,closeOpenPath} are + * called by the interpreter with Character Space (CS) coordinates. Each + * path element is placed into a queue of length one to await the + * calculation of the following element. At that time, the darkening + * offset of the following element is known and joins can be computed, + * including possible modification of this element, before mapping to + * Device Space (DS) and passing it on to the outline consumer. + * + */ + FT_LOCAL_DEF( void ) + cf2_glyphpath_moveTo( CF2_GlyphPath glyphpath, + CF2_Fixed x, + CF2_Fixed y ) + { + cf2_glyphpath_closeOpenPath( glyphpath ); + + /* save the parameters of the move for later, when we'll know how to */ + /* offset it; */ + /* also save last move point */ + glyphpath->currentCS.x = glyphpath->start.x = x; + glyphpath->currentCS.y = glyphpath->start.y = y; + + glyphpath->moveIsPending = TRUE; + + /* ensure we have a valid map with current mask */ + if ( !cf2_hintmap_isValid( &glyphpath->hintMap ) || + cf2_hintmask_isNew( glyphpath->hintMask ) ) + cf2_hintmap_build( &glyphpath->hintMap, + glyphpath->hStemHintArray, + glyphpath->vStemHintArray, + glyphpath->hintMask, + glyphpath->hintOriginY, + FALSE ); + + /* save a copy of current HintMap to use when drawing initial point */ + glyphpath->firstHintMap = glyphpath->hintMap; /* structure copy */ + } + + + FT_LOCAL_DEF( void ) + cf2_glyphpath_lineTo( CF2_GlyphPath glyphpath, + CF2_Fixed x, + CF2_Fixed y ) + { + CF2_Fixed xOffset, yOffset; + FT_Vector P0, P1; + FT_Bool newHintMap; + + /* + * New hints will be applied after cf2_glyphpath_pushPrevElem has run. + * In case this is a synthesized closing line, any new hints should be + * delayed until this path is closed (`cf2_hintmask_isNew' will be + * called again before the next line or curve). + */ + + /* true if new hint map not on close */ + newHintMap = cf2_hintmask_isNew( glyphpath->hintMask ) && + !glyphpath->pathIsClosing; + + /* + * Zero-length lines may occur in the charstring. Because we cannot + * compute darkening offsets or intersections from zero-length lines, + * it is best to remove them and avoid artifacts. However, zero-length + * lines in CS at the start of a new hint map can generate non-zero + * lines in DS due to hint substitution. We detect a change in hint + * map here and pass those zero-length lines along. + */ + + /* + * Note: Find explicitly closed paths here with a conditional + * breakpoint using + * + * !gp->pathIsClosing && gp->start.x == x && gp->start.y == y + * + */ + + if ( glyphpath->currentCS.x == x && + glyphpath->currentCS.y == y && + !newHintMap ) + /* + * Ignore zero-length lines in CS where the hint map is the same + * because the line in DS will also be zero length. + * + * Ignore zero-length lines when we synthesize a closing line because + * the close will be handled in cf2_glyphPath_pushPrevElem. + */ + return; + + cf2_glyphpath_computeOffset( glyphpath, + glyphpath->currentCS.x, + glyphpath->currentCS.y, + x, + y, + &xOffset, + &yOffset ); + + /* construct offset points */ + P0.x = glyphpath->currentCS.x + xOffset; + P0.y = glyphpath->currentCS.y + yOffset; + P1.x = x + xOffset; + P1.y = y + yOffset; + + if ( glyphpath->moveIsPending ) + { + /* emit offset 1st point as MoveTo */ + cf2_glyphpath_pushMove( glyphpath, P0 ); + + glyphpath->moveIsPending = FALSE; /* adjust state machine */ + glyphpath->pathIsOpen = TRUE; + + glyphpath->offsetStart1 = P1; /* record second point */ + } + + if ( glyphpath->elemIsQueued ) + { + FT_ASSERT( cf2_hintmap_isValid( &glyphpath->hintMap ) || + glyphpath->hintMap.count == 0 ); + + cf2_glyphpath_pushPrevElem( glyphpath, + &glyphpath->hintMap, + &P0, + P1, + FALSE ); + } + + /* queue the current element with offset points */ + glyphpath->elemIsQueued = TRUE; + glyphpath->prevElemOp = CF2_PathOpLineTo; + glyphpath->prevElemP0 = P0; + glyphpath->prevElemP1 = P1; + + /* update current map */ + if ( newHintMap ) + cf2_hintmap_build( &glyphpath->hintMap, + glyphpath->hStemHintArray, + glyphpath->vStemHintArray, + glyphpath->hintMask, + glyphpath->hintOriginY, + FALSE ); + + glyphpath->currentCS.x = x; /* pre-offset current point */ + glyphpath->currentCS.y = y; + } + + + FT_LOCAL_DEF( void ) + cf2_glyphpath_curveTo( CF2_GlyphPath glyphpath, + CF2_Fixed x1, + CF2_Fixed y1, + CF2_Fixed x2, + CF2_Fixed y2, + CF2_Fixed x3, + CF2_Fixed y3 ) + { + CF2_Fixed xOffset1, yOffset1, xOffset3, yOffset3; + FT_Vector P0, P1, P2, P3; + + + /* TODO: ignore zero length portions of curve?? */ + cf2_glyphpath_computeOffset( glyphpath, + glyphpath->currentCS.x, + glyphpath->currentCS.y, + x1, + y1, + &xOffset1, + &yOffset1 ); + cf2_glyphpath_computeOffset( glyphpath, + x2, + y2, + x3, + y3, + &xOffset3, + &yOffset3 ); + + /* add momentum from the middle segment */ + glyphpath->callbacks->windingMomentum += + cf2_getWindingMomentum( x1, y1, x2, y2 ); + + /* construct offset points */ + P0.x = glyphpath->currentCS.x + xOffset1; + P0.y = glyphpath->currentCS.y + yOffset1; + P1.x = x1 + xOffset1; + P1.y = y1 + yOffset1; + /* note: preserve angle of final segment by using offset3 at both ends */ + P2.x = x2 + xOffset3; + P2.y = y2 + yOffset3; + P3.x = x3 + xOffset3; + P3.y = y3 + yOffset3; + + if ( glyphpath->moveIsPending ) + { + /* emit offset 1st point as MoveTo */ + cf2_glyphpath_pushMove( glyphpath, P0 ); + + glyphpath->moveIsPending = FALSE; + glyphpath->pathIsOpen = TRUE; + + glyphpath->offsetStart1 = P1; /* record second point */ + } + + if ( glyphpath->elemIsQueued ) + { + FT_ASSERT( cf2_hintmap_isValid( &glyphpath->hintMap ) || + glyphpath->hintMap.count == 0 ); + + cf2_glyphpath_pushPrevElem( glyphpath, + &glyphpath->hintMap, + &P0, + P1, + FALSE ); + } + + /* queue the current element with offset points */ + glyphpath->elemIsQueued = TRUE; + glyphpath->prevElemOp = CF2_PathOpCubeTo; + glyphpath->prevElemP0 = P0; + glyphpath->prevElemP1 = P1; + glyphpath->prevElemP2 = P2; + glyphpath->prevElemP3 = P3; + + /* update current map */ + if ( cf2_hintmask_isNew( glyphpath->hintMask ) ) + cf2_hintmap_build( &glyphpath->hintMap, + glyphpath->hStemHintArray, + glyphpath->vStemHintArray, + glyphpath->hintMask, + glyphpath->hintOriginY, + FALSE ); + + glyphpath->currentCS.x = x3; /* pre-offset current point */ + glyphpath->currentCS.y = y3; + } + + + FT_LOCAL_DEF( void ) + cf2_glyphpath_closeOpenPath( CF2_GlyphPath glyphpath ) + { + if ( glyphpath->pathIsOpen ) + { + /* + * A closing line in Character Space line is always generated below + * with `cf2_glyphPath_lineTo'. It may be ignored later if it turns + * out to be zero length in Device Space. + */ + glyphpath->pathIsClosing = TRUE; + + cf2_glyphpath_lineTo( glyphpath, + glyphpath->start.x, + glyphpath->start.y ); + + /* empty the final element from the queue and close the path */ + if ( glyphpath->elemIsQueued ) + cf2_glyphpath_pushPrevElem( glyphpath, + &glyphpath->hintMap, + &glyphpath->offsetStart0, + glyphpath->offsetStart1, + TRUE ); + + /* reset state machine */ + glyphpath->moveIsPending = TRUE; + glyphpath->pathIsOpen = FALSE; + glyphpath->pathIsClosing = FALSE; + glyphpath->elemIsQueued = FALSE; + } + } + + +/* END */ diff --git a/src/cff/cf2hints.h b/src/cff/cf2hints.h new file mode 100644 index 0000000..f25d91b --- /dev/null +++ b/src/cff/cf2hints.h @@ -0,0 +1,289 @@ +/***************************************************************************/ +/* */ +/* cf2hints.h */ +/* */ +/* Adobe's code for handling CFF hints (body). */ +/* */ +/* Copyright 2007-2013 Adobe Systems Incorporated. */ +/* */ +/* This software, and all works of authorship, whether in source or */ +/* object code form as indicated by the copyright notice(s) included */ +/* herein (collectively, the "Work") is made available, and may only be */ +/* used, modified, and distributed under the FreeType Project License, */ +/* LICENSE.TXT. Additionally, subject to the terms and conditions of the */ +/* FreeType Project License, each contributor to the Work hereby grants */ +/* to any individual or legal entity exercising permissions granted by */ +/* the FreeType Project License and this section (hereafter, "You" or */ +/* "Your") a perpetual, worldwide, non-exclusive, no-charge, */ +/* royalty-free, irrevocable (except as stated in this section) patent */ +/* license to make, have made, use, offer to sell, sell, import, and */ +/* otherwise transfer the Work, where such license applies only to those */ +/* patent claims licensable by such contributor that are necessarily */ +/* infringed by their contribution(s) alone or by combination of their */ +/* contribution(s) with the Work to which such contribution(s) was */ +/* submitted. If You institute patent litigation against any entity */ +/* (including a cross-claim or counterclaim in a lawsuit) alleging that */ +/* the Work or a contribution incorporated within the Work constitutes */ +/* direct or contributory patent infringement, then any patent licenses */ +/* granted to You under this License for that Work shall terminate as of */ +/* the date such litigation is filed. */ +/* */ +/* By using, modifying, or distributing the Work you indicate that you */ +/* have read and understood the terms and conditions of the */ +/* FreeType Project License as well as those provided in this section, */ +/* and you accept them fully. */ +/* */ +/***************************************************************************/ + + +#ifndef __CF2HINTS_H__ +#define __CF2HINTS_H__ + + +FT_BEGIN_HEADER + + + enum + { + CF2_MAX_HINTS = 96 /* maximum # of hints */ + }; + + + /* + * A HintMask object stores a bit mask that specifies which hints in the + * charstring are active at a given time. Hints in CFF must be declared + * at the start, before any drawing operators, with horizontal hints + * preceding vertical hints. The HintMask is ordered the same way, with + * horizontal hints immediately followed by vertical hints. Clients are + * responsible for knowing how many of each type are present. + * + * The maximum total number of hints is 96, as specified by the CFF + * specification. + * + * A HintMask is built 0 or more times while interpreting a charstring, by + * the HintMask operator. There is only one HintMask, but it is built or + * rebuilt each time there is a hint substitution (HintMask operator) in + * the charstring. A default HintMask with all bits set is built if there + * has been no HintMask operator prior to the first drawing operator. + * + */ + + typedef struct CF2_HintMaskRec_ + { + FT_Error* error; + + FT_Bool isValid; + FT_Bool isNew; + + size_t bitCount; + size_t byteCount; + + FT_Byte mask[( CF2_MAX_HINTS + 7 ) / 8]; + + } CF2_HintMaskRec, *CF2_HintMask; + + + typedef struct CF2_StemHintRec_ + { + FT_Bool used; /* DS positions are valid */ + + CF2_Fixed min; /* original character space value */ + CF2_Fixed max; + + CF2_Fixed minDS; /* DS position after first use */ + CF2_Fixed maxDS; + + } CF2_StemHintRec, *CF2_StemHint; + + + /* + * A HintMap object stores a piecewise linear function for mapping + * y-coordinates from character space to device space, providing + * appropriate pixel alignment to stem edges. + * + * The map is implemented as an array of `CF2_Hint' elements, each + * representing an edge. When edges are paired, as from stem hints, the + * bottom edge must immediately precede the top edge in the array. + * Element character space AND device space positions must both increase + * monotonically in the array. `CF2_Hint' elements are also used as + * parameters to `cf2_blues_capture'. + * + * The `cf2_hintmap_build' method must be called before any drawing + * operation (beginning with a Move operator) and at each hint + * substitution (HintMask operator). + * + * The `cf2_hintmap_map' method is called to transform y-coordinates at + * each drawing operation (move, line, curve). + * + */ + + /* TODO: make this a CF2_ArrStack and add a deep copy method */ + enum + { + CF2_MAX_HINT_EDGES = CF2_MAX_HINTS * 2 + }; + + + typedef struct CF2_HintMapRec_ + { + CF2_Font font; + + /* initial map based on blue zones */ + struct CF2_HintMapRec_* initialHintMap; + + /* working storage for 2nd pass adjustHints */ + CF2_ArrStack hintMoves; + + FT_Bool isValid; + FT_Bool hinted; + + CF2_Fixed scale; + CF2_UInt count; + + /* start search from this index */ + CF2_UInt lastIndex; + + CF2_HintRec edge[CF2_MAX_HINT_EDGES]; /* 192 */ + + } CF2_HintMapRec, *CF2_HintMap; + + + FT_LOCAL( FT_Bool ) + cf2_hint_isValid( const CF2_Hint hint ); + FT_LOCAL( FT_Bool ) + cf2_hint_isTop( const CF2_Hint hint ); + FT_LOCAL( FT_Bool ) + cf2_hint_isBottom( const CF2_Hint hint ); + FT_LOCAL( void ) + cf2_hint_lock( CF2_Hint hint ); + + + FT_LOCAL( void ) + cf2_hintmap_init( CF2_HintMap hintmap, + CF2_Font font, + CF2_HintMap initialMap, + CF2_ArrStack hintMoves, + CF2_Fixed scale ); + FT_LOCAL( void ) + cf2_hintmap_build( CF2_HintMap hintmap, + CF2_ArrStack hStemHintArray, + CF2_ArrStack vStemHintArray, + CF2_HintMask hintMask, + CF2_Fixed hintOrigin, + FT_Bool initialMap ); + + + /* + * GlyphPath is a wrapper for drawing operations that scales the + * coordinates according to the render matrix and HintMap. It also tracks + * open paths to control ClosePath and to insert MoveTo for broken fonts. + * + */ + typedef struct CF2_GlyphPathRec_ + { + /* TODO: gather some of these into a hinting context */ + + CF2_Font font; /* font instance */ + CF2_OutlineCallbacks callbacks; /* outline consumer */ + + + CF2_HintMapRec hintMap; /* current hint map */ + CF2_HintMapRec firstHintMap; /* saved copy */ + CF2_HintMapRec initialHintMap; /* based on all captured hints */ + + CF2_ArrStackRec hintMoves; /* list of hint moves for 2nd pass */ + + CF2_Fixed scaleX; /* matrix a */ + CF2_Fixed scaleC; /* matrix c */ + CF2_Fixed scaleY; /* matrix d */ + + FT_Vector fractionalTranslation; /* including deviceXScale */ +#if 0 + CF2_Fixed hShift; /* character space horizontal shift */ + /* (for fauxing) */ +#endif + + FT_Bool pathIsOpen; /* true after MoveTo */ + FT_Bool pathIsClosing; /* true when synthesizing closepath line */ + FT_Bool darken; /* true if stem darkening */ + FT_Bool moveIsPending; /* true between MoveTo and offset MoveTo */ + + /* references used to call `cf2_hintmap_build', if necessary */ + CF2_ArrStack hStemHintArray; + CF2_ArrStack vStemHintArray; + CF2_HintMask hintMask; /* ptr to the current mask */ + CF2_Fixed hintOriginY; /* copy of current origin */ + const CF2_BluesRec* blues; + + CF2_Fixed xOffset; /* character space offsets */ + CF2_Fixed yOffset; + + /* character space miter limit threshold */ + CF2_Fixed miterLimit; + /* vertical/horzizontal snap distance in character space */ + CF2_Fixed snapThreshold; + + FT_Vector offsetStart0; /* first and second points of first */ + FT_Vector offsetStart1; /* element with offset applied */ + + /* current point, character space, before offset */ + FT_Vector currentCS; + /* current point, device space */ + FT_Vector currentDS; + /* start point of subpath, character space */ + FT_Vector start; + + /* the following members constitute the `queue' of one element */ + FT_Bool elemIsQueued; + CF2_Int prevElemOp; + + FT_Vector prevElemP0; + FT_Vector prevElemP1; + FT_Vector prevElemP2; + FT_Vector prevElemP3; + + } CF2_GlyphPathRec, *CF2_GlyphPath; + + + FT_LOCAL( void ) + cf2_glyphpath_init( CF2_GlyphPath glyphpath, + CF2_Font font, + CF2_OutlineCallbacks callbacks, + CF2_Fixed scaleY, + /* CF2_Fixed hShift, */ + CF2_ArrStack hStemHintArray, + CF2_ArrStack vStemHintArray, + CF2_HintMask hintMask, + CF2_Fixed hintOrigin, + const CF2_Blues blues, + const FT_Vector* fractionalTranslation ); + FT_LOCAL( void ) + cf2_glyphpath_finalize( CF2_GlyphPath glyphpath ); + + FT_LOCAL( void ) + cf2_glyphpath_moveTo( CF2_GlyphPath glyphpath, + CF2_Fixed x, + CF2_Fixed y ); + FT_LOCAL( void ) + cf2_glyphpath_lineTo( CF2_GlyphPath glyphpath, + CF2_Fixed x, + CF2_Fixed y ); + FT_LOCAL( void ) + cf2_glyphpath_curveTo( CF2_GlyphPath glyphpath, + CF2_Fixed x1, + CF2_Fixed y1, + CF2_Fixed x2, + CF2_Fixed y2, + CF2_Fixed x3, + CF2_Fixed y3 ); + FT_LOCAL( void ) + cf2_glyphpath_closeOpenPath( CF2_GlyphPath glyphpath ); + + +FT_END_HEADER + + +#endif /* __CF2HINTS_H__ */ + + +/* END */ diff --git a/src/cff/cf2intrp.c b/src/cff/cf2intrp.c new file mode 100644 index 0000000..a269606 --- /dev/null +++ b/src/cff/cf2intrp.c @@ -0,0 +1,1545 @@ +/***************************************************************************/ +/* */ +/* cf2intrp.c */ +/* */ +/* Adobe's CFF Interpreter (body). */ +/* */ +/* Copyright 2007-2014 Adobe Systems Incorporated. */ +/* */ +/* This software, and all works of authorship, whether in source or */ +/* object code form as indicated by the copyright notice(s) included */ +/* herein (collectively, the "Work") is made available, and may only be */ +/* used, modified, and distributed under the FreeType Project License, */ +/* LICENSE.TXT. Additionally, subject to the terms and conditions of the */ +/* FreeType Project License, each contributor to the Work hereby grants */ +/* to any individual or legal entity exercising permissions granted by */ +/* the FreeType Project License and this section (hereafter, "You" or */ +/* "Your") a perpetual, worldwide, non-exclusive, no-charge, */ +/* royalty-free, irrevocable (except as stated in this section) patent */ +/* license to make, have made, use, offer to sell, sell, import, and */ +/* otherwise transfer the Work, where such license applies only to those */ +/* patent claims licensable by such contributor that are necessarily */ +/* infringed by their contribution(s) alone or by combination of their */ +/* contribution(s) with the Work to which such contribution(s) was */ +/* submitted. If You institute patent litigation against any entity */ +/* (including a cross-claim or counterclaim in a lawsuit) alleging that */ +/* the Work or a contribution incorporated within the Work constitutes */ +/* direct or contributory patent infringement, then any patent licenses */ +/* granted to You under this License for that Work shall terminate as of */ +/* the date such litigation is filed. */ +/* */ +/* By using, modifying, or distributing the Work you indicate that you */ +/* have read and understood the terms and conditions of the */ +/* FreeType Project License as well as those provided in this section, */ +/* and you accept them fully. */ +/* */ +/***************************************************************************/ + + +#include "cf2ft.h" +#include FT_INTERNAL_DEBUG_H + +#include "cf2glue.h" +#include "cf2font.h" +#include "cf2stack.h" +#include "cf2hints.h" + +#include "cf2error.h" + + + /*************************************************************************/ + /* */ + /* The macro FT_COMPONENT is used in trace mode. It is an implicit */ + /* parameter of the FT_TRACE() and FT_ERROR() macros, used to print/log */ + /* messages during execution. */ + /* */ +#undef FT_COMPONENT +#define FT_COMPONENT trace_cf2interp + + + /* some operators are not implemented yet */ +#define CF2_FIXME FT_TRACE4(( "cf2_interpT2CharString:" \ + " operator not implemented yet\n" )) + + + + FT_LOCAL_DEF( void ) + cf2_hintmask_init( CF2_HintMask hintmask, + FT_Error* error ) + { + FT_ZERO( hintmask ); + + hintmask->error = error; + } + + + FT_LOCAL_DEF( FT_Bool ) + cf2_hintmask_isValid( const CF2_HintMask hintmask ) + { + return hintmask->isValid; + } + + + FT_LOCAL_DEF( FT_Bool ) + cf2_hintmask_isNew( const CF2_HintMask hintmask ) + { + return hintmask->isNew; + } + + + FT_LOCAL_DEF( void ) + cf2_hintmask_setNew( CF2_HintMask hintmask, + FT_Bool val ) + { + hintmask->isNew = val; + } + + + /* clients call `getMaskPtr' in order to iterate */ + /* through hint mask */ + + FT_LOCAL_DEF( FT_Byte* ) + cf2_hintmask_getMaskPtr( CF2_HintMask hintmask ) + { + return hintmask->mask; + } + + + static size_t + cf2_hintmask_setCounts( CF2_HintMask hintmask, + size_t bitCount ) + { + if ( bitCount > CF2_MAX_HINTS ) + { + /* total of h and v stems must be <= 96 */ + CF2_SET_ERROR( hintmask->error, Invalid_Glyph_Format ); + return 0; + } + + hintmask->bitCount = bitCount; + hintmask->byteCount = ( hintmask->bitCount + 7 ) / 8; + + hintmask->isValid = TRUE; + hintmask->isNew = TRUE; + + return bitCount; + } + + + /* consume the hintmask bytes from the charstring, advancing the src */ + /* pointer */ + static void + cf2_hintmask_read( CF2_HintMask hintmask, + CF2_Buffer charstring, + size_t bitCount ) + { + size_t i; + +#ifndef CF2_NDEBUG + /* these are the bits in the final mask byte that should be zero */ + /* Note: this variable is only used in an assert expression below */ + /* and then only if CF2_NDEBUG is not defined */ + CF2_UInt mask = ( 1 << ( -(CF2_Int)bitCount & 7 ) ) - 1; +#endif + + + /* initialize counts and isValid */ + if ( cf2_hintmask_setCounts( hintmask, bitCount ) == 0 ) + return; + + FT_ASSERT( hintmask->byteCount > 0 ); + + FT_TRACE4(( " (maskbytes:" )); + + /* set mask and advance interpreter's charstring pointer */ + for ( i = 0; i < hintmask->byteCount; i++ ) + { + hintmask->mask[i] = (FT_Byte)cf2_buf_readByte( charstring ); + FT_TRACE4(( " 0x%02X", hintmask->mask[i] )); + } + + FT_TRACE4(( ")\n" )); + + /* assert any unused bits in last byte are zero unless there's a prior */ + /* error */ + /* bitCount -> mask, 0 -> 0, 1 -> 7f, 2 -> 3f, ... 6 -> 3, 7 -> 1 */ +#ifndef CF2_NDEBUG + FT_ASSERT( ( hintmask->mask[hintmask->byteCount - 1] & mask ) == 0 || + *hintmask->error ); +#endif + } + + + FT_LOCAL_DEF( void ) + cf2_hintmask_setAll( CF2_HintMask hintmask, + size_t bitCount ) + { + size_t i; + CF2_UInt mask = ( 1 << ( -(CF2_Int)bitCount & 7 ) ) - 1; + + + /* initialize counts and isValid */ + if ( cf2_hintmask_setCounts( hintmask, bitCount ) == 0 ) + return; + + FT_ASSERT( hintmask->byteCount > 0 ); + FT_ASSERT( hintmask->byteCount < + sizeof ( hintmask->mask ) / sizeof ( hintmask->mask[0] ) ); + + /* set mask to all ones */ + for ( i = 0; i < hintmask->byteCount; i++ ) + hintmask->mask[i] = 0xFF; + + /* clear unused bits */ + /* bitCount -> mask, 0 -> 0, 1 -> 7f, 2 -> 3f, ... 6 -> 3, 7 -> 1 */ + hintmask->mask[hintmask->byteCount - 1] &= ~mask; + } + + + /* Type2 charstring opcodes */ + enum + { + cf2_cmdRESERVED_0, /* 0 */ + cf2_cmdHSTEM, /* 1 */ + cf2_cmdRESERVED_2, /* 2 */ + cf2_cmdVSTEM, /* 3 */ + cf2_cmdVMOVETO, /* 4 */ + cf2_cmdRLINETO, /* 5 */ + cf2_cmdHLINETO, /* 6 */ + cf2_cmdVLINETO, /* 7 */ + cf2_cmdRRCURVETO, /* 8 */ + cf2_cmdRESERVED_9, /* 9 */ + cf2_cmdCALLSUBR, /* 10 */ + cf2_cmdRETURN, /* 11 */ + cf2_cmdESC, /* 12 */ + cf2_cmdRESERVED_13, /* 13 */ + cf2_cmdENDCHAR, /* 14 */ + cf2_cmdRESERVED_15, /* 15 */ + cf2_cmdRESERVED_16, /* 16 */ + cf2_cmdRESERVED_17, /* 17 */ + cf2_cmdHSTEMHM, /* 18 */ + cf2_cmdHINTMASK, /* 19 */ + cf2_cmdCNTRMASK, /* 20 */ + cf2_cmdRMOVETO, /* 21 */ + cf2_cmdHMOVETO, /* 22 */ + cf2_cmdVSTEMHM, /* 23 */ + cf2_cmdRCURVELINE, /* 24 */ + cf2_cmdRLINECURVE, /* 25 */ + cf2_cmdVVCURVETO, /* 26 */ + cf2_cmdHHCURVETO, /* 27 */ + cf2_cmdEXTENDEDNMBR, /* 28 */ + cf2_cmdCALLGSUBR, /* 29 */ + cf2_cmdVHCURVETO, /* 30 */ + cf2_cmdHVCURVETO /* 31 */ + }; + + enum + { + cf2_escDOTSECTION, /* 0 */ + cf2_escRESERVED_1, /* 1 */ + cf2_escRESERVED_2, /* 2 */ + cf2_escAND, /* 3 */ + cf2_escOR, /* 4 */ + cf2_escNOT, /* 5 */ + cf2_escRESERVED_6, /* 6 */ + cf2_escRESERVED_7, /* 7 */ + cf2_escRESERVED_8, /* 8 */ + cf2_escABS, /* 9 */ + cf2_escADD, /* 10 like otherADD */ + cf2_escSUB, /* 11 like otherSUB */ + cf2_escDIV, /* 12 */ + cf2_escRESERVED_13, /* 13 */ + cf2_escNEG, /* 14 */ + cf2_escEQ, /* 15 */ + cf2_escRESERVED_16, /* 16 */ + cf2_escRESERVED_17, /* 17 */ + cf2_escDROP, /* 18 */ + cf2_escRESERVED_19, /* 19 */ + cf2_escPUT, /* 20 like otherPUT */ + cf2_escGET, /* 21 like otherGET */ + cf2_escIFELSE, /* 22 like otherIFELSE */ + cf2_escRANDOM, /* 23 like otherRANDOM */ + cf2_escMUL, /* 24 like otherMUL */ + cf2_escRESERVED_25, /* 25 */ + cf2_escSQRT, /* 26 */ + cf2_escDUP, /* 27 like otherDUP */ + cf2_escEXCH, /* 28 like otherEXCH */ + cf2_escINDEX, /* 29 */ + cf2_escROLL, /* 30 */ + cf2_escRESERVED_31, /* 31 */ + cf2_escRESERVED_32, /* 32 */ + cf2_escRESERVED_33, /* 33 */ + cf2_escHFLEX, /* 34 */ + cf2_escFLEX, /* 35 */ + cf2_escHFLEX1, /* 36 */ + cf2_escFLEX1 /* 37 */ + }; + + + /* `stemHintArray' does not change once we start drawing the outline. */ + static void + cf2_doStems( const CF2_Font font, + CF2_Stack opStack, + CF2_ArrStack stemHintArray, + CF2_Fixed* width, + FT_Bool* haveWidth, + CF2_Fixed hintOffset ) + { + CF2_UInt i; + CF2_UInt count = cf2_stack_count( opStack ); + FT_Bool hasWidthArg = (FT_Bool)( count & 1 ); + + /* variable accumulates delta values from operand stack */ + CF2_Fixed position = hintOffset; + + if ( hasWidthArg && ! *haveWidth ) + *width = cf2_stack_getReal( opStack, 0 ) + + cf2_getNominalWidthX( font->decoder ); + + if ( font->decoder->width_only ) + goto exit; + + for ( i = hasWidthArg ? 1 : 0; i < count; i += 2 ) + { + /* construct a CF2_StemHint and push it onto the list */ + CF2_StemHintRec stemhint; + + + stemhint.min = + position += cf2_stack_getReal( opStack, i ); + stemhint.max = + position += cf2_stack_getReal( opStack, i + 1 ); + + stemhint.used = FALSE; + stemhint.maxDS = + stemhint.minDS = 0; + + cf2_arrstack_push( stemHintArray, &stemhint ); /* defer error check */ + } + + cf2_stack_clear( opStack ); + + exit: + /* cf2_doStems must define a width (may be default) */ + *haveWidth = TRUE; + } + + + static void + cf2_doFlex( CF2_Stack opStack, + CF2_Fixed* curX, + CF2_Fixed* curY, + CF2_GlyphPath glyphPath, + const FT_Bool* readFromStack, + FT_Bool doConditionalLastRead ) + { + CF2_Fixed vals[14]; + CF2_UInt index; + FT_Bool isHFlex; + CF2_Int top, i, j; + + + vals[0] = *curX; + vals[1] = *curY; + index = 0; + isHFlex = readFromStack[9] == FALSE; + top = isHFlex ? 9 : 10; + + for ( i = 0; i < top; i++ ) + { + vals[i + 2] = vals[i]; + if ( readFromStack[i] ) + vals[i + 2] += cf2_stack_getReal( opStack, index++ ); + } + + if ( isHFlex ) + vals[9 + 2] = *curY; + + if ( doConditionalLastRead ) + { + FT_Bool lastIsX = (FT_Bool)( cf2_fixedAbs( vals[10] - *curX ) > + cf2_fixedAbs( vals[11] - *curY ) ); + CF2_Fixed lastVal = cf2_stack_getReal( opStack, index ); + + + if ( lastIsX ) + { + vals[12] = vals[10] + lastVal; + vals[13] = *curY; + } + else + { + vals[12] = *curX; + vals[13] = vals[11] + lastVal; + } + } + else + { + if ( readFromStack[10] ) + vals[12] = vals[10] + cf2_stack_getReal( opStack, index++ ); + else + vals[12] = *curX; + + if ( readFromStack[11] ) + vals[13] = vals[11] + cf2_stack_getReal( opStack, index ); + else + vals[13] = *curY; + } + + for ( j = 0; j < 2; j++ ) + cf2_glyphpath_curveTo( glyphPath, vals[j * 6 + 2], + vals[j * 6 + 3], + vals[j * 6 + 4], + vals[j * 6 + 5], + vals[j * 6 + 6], + vals[j * 6 + 7] ); + + cf2_stack_clear( opStack ); + + *curX = vals[12]; + *curY = vals[13]; + } + + + /* + * `error' is a shared error code used by many objects in this + * routine. Before the code continues from an error, it must check and + * record the error in `*error'. The idea is that this shared + * error code will record the first error encountered. If testing + * for an error anyway, the cost of `goto exit' is small, so we do it, + * even if continuing would be safe. In this case, `lastError' is + * set, so the testing and storing can be done in one place, at `exit'. + * + * Continuing after an error is intended for objects which do their own + * testing of `*error', e.g., array stack functions. This allows us to + * avoid an extra test after the call. + * + * Unimplemented opcodes are ignored. + * + */ + FT_LOCAL_DEF( void ) + cf2_interpT2CharString( CF2_Font font, + CF2_Buffer buf, + CF2_OutlineCallbacks callbacks, + const FT_Vector* translation, + FT_Bool doingSeac, + CF2_Fixed curX, + CF2_Fixed curY, + CF2_Fixed* width ) + { + /* lastError is used for errors that are immediately tested */ + FT_Error lastError = FT_Err_Ok; + + /* pointer to parsed font object */ + CFF_Decoder* decoder = font->decoder; + + FT_Error* error = &font->error; + FT_Memory memory = font->memory; + + CF2_Fixed scaleY = font->innerTransform.d; + CF2_Fixed nominalWidthX = cf2_getNominalWidthX( decoder ); + + /* save this for hinting seac accents */ + CF2_Fixed hintOriginY = curY; + + CF2_Stack opStack = NULL; + FT_Byte op1; /* first opcode byte */ + + /* instruction limit; 20,000,000 matches Avalon */ + FT_UInt32 instructionLimit = 20000000UL; + + CF2_ArrStackRec subrStack; + + FT_Bool haveWidth; + CF2_Buffer charstring = NULL; + + CF2_Int charstringIndex = -1; /* initialize to empty */ + + /* TODO: placeholders for hint structures */ + + /* objects used for hinting */ + CF2_ArrStackRec hStemHintArray; + CF2_ArrStackRec vStemHintArray; + + CF2_HintMaskRec hintMask; + CF2_GlyphPathRec glyphPath; + + + /* initialize the remaining objects */ + cf2_arrstack_init( &subrStack, + memory, + error, + sizeof ( CF2_BufferRec ) ); + cf2_arrstack_init( &hStemHintArray, + memory, + error, + sizeof ( CF2_StemHintRec ) ); + cf2_arrstack_init( &vStemHintArray, + memory, + error, + sizeof ( CF2_StemHintRec ) ); + + /* initialize CF2_StemHint arrays */ + cf2_hintmask_init( &hintMask, error ); + + /* initialize path map to manage drawing operations */ + + /* Note: last 4 params are used to handle `MoveToPermissive', which */ + /* may need to call `hintMap.Build' */ + /* TODO: MoveToPermissive is gone; are these still needed? */ + cf2_glyphpath_init( &glyphPath, + font, + callbacks, + scaleY, + /* hShift, */ + &hStemHintArray, + &vStemHintArray, + &hintMask, + hintOriginY, + &font->blues, + translation ); + + /* + * Initialize state for width parsing. From the CFF Spec: + * + * The first stack-clearing operator, which must be one of hstem, + * hstemhm, vstem, vstemhm, cntrmask, hintmask, hmoveto, vmoveto, + * rmoveto, or endchar, takes an additional argument - the width (as + * described earlier), which may be expressed as zero or one numeric + * argument. + * + * What we implement here uses the first validly specified width, but + * does not detect errors for specifying more than one width. + * + * If one of the above operators occurs without explicitly specifying + * a width, we assume the default width. + * + */ + haveWidth = FALSE; + *width = cf2_getDefaultWidthX( decoder ); + + /* + * Note: at this point, all pointers to resources must be NULL + * and all local objects must be initialized. + * There must be no branches to exit: above this point. + * + */ + + /* allocate an operand stack */ + opStack = cf2_stack_init( memory, error ); + if ( !opStack ) + { + lastError = FT_THROW( Out_Of_Memory ); + goto exit; + } + + /* initialize subroutine stack by placing top level charstring as */ + /* first element (max depth plus one for the charstring) */ + /* Note: Caller owns and must finalize the first charstring. */ + /* Our copy of it does not change that requirement. */ + cf2_arrstack_setCount( &subrStack, CF2_MAX_SUBR + 1 ); + + charstring = (CF2_Buffer)cf2_arrstack_getBuffer( &subrStack ); + *charstring = *buf; /* structure copy */ + + charstringIndex = 0; /* entry is valid now */ + + /* catch errors so far */ + if ( *error ) + goto exit; + + /* main interpreter loop */ + while ( 1 ) + { + if ( cf2_buf_isEnd( charstring ) ) + { + /* If we've reached the end of the charstring, simulate a */ + /* cf2_cmdRETURN or cf2_cmdENDCHAR. */ + if ( charstringIndex ) + op1 = cf2_cmdRETURN; /* end of buffer for subroutine */ + else + op1 = cf2_cmdENDCHAR; /* end of buffer for top level charstring */ + } + else + op1 = (FT_Byte)cf2_buf_readByte( charstring ); + + /* check for errors once per loop */ + if ( *error ) + goto exit; + + instructionLimit--; + if ( instructionLimit == 0 ) + { + lastError = FT_THROW( Invalid_Glyph_Format ); + goto exit; + } + + switch( op1 ) + { + case cf2_cmdRESERVED_0: + case cf2_cmdRESERVED_2: + case cf2_cmdRESERVED_9: + case cf2_cmdRESERVED_13: + case cf2_cmdRESERVED_15: + case cf2_cmdRESERVED_16: + case cf2_cmdRESERVED_17: + /* we may get here if we have a prior error */ + FT_TRACE4(( " unknown op (%d)\n", op1 )); + break; + + case cf2_cmdHSTEMHM: + case cf2_cmdHSTEM: + FT_TRACE4(( op1 == cf2_cmdHSTEMHM ? " hstemhm\n" : " hstem\n" )); + + /* never add hints after the mask is computed */ + if ( cf2_hintmask_isValid( &hintMask ) ) + { + FT_TRACE4(( "cf2_interpT2CharString:" + " invalid horizontal hint mask\n" )); + break; + } + + cf2_doStems( font, + opStack, + &hStemHintArray, + width, + &haveWidth, + 0 ); + + if ( font->decoder->width_only ) + goto exit; + + break; + + case cf2_cmdVSTEMHM: + case cf2_cmdVSTEM: + FT_TRACE4(( op1 == cf2_cmdVSTEMHM ? " vstemhm\n" : " vstem\n" )); + + /* never add hints after the mask is computed */ + if ( cf2_hintmask_isValid( &hintMask ) ) + { + FT_TRACE4(( "cf2_interpT2CharString:" + " invalid vertical hint mask\n" )); + break; + } + + cf2_doStems( font, + opStack, + &vStemHintArray, + width, + &haveWidth, + 0 ); + + if ( font->decoder->width_only ) + goto exit; + + break; + + case cf2_cmdVMOVETO: + FT_TRACE4(( " vmoveto\n" )); + + if ( cf2_stack_count( opStack ) > 1 && !haveWidth ) + *width = cf2_stack_getReal( opStack, 0 ) + nominalWidthX; + + /* width is defined or default after this */ + haveWidth = TRUE; + + if ( font->decoder->width_only ) + goto exit; + + curY += cf2_stack_popFixed( opStack ); + + cf2_glyphpath_moveTo( &glyphPath, curX, curY ); + + break; + + case cf2_cmdRLINETO: + { + CF2_UInt index; + CF2_UInt count = cf2_stack_count( opStack ); + + + FT_TRACE4(( " rlineto\n" )); + + for ( index = 0; index < count; index += 2 ) + { + curX += cf2_stack_getReal( opStack, index + 0 ); + curY += cf2_stack_getReal( opStack, index + 1 ); + + cf2_glyphpath_lineTo( &glyphPath, curX, curY ); + } + + cf2_stack_clear( opStack ); + } + continue; /* no need to clear stack again */ + + case cf2_cmdHLINETO: + case cf2_cmdVLINETO: + { + CF2_UInt index; + CF2_UInt count = cf2_stack_count( opStack ); + + FT_Bool isX = op1 == cf2_cmdHLINETO; + + + FT_TRACE4(( isX ? " hlineto\n" : " vlineto\n" )); + + for ( index = 0; index < count; index++ ) + { + CF2_Fixed v = cf2_stack_getReal( opStack, index ); + + + if ( isX ) + curX += v; + else + curY += v; + + isX = !isX; + + cf2_glyphpath_lineTo( &glyphPath, curX, curY ); + } + + cf2_stack_clear( opStack ); + } + continue; + + case cf2_cmdRCURVELINE: + case cf2_cmdRRCURVETO: + { + CF2_UInt count = cf2_stack_count( opStack ); + CF2_UInt index = 0; + + + FT_TRACE4(( op1 == cf2_cmdRCURVELINE ? " rcurveline\n" + : " rrcurveto\n" )); + + while ( index + 6 <= count ) + { + CF2_Fixed x1 = cf2_stack_getReal( opStack, index + 0 ) + curX; + CF2_Fixed y1 = cf2_stack_getReal( opStack, index + 1 ) + curY; + CF2_Fixed x2 = cf2_stack_getReal( opStack, index + 2 ) + x1; + CF2_Fixed y2 = cf2_stack_getReal( opStack, index + 3 ) + y1; + CF2_Fixed x3 = cf2_stack_getReal( opStack, index + 4 ) + x2; + CF2_Fixed y3 = cf2_stack_getReal( opStack, index + 5 ) + y2; + + + cf2_glyphpath_curveTo( &glyphPath, x1, y1, x2, y2, x3, y3 ); + + curX = x3; + curY = y3; + index += 6; + } + + if ( op1 == cf2_cmdRCURVELINE ) + { + curX += cf2_stack_getReal( opStack, index + 0 ); + curY += cf2_stack_getReal( opStack, index + 1 ); + + cf2_glyphpath_lineTo( &glyphPath, curX, curY ); + } + + cf2_stack_clear( opStack ); + } + continue; /* no need to clear stack again */ + + case cf2_cmdCALLGSUBR: + case cf2_cmdCALLSUBR: + { + CF2_UInt subrIndex; + + + FT_TRACE4(( op1 == cf2_cmdCALLGSUBR ? " callgsubr" + : " callsubr" )); + + if ( charstringIndex > CF2_MAX_SUBR ) + { + /* max subr plus one for charstring */ + lastError = FT_THROW( Invalid_Glyph_Format ); + goto exit; /* overflow of stack */ + } + + /* push our current CFF charstring region on subrStack */ + charstring = (CF2_Buffer) + cf2_arrstack_getPointer( &subrStack, + charstringIndex + 1 ); + + /* set up the new CFF region and pointer */ + subrIndex = cf2_stack_popInt( opStack ); + + switch ( op1 ) + { + case cf2_cmdCALLGSUBR: + FT_TRACE4(( "(%d)\n", subrIndex + decoder->globals_bias )); + + if ( cf2_initGlobalRegionBuffer( decoder, + subrIndex, + charstring ) ) + { + lastError = FT_THROW( Invalid_Glyph_Format ); + goto exit; /* subroutine lookup or stream error */ + } + break; + + default: + /* cf2_cmdCALLSUBR */ + FT_TRACE4(( "(%d)\n", subrIndex + decoder->locals_bias )); + + if ( cf2_initLocalRegionBuffer( decoder, + subrIndex, + charstring ) ) + { + lastError = FT_THROW( Invalid_Glyph_Format ); + goto exit; /* subroutine lookup or stream error */ + } + } + + charstringIndex += 1; /* entry is valid now */ + } + continue; /* do not clear the stack */ + + case cf2_cmdRETURN: + FT_TRACE4(( " return\n" )); + + if ( charstringIndex < 1 ) + { + /* Note: cannot return from top charstring */ + lastError = FT_THROW( Invalid_Glyph_Format ); + goto exit; /* underflow of stack */ + } + + /* restore position in previous charstring */ + charstring = (CF2_Buffer) + cf2_arrstack_getPointer( &subrStack, + --charstringIndex ); + continue; /* do not clear the stack */ + + case cf2_cmdESC: + { + FT_Byte op2 = (FT_Byte)cf2_buf_readByte( charstring ); + + + switch ( op2 ) + { + case cf2_escDOTSECTION: + /* something about `flip type of locking' -- ignore it */ + FT_TRACE4(( " dotsection\n" )); + + break; + + /* TODO: should these operators be supported? */ + case cf2_escAND: /* in spec */ + FT_TRACE4(( " and\n" )); + + CF2_FIXME; + break; + + case cf2_escOR: /* in spec */ + FT_TRACE4(( " or\n" )); + + CF2_FIXME; + break; + + case cf2_escNOT: /* in spec */ + FT_TRACE4(( " not\n" )); + + CF2_FIXME; + break; + + case cf2_escABS: /* in spec */ + FT_TRACE4(( " abs\n" )); + + CF2_FIXME; + break; + + case cf2_escADD: /* in spec */ + FT_TRACE4(( " add\n" )); + + CF2_FIXME; + break; + + case cf2_escSUB: /* in spec */ + FT_TRACE4(( " sub\n" )); + + CF2_FIXME; + break; + + case cf2_escDIV: /* in spec */ + FT_TRACE4(( " div\n" )); + + CF2_FIXME; + break; + + case cf2_escNEG: /* in spec */ + FT_TRACE4(( " neg\n" )); + + CF2_FIXME; + break; + + case cf2_escEQ: /* in spec */ + FT_TRACE4(( " eq\n" )); + + CF2_FIXME; + break; + + case cf2_escDROP: /* in spec */ + FT_TRACE4(( " drop\n" )); + + CF2_FIXME; + break; + + case cf2_escPUT: /* in spec */ + FT_TRACE4(( " put\n" )); + + CF2_FIXME; + break; + + case cf2_escGET: /* in spec */ + FT_TRACE4(( " get\n" )); + + CF2_FIXME; + break; + + case cf2_escIFELSE: /* in spec */ + FT_TRACE4(( " ifelse\n" )); + + CF2_FIXME; + break; + + case cf2_escRANDOM: /* in spec */ + FT_TRACE4(( " random\n" )); + + CF2_FIXME; + break; + + case cf2_escMUL: /* in spec */ + FT_TRACE4(( " mul\n" )); + + CF2_FIXME; + break; + + case cf2_escSQRT: /* in spec */ + FT_TRACE4(( " sqrt\n" )); + + CF2_FIXME; + break; + + case cf2_escDUP: /* in spec */ + FT_TRACE4(( " dup\n" )); + + CF2_FIXME; + break; + + case cf2_escEXCH: /* in spec */ + FT_TRACE4(( " exch\n" )); + + CF2_FIXME; + break; + + case cf2_escINDEX: /* in spec */ + FT_TRACE4(( " index\n" )); + + CF2_FIXME; + break; + + case cf2_escROLL: /* in spec */ + FT_TRACE4(( " roll\n" )); + + CF2_FIXME; + break; + + case cf2_escHFLEX: + { + static const FT_Bool readFromStack[12] = + { + TRUE /* dx1 */, FALSE /* dy1 */, + TRUE /* dx2 */, TRUE /* dy2 */, + TRUE /* dx3 */, FALSE /* dy3 */, + TRUE /* dx4 */, FALSE /* dy4 */, + TRUE /* dx5 */, FALSE /* dy5 */, + TRUE /* dx6 */, FALSE /* dy6 */ + }; + + + FT_TRACE4(( " hflex\n" )); + + cf2_doFlex( opStack, + &curX, + &curY, + &glyphPath, + readFromStack, + FALSE /* doConditionalLastRead */ ); + } + continue; + + case cf2_escFLEX: + { + static const FT_Bool readFromStack[12] = + { + TRUE /* dx1 */, TRUE /* dy1 */, + TRUE /* dx2 */, TRUE /* dy2 */, + TRUE /* dx3 */, TRUE /* dy3 */, + TRUE /* dx4 */, TRUE /* dy4 */, + TRUE /* dx5 */, TRUE /* dy5 */, + TRUE /* dx6 */, TRUE /* dy6 */ + }; + + + FT_TRACE4(( " flex\n" )); + + cf2_doFlex( opStack, + &curX, + &curY, + &glyphPath, + readFromStack, + FALSE /* doConditionalLastRead */ ); + } + break; /* TODO: why is this not a continue? */ + + case cf2_escHFLEX1: + { + static const FT_Bool readFromStack[12] = + { + TRUE /* dx1 */, TRUE /* dy1 */, + TRUE /* dx2 */, TRUE /* dy2 */, + TRUE /* dx3 */, FALSE /* dy3 */, + TRUE /* dx4 */, FALSE /* dy4 */, + TRUE /* dx5 */, TRUE /* dy5 */, + TRUE /* dx6 */, FALSE /* dy6 */ + }; + + + FT_TRACE4(( " hflex1\n" )); + + cf2_doFlex( opStack, + &curX, + &curY, + &glyphPath, + readFromStack, + FALSE /* doConditionalLastRead */ ); + } + continue; + + case cf2_escFLEX1: + { + static const FT_Bool readFromStack[12] = + { + TRUE /* dx1 */, TRUE /* dy1 */, + TRUE /* dx2 */, TRUE /* dy2 */, + TRUE /* dx3 */, TRUE /* dy3 */, + TRUE /* dx4 */, TRUE /* dy4 */, + TRUE /* dx5 */, TRUE /* dy5 */, + FALSE /* dx6 */, FALSE /* dy6 */ + }; + + + FT_TRACE4(( " flex1\n" )); + + cf2_doFlex( opStack, + &curX, + &curY, + &glyphPath, + readFromStack, + TRUE /* doConditionalLastRead */ ); + } + continue; + + case cf2_escRESERVED_1: + case cf2_escRESERVED_2: + case cf2_escRESERVED_6: + case cf2_escRESERVED_7: + case cf2_escRESERVED_8: + case cf2_escRESERVED_13: + case cf2_escRESERVED_16: + case cf2_escRESERVED_17: + case cf2_escRESERVED_19: + case cf2_escRESERVED_25: + case cf2_escRESERVED_31: + case cf2_escRESERVED_32: + case cf2_escRESERVED_33: + default: + FT_TRACE4(( " unknown op (12, %d)\n", op2 )); + + }; /* end of switch statement checking `op2' */ + + } /* case cf2_cmdESC */ + break; + + case cf2_cmdENDCHAR: + FT_TRACE4(( " endchar\n" )); + + if ( cf2_stack_count( opStack ) == 1 || + cf2_stack_count( opStack ) == 5 ) + { + if ( !haveWidth ) + *width = cf2_stack_getReal( opStack, 0 ) + nominalWidthX; + } + + /* width is defined or default after this */ + haveWidth = TRUE; + + if ( font->decoder->width_only ) + goto exit; + + /* close path if still open */ + cf2_glyphpath_closeOpenPath( &glyphPath ); + + if ( cf2_stack_count( opStack ) > 1 ) + { + /* must be either 4 or 5 -- */ + /* this is a (deprecated) implied `seac' operator */ + + CF2_UInt achar; + CF2_UInt bchar; + CF2_BufferRec component; + CF2_Fixed dummyWidth; /* ignore component width */ + FT_Error error2; + + + if ( doingSeac ) + { + lastError = FT_THROW( Invalid_Glyph_Format ); + goto exit; /* nested seac */ + } + + achar = cf2_stack_popInt( opStack ); + bchar = cf2_stack_popInt( opStack ); + + curY = cf2_stack_popFixed( opStack ); + curX = cf2_stack_popFixed( opStack ); + + error2 = cf2_getSeacComponent( decoder, achar, &component ); + if ( error2 ) + { + lastError = error2; /* pass FreeType error through */ + goto exit; + } + cf2_interpT2CharString( font, + &component, + callbacks, + translation, + TRUE, + curX, + curY, + &dummyWidth ); + cf2_freeSeacComponent( decoder, &component ); + + error2 = cf2_getSeacComponent( decoder, bchar, &component ); + if ( error2 ) + { + lastError = error2; /* pass FreeType error through */ + goto exit; + } + cf2_interpT2CharString( font, + &component, + callbacks, + translation, + TRUE, + 0, + 0, + &dummyWidth ); + cf2_freeSeacComponent( decoder, &component ); + } + goto exit; + + case cf2_cmdCNTRMASK: + case cf2_cmdHINTMASK: + /* the final \n in the tracing message gets added in */ + /* `cf2_hintmask_read' (which also traces the mask bytes) */ + FT_TRACE4(( op1 == cf2_cmdCNTRMASK ? " cntrmask" : " hintmask" )); + + /* never add hints after the mask is computed */ + if ( cf2_stack_count( opStack ) > 1 && + cf2_hintmask_isValid( &hintMask ) ) + { + FT_TRACE4(( "cf2_interpT2CharString: invalid hint mask\n" )); + break; + } + + /* if there are arguments on the stack, there this is an */ + /* implied cf2_cmdVSTEMHM */ + cf2_doStems( font, + opStack, + &vStemHintArray, + width, + &haveWidth, + 0 ); + + if ( font->decoder->width_only ) + goto exit; + + if ( op1 == cf2_cmdHINTMASK ) + { + /* consume the hint mask bytes which follow the operator */ + cf2_hintmask_read( &hintMask, + charstring, + cf2_arrstack_size( &hStemHintArray ) + + cf2_arrstack_size( &vStemHintArray ) ); + } + else + { + /* + * Consume the counter mask bytes which follow the operator: + * Build a temporary hint map, just to place and lock those + * stems participating in the counter mask. These are most + * likely the dominant hstems, and are grouped together in a + * few counter groups, not necessarily in correspondence + * with the hint groups. This reduces the chances of + * conflicts between hstems that are initially placed in + * separate hint groups and then brought together. The + * positions are copied back to `hStemHintArray', so we can + * discard `counterMask' and `counterHintMap'. + * + */ + CF2_HintMapRec counterHintMap; + CF2_HintMaskRec counterMask; + + + cf2_hintmap_init( &counterHintMap, + font, + &glyphPath.initialHintMap, + &glyphPath.hintMoves, + scaleY ); + cf2_hintmask_init( &counterMask, error ); + + cf2_hintmask_read( &counterMask, + charstring, + cf2_arrstack_size( &hStemHintArray ) + + cf2_arrstack_size( &vStemHintArray ) ); + cf2_hintmap_build( &counterHintMap, + &hStemHintArray, + &vStemHintArray, + &counterMask, + 0, + FALSE ); + } + break; + + case cf2_cmdRMOVETO: + FT_TRACE4(( " rmoveto\n" )); + + if ( cf2_stack_count( opStack ) > 2 && !haveWidth ) + *width = cf2_stack_getReal( opStack, 0 ) + nominalWidthX; + + /* width is defined or default after this */ + haveWidth = TRUE; + + if ( font->decoder->width_only ) + goto exit; + + curY += cf2_stack_popFixed( opStack ); + curX += cf2_stack_popFixed( opStack ); + + cf2_glyphpath_moveTo( &glyphPath, curX, curY ); + + break; + + case cf2_cmdHMOVETO: + FT_TRACE4(( " hmoveto\n" )); + + if ( cf2_stack_count( opStack ) > 1 && !haveWidth ) + *width = cf2_stack_getReal( opStack, 0 ) + nominalWidthX; + + /* width is defined or default after this */ + haveWidth = TRUE; + + if ( font->decoder->width_only ) + goto exit; + + curX += cf2_stack_popFixed( opStack ); + + cf2_glyphpath_moveTo( &glyphPath, curX, curY ); + + break; + + case cf2_cmdRLINECURVE: + { + CF2_UInt count = cf2_stack_count( opStack ); + CF2_UInt index = 0; + + + FT_TRACE4(( " rlinecurve\n" )); + + while ( index + 6 < count ) + { + curX += cf2_stack_getReal( opStack, index + 0 ); + curY += cf2_stack_getReal( opStack, index + 1 ); + + cf2_glyphpath_lineTo( &glyphPath, curX, curY ); + index += 2; + } + + while ( index < count ) + { + CF2_Fixed x1 = cf2_stack_getReal( opStack, index + 0 ) + curX; + CF2_Fixed y1 = cf2_stack_getReal( opStack, index + 1 ) + curY; + CF2_Fixed x2 = cf2_stack_getReal( opStack, index + 2 ) + x1; + CF2_Fixed y2 = cf2_stack_getReal( opStack, index + 3 ) + y1; + CF2_Fixed x3 = cf2_stack_getReal( opStack, index + 4 ) + x2; + CF2_Fixed y3 = cf2_stack_getReal( opStack, index + 5 ) + y2; + + + cf2_glyphpath_curveTo( &glyphPath, x1, y1, x2, y2, x3, y3 ); + + curX = x3; + curY = y3; + index += 6; + } + + cf2_stack_clear( opStack ); + } + continue; /* no need to clear stack again */ + + case cf2_cmdVVCURVETO: + { + CF2_UInt count = cf2_stack_count( opStack ); + CF2_UInt index = 0; + + + FT_TRACE4(( " vvcurveto\n" )); + + while ( index < count ) + { + CF2_Fixed x1, y1, x2, y2, x3, y3; + + + if ( ( count - index ) & 1 ) + { + x1 = cf2_stack_getReal( opStack, index ) + curX; + + ++index; + } + else + x1 = curX; + + y1 = cf2_stack_getReal( opStack, index + 0 ) + curY; + x2 = cf2_stack_getReal( opStack, index + 1 ) + x1; + y2 = cf2_stack_getReal( opStack, index + 2 ) + y1; + x3 = x2; + y3 = cf2_stack_getReal( opStack, index + 3 ) + y2; + + cf2_glyphpath_curveTo( &glyphPath, x1, y1, x2, y2, x3, y3 ); + + curX = x3; + curY = y3; + index += 4; + } + + cf2_stack_clear( opStack ); + } + continue; /* no need to clear stack again */ + + case cf2_cmdHHCURVETO: + { + CF2_UInt count = cf2_stack_count( opStack ); + CF2_UInt index = 0; + + + FT_TRACE4(( " hhcurveto\n" )); + + while ( index < count ) + { + CF2_Fixed x1, y1, x2, y2, x3, y3; + + + if ( ( count - index ) & 1 ) + { + y1 = cf2_stack_getReal( opStack, index ) + curY; + + ++index; + } + else + y1 = curY; + + x1 = cf2_stack_getReal( opStack, index + 0 ) + curX; + x2 = cf2_stack_getReal( opStack, index + 1 ) + x1; + y2 = cf2_stack_getReal( opStack, index + 2 ) + y1; + x3 = cf2_stack_getReal( opStack, index + 3 ) + x2; + y3 = y2; + + cf2_glyphpath_curveTo( &glyphPath, x1, y1, x2, y2, x3, y3 ); + + curX = x3; + curY = y3; + index += 4; + } + + cf2_stack_clear( opStack ); + } + continue; /* no need to clear stack again */ + + case cf2_cmdVHCURVETO: + case cf2_cmdHVCURVETO: + { + CF2_UInt count = cf2_stack_count( opStack ); + CF2_UInt index = 0; + + FT_Bool alternate = op1 == cf2_cmdHVCURVETO; + + + FT_TRACE4(( alternate ? " hvcurveto\n" : " vhcurveto\n" )); + + while ( index < count ) + { + CF2_Fixed x1, x2, x3, y1, y2, y3; + + + if ( alternate ) + { + x1 = cf2_stack_getReal( opStack, index + 0 ) + curX; + y1 = curY; + x2 = cf2_stack_getReal( opStack, index + 1 ) + x1; + y2 = cf2_stack_getReal( opStack, index + 2 ) + y1; + y3 = cf2_stack_getReal( opStack, index + 3 ) + y2; + + if ( count - index == 5 ) + { + x3 = cf2_stack_getReal( opStack, index + 4 ) + x2; + + ++index; + } + else + x3 = x2; + + alternate = FALSE; + } + else + { + x1 = curX; + y1 = cf2_stack_getReal( opStack, index + 0 ) + curY; + x2 = cf2_stack_getReal( opStack, index + 1 ) + x1; + y2 = cf2_stack_getReal( opStack, index + 2 ) + y1; + x3 = cf2_stack_getReal( opStack, index + 3 ) + x2; + + if ( count - index == 5 ) + { + y3 = cf2_stack_getReal( opStack, index + 4 ) + y2; + + ++index; + } + else + y3 = y2; + + alternate = TRUE; + } + + cf2_glyphpath_curveTo( &glyphPath, x1, y1, x2, y2, x3, y3 ); + + curX = x3; + curY = y3; + index += 4; + } + + cf2_stack_clear( opStack ); + } + continue; /* no need to clear stack again */ + + case cf2_cmdEXTENDEDNMBR: + { + CF2_Int v; + + + v = (FT_Short)( ( cf2_buf_readByte( charstring ) << 8 ) | + cf2_buf_readByte( charstring ) ); + + FT_TRACE4(( " %d", v )); + + cf2_stack_pushInt( opStack, v ); + } + continue; + + default: + /* numbers */ + { + if ( /* op1 >= 32 && */ op1 <= 246 ) + { + CF2_Int v; + + + v = op1 - 139; + + FT_TRACE4(( " %d", v )); + + /* -107 .. 107 */ + cf2_stack_pushInt( opStack, v ); + } + + else if ( /* op1 >= 247 && */ op1 <= 250 ) + { + CF2_Int v; + + + v = op1; + v -= 247; + v *= 256; + v += cf2_buf_readByte( charstring ); + v += 108; + + FT_TRACE4(( " %d", v )); + + /* 108 .. 1131 */ + cf2_stack_pushInt( opStack, v ); + } + + else if ( /* op1 >= 251 && */ op1 <= 254 ) + { + CF2_Int v; + + + v = op1; + v -= 251; + v *= 256; + v += cf2_buf_readByte( charstring ); + v = -v - 108; + + FT_TRACE4(( " %d", v )); + + /* -1131 .. -108 */ + cf2_stack_pushInt( opStack, v ); + } + + else /* op1 == 255 */ + { + CF2_Fixed v; + + + v = (CF2_Fixed) + ( ( (FT_UInt32)cf2_buf_readByte( charstring ) << 24 ) | + ( (FT_UInt32)cf2_buf_readByte( charstring ) << 16 ) | + ( (FT_UInt32)cf2_buf_readByte( charstring ) << 8 ) | + (FT_UInt32)cf2_buf_readByte( charstring ) ); + + FT_TRACE4(( " %.2f", v / 65536.0 )); + + cf2_stack_pushFixed( opStack, v ); + } + } + continue; /* don't clear stack */ + + } /* end of switch statement checking `op1' */ + + cf2_stack_clear( opStack ); + + } /* end of main interpreter loop */ + + /* we get here if the charstring ends without cf2_cmdENDCHAR */ + FT_TRACE4(( "cf2_interpT2CharString:" + " charstring ends without ENDCHAR\n" )); + + exit: + /* check whether last error seen is also the first one */ + cf2_setError( error, lastError ); + + /* free resources from objects we've used */ + cf2_glyphpath_finalize( &glyphPath ); + cf2_arrstack_finalize( &vStemHintArray ); + cf2_arrstack_finalize( &hStemHintArray ); + cf2_arrstack_finalize( &subrStack ); + cf2_stack_free( opStack ); + + FT_TRACE4(( "\n" )); + + return; + } + + +/* END */ diff --git a/src/cff/cf2intrp.h b/src/cff/cf2intrp.h new file mode 100644 index 0000000..b5d8947 --- /dev/null +++ b/src/cff/cf2intrp.h @@ -0,0 +1,83 @@ +/***************************************************************************/ +/* */ +/* cf2font.h */ +/* */ +/* Adobe's CFF Interpreter (specification). */ +/* */ +/* Copyright 2007-2013 Adobe Systems Incorporated. */ +/* */ +/* This software, and all works of authorship, whether in source or */ +/* object code form as indicated by the copyright notice(s) included */ +/* herein (collectively, the "Work") is made available, and may only be */ +/* used, modified, and distributed under the FreeType Project License, */ +/* LICENSE.TXT. Additionally, subject to the terms and conditions of the */ +/* FreeType Project License, each contributor to the Work hereby grants */ +/* to any individual or legal entity exercising permissions granted by */ +/* the FreeType Project License and this section (hereafter, "You" or */ +/* "Your") a perpetual, worldwide, non-exclusive, no-charge, */ +/* royalty-free, irrevocable (except as stated in this section) patent */ +/* license to make, have made, use, offer to sell, sell, import, and */ +/* otherwise transfer the Work, where such license applies only to those */ +/* patent claims licensable by such contributor that are necessarily */ +/* infringed by their contribution(s) alone or by combination of their */ +/* contribution(s) with the Work to which such contribution(s) was */ +/* submitted. If You institute patent litigation against any entity */ +/* (including a cross-claim or counterclaim in a lawsuit) alleging that */ +/* the Work or a contribution incorporated within the Work constitutes */ +/* direct or contributory patent infringement, then any patent licenses */ +/* granted to You under this License for that Work shall terminate as of */ +/* the date such litigation is filed. */ +/* */ +/* By using, modifying, or distributing the Work you indicate that you */ +/* have read and understood the terms and conditions of the */ +/* FreeType Project License as well as those provided in this section, */ +/* and you accept them fully. */ +/* */ +/***************************************************************************/ + + +#ifndef __CF2INTRP_H__ +#define __CF2INTRP_H__ + + +#include "cf2ft.h" +#include "cf2hints.h" + + +FT_BEGIN_HEADER + + + FT_LOCAL( void ) + cf2_hintmask_init( CF2_HintMask hintmask, + FT_Error* error ); + FT_LOCAL( FT_Bool ) + cf2_hintmask_isValid( const CF2_HintMask hintmask ); + FT_LOCAL( FT_Bool ) + cf2_hintmask_isNew( const CF2_HintMask hintmask ); + FT_LOCAL( void ) + cf2_hintmask_setNew( CF2_HintMask hintmask, + FT_Bool val ); + FT_LOCAL( FT_Byte* ) + cf2_hintmask_getMaskPtr( CF2_HintMask hintmask ); + FT_LOCAL( void ) + cf2_hintmask_setAll( CF2_HintMask hintmask, + size_t bitCount ); + + FT_LOCAL( void ) + cf2_interpT2CharString( CF2_Font font, + CF2_Buffer charstring, + CF2_OutlineCallbacks callbacks, + const FT_Vector* translation, + FT_Bool doingSeac, + CF2_Fixed curX, + CF2_Fixed curY, + CF2_Fixed* width ); + + +FT_END_HEADER + + +#endif /* __CF2INTRP_H__ */ + + +/* END */ diff --git a/src/cff/cf2read.c b/src/cff/cf2read.c new file mode 100644 index 0000000..2b429e3 --- /dev/null +++ b/src/cff/cf2read.c @@ -0,0 +1,112 @@ +/***************************************************************************/ +/* */ +/* cf2read.c */ +/* */ +/* Adobe's code for stream handling (body). */ +/* */ +/* Copyright 2007-2013 Adobe Systems Incorporated. */ +/* */ +/* This software, and all works of authorship, whether in source or */ +/* object code form as indicated by the copyright notice(s) included */ +/* herein (collectively, the "Work") is made available, and may only be */ +/* used, modified, and distributed under the FreeType Project License, */ +/* LICENSE.TXT. Additionally, subject to the terms and conditions of the */ +/* FreeType Project License, each contributor to the Work hereby grants */ +/* to any individual or legal entity exercising permissions granted by */ +/* the FreeType Project License and this section (hereafter, "You" or */ +/* "Your") a perpetual, worldwide, non-exclusive, no-charge, */ +/* royalty-free, irrevocable (except as stated in this section) patent */ +/* license to make, have made, use, offer to sell, sell, import, and */ +/* otherwise transfer the Work, where such license applies only to those */ +/* patent claims licensable by such contributor that are necessarily */ +/* infringed by their contribution(s) alone or by combination of their */ +/* contribution(s) with the Work to which such contribution(s) was */ +/* submitted. If You institute patent litigation against any entity */ +/* (including a cross-claim or counterclaim in a lawsuit) alleging that */ +/* the Work or a contribution incorporated within the Work constitutes */ +/* direct or contributory patent infringement, then any patent licenses */ +/* granted to You under this License for that Work shall terminate as of */ +/* the date such litigation is filed. */ +/* */ +/* By using, modifying, or distributing the Work you indicate that you */ +/* have read and understood the terms and conditions of the */ +/* FreeType Project License as well as those provided in this section, */ +/* and you accept them fully. */ +/* */ +/***************************************************************************/ + + +#include "cf2ft.h" +#include FT_INTERNAL_DEBUG_H + +#include "cf2glue.h" + +#include "cf2error.h" + + + /* Define CF2_IO_FAIL as 1 to enable random errors and random */ + /* value errors in I/O. */ +#define CF2_IO_FAIL 0 + + +#if CF2_IO_FAIL + + /* set the .00 value to a nonzero probability */ + static int + randomError2( void ) + { + /* for region buffer ReadByte (interp) function */ + return (double)rand() / RAND_MAX < .00; + } + + /* set the .00 value to a nonzero probability */ + static CF2_Int + randomValue() + { + return (double)rand() / RAND_MAX < .00 ? rand() : 0; + } + +#endif /* CF2_IO_FAIL */ + + + /* Region Buffer */ + /* */ + /* Can be constructed from a copied buffer managed by */ + /* `FCM_getDatablock'. */ + /* Reads bytes with check for end of buffer. */ + + /* reading past the end of the buffer sets error and returns zero */ + FT_LOCAL_DEF( CF2_Int ) + cf2_buf_readByte( CF2_Buffer buf ) + { + if ( buf->ptr < buf->end ) + { +#if CF2_IO_FAIL + if ( randomError2() ) + { + CF2_SET_ERROR( buf->error, Invalid_Stream_Operation ); + return 0; + } + + return *(buf->ptr)++ + randomValue(); +#else + return *(buf->ptr)++; +#endif + } + else + { + CF2_SET_ERROR( buf->error, Invalid_Stream_Operation ); + return 0; + } + } + + + /* note: end condition can occur without error */ + FT_LOCAL_DEF( FT_Bool ) + cf2_buf_isEnd( CF2_Buffer buf ) + { + return (FT_Bool)( buf->ptr >= buf->end ); + } + + +/* END */ diff --git a/src/cff/cf2read.h b/src/cff/cf2read.h new file mode 100644 index 0000000..7ef7c8c --- /dev/null +++ b/src/cff/cf2read.h @@ -0,0 +1,68 @@ +/***************************************************************************/ +/* */ +/* cf2read.h */ +/* */ +/* Adobe's code for stream handling (specification). */ +/* */ +/* Copyright 2007-2013 Adobe Systems Incorporated. */ +/* */ +/* This software, and all works of authorship, whether in source or */ +/* object code form as indicated by the copyright notice(s) included */ +/* herein (collectively, the "Work") is made available, and may only be */ +/* used, modified, and distributed under the FreeType Project License, */ +/* LICENSE.TXT. Additionally, subject to the terms and conditions of the */ +/* FreeType Project License, each contributor to the Work hereby grants */ +/* to any individual or legal entity exercising permissions granted by */ +/* the FreeType Project License and this section (hereafter, "You" or */ +/* "Your") a perpetual, worldwide, non-exclusive, no-charge, */ +/* royalty-free, irrevocable (except as stated in this section) patent */ +/* license to make, have made, use, offer to sell, sell, import, and */ +/* otherwise transfer the Work, where such license applies only to those */ +/* patent claims licensable by such contributor that are necessarily */ +/* infringed by their contribution(s) alone or by combination of their */ +/* contribution(s) with the Work to which such contribution(s) was */ +/* submitted. If You institute patent litigation against any entity */ +/* (including a cross-claim or counterclaim in a lawsuit) alleging that */ +/* the Work or a contribution incorporated within the Work constitutes */ +/* direct or contributory patent infringement, then any patent licenses */ +/* granted to You under this License for that Work shall terminate as of */ +/* the date such litigation is filed. */ +/* */ +/* By using, modifying, or distributing the Work you indicate that you */ +/* have read and understood the terms and conditions of the */ +/* FreeType Project License as well as those provided in this section, */ +/* and you accept them fully. */ +/* */ +/***************************************************************************/ + + +#ifndef __CF2READ_H__ +#define __CF2READ_H__ + + +FT_BEGIN_HEADER + + + typedef struct CF2_BufferRec_ + { + FT_Error* error; + const FT_Byte* start; + const FT_Byte* end; + const FT_Byte* ptr; + + } CF2_BufferRec, *CF2_Buffer; + + + FT_LOCAL( CF2_Int ) + cf2_buf_readByte( CF2_Buffer buf ); + FT_LOCAL( FT_Bool ) + cf2_buf_isEnd( CF2_Buffer buf ); + + +FT_END_HEADER + + +#endif /* __CF2READ_H__ */ + + +/* END */ diff --git a/src/cff/cf2stack.c b/src/cff/cf2stack.c new file mode 100644 index 0000000..8332b5d --- /dev/null +++ b/src/cff/cf2stack.c @@ -0,0 +1,205 @@ +/***************************************************************************/ +/* */ +/* cf2stack.c */ +/* */ +/* Adobe's code for emulating a CFF stack (body). */ +/* */ +/* Copyright 2007-2013 Adobe Systems Incorporated. */ +/* */ +/* This software, and all works of authorship, whether in source or */ +/* object code form as indicated by the copyright notice(s) included */ +/* herein (collectively, the "Work") is made available, and may only be */ +/* used, modified, and distributed under the FreeType Project License, */ +/* LICENSE.TXT. Additionally, subject to the terms and conditions of the */ +/* FreeType Project License, each contributor to the Work hereby grants */ +/* to any individual or legal entity exercising permissions granted by */ +/* the FreeType Project License and this section (hereafter, "You" or */ +/* "Your") a perpetual, worldwide, non-exclusive, no-charge, */ +/* royalty-free, irrevocable (except as stated in this section) patent */ +/* license to make, have made, use, offer to sell, sell, import, and */ +/* otherwise transfer the Work, where such license applies only to those */ +/* patent claims licensable by such contributor that are necessarily */ +/* infringed by their contribution(s) alone or by combination of their */ +/* contribution(s) with the Work to which such contribution(s) was */ +/* submitted. If You institute patent litigation against any entity */ +/* (including a cross-claim or counterclaim in a lawsuit) alleging that */ +/* the Work or a contribution incorporated within the Work constitutes */ +/* direct or contributory patent infringement, then any patent licenses */ +/* granted to You under this License for that Work shall terminate as of */ +/* the date such litigation is filed. */ +/* */ +/* By using, modifying, or distributing the Work you indicate that you */ +/* have read and understood the terms and conditions of the */ +/* FreeType Project License as well as those provided in this section, */ +/* and you accept them fully. */ +/* */ +/***************************************************************************/ + + +#include "cf2ft.h" +#include FT_INTERNAL_DEBUG_H + +#include "cf2glue.h" +#include "cf2font.h" +#include "cf2stack.h" + +#include "cf2error.h" + + + /* Allocate and initialize an instance of CF2_Stack. */ + /* Note: This function returns NULL on error (does not set */ + /* `error'). */ + FT_LOCAL_DEF( CF2_Stack ) + cf2_stack_init( FT_Memory memory, + FT_Error* e ) + { + FT_Error error = FT_Err_Ok; /* for FT_QNEW */ + + CF2_Stack stack = NULL; + + + if ( !FT_QNEW( stack ) ) + { + /* initialize the structure; FT_QNEW zeroes it */ + stack->memory = memory; + stack->error = e; + stack->top = &stack->buffer[0]; /* empty stack */ + } + + return stack; + } + + + FT_LOCAL_DEF( void ) + cf2_stack_free( CF2_Stack stack ) + { + if ( stack ) + { + FT_Memory memory = stack->memory; + + + /* free the main structure */ + FT_FREE( stack ); + } + } + + + FT_LOCAL_DEF( CF2_UInt ) + cf2_stack_count( CF2_Stack stack ) + { + return (CF2_UInt)( stack->top - &stack->buffer[0] ); + } + + + FT_LOCAL_DEF( void ) + cf2_stack_pushInt( CF2_Stack stack, + CF2_Int val ) + { + if ( stack->top == &stack->buffer[CF2_OPERAND_STACK_SIZE] ) + { + CF2_SET_ERROR( stack->error, Stack_Overflow ); + return; /* stack overflow */ + } + + stack->top->u.i = val; + stack->top->type = CF2_NumberInt; + ++stack->top; + } + + + FT_LOCAL_DEF( void ) + cf2_stack_pushFixed( CF2_Stack stack, + CF2_Fixed val ) + { + if ( stack->top == &stack->buffer[CF2_OPERAND_STACK_SIZE] ) + { + CF2_SET_ERROR( stack->error, Stack_Overflow ); + return; /* stack overflow */ + } + + stack->top->u.r = val; + stack->top->type = CF2_NumberFixed; + ++stack->top; + } + + + /* this function is only allowed to pop an integer type */ + FT_LOCAL_DEF( CF2_Int ) + cf2_stack_popInt( CF2_Stack stack ) + { + if ( stack->top == &stack->buffer[0] ) + { + CF2_SET_ERROR( stack->error, Stack_Underflow ); + return 0; /* underflow */ + } + if ( stack->top[-1].type != CF2_NumberInt ) + { + CF2_SET_ERROR( stack->error, Syntax_Error ); + return 0; /* type mismatch */ + } + + --stack->top; + + return stack->top->u.i; + } + + + /* Note: type mismatch is silently cast */ + /* TODO: check this */ + FT_LOCAL_DEF( CF2_Fixed ) + cf2_stack_popFixed( CF2_Stack stack ) + { + if ( stack->top == &stack->buffer[0] ) + { + CF2_SET_ERROR( stack->error, Stack_Underflow ); + return cf2_intToFixed( 0 ); /* underflow */ + } + + --stack->top; + + switch ( stack->top->type ) + { + case CF2_NumberInt: + return cf2_intToFixed( stack->top->u.i ); + case CF2_NumberFrac: + return cf2_fracToFixed( stack->top->u.f ); + default: + return stack->top->u.r; + } + } + + + /* Note: type mismatch is silently cast */ + /* TODO: check this */ + FT_LOCAL_DEF( CF2_Fixed ) + cf2_stack_getReal( CF2_Stack stack, + CF2_UInt idx ) + { + FT_ASSERT( cf2_stack_count( stack ) <= CF2_OPERAND_STACK_SIZE ); + + if ( idx >= cf2_stack_count( stack ) ) + { + CF2_SET_ERROR( stack->error, Stack_Overflow ); + return cf2_intToFixed( 0 ); /* bounds error */ + } + + switch ( stack->buffer[idx].type ) + { + case CF2_NumberInt: + return cf2_intToFixed( stack->buffer[idx].u.i ); + case CF2_NumberFrac: + return cf2_fracToFixed( stack->buffer[idx].u.f ); + default: + return stack->buffer[idx].u.r; + } + } + + + FT_LOCAL_DEF( void ) + cf2_stack_clear( CF2_Stack stack ) + { + stack->top = &stack->buffer[0]; + } + + +/* END */ diff --git a/src/cff/cf2stack.h b/src/cff/cf2stack.h new file mode 100644 index 0000000..7d6d196 --- /dev/null +++ b/src/cff/cf2stack.h @@ -0,0 +1,106 @@ +/***************************************************************************/ +/* */ +/* cf2stack.h */ +/* */ +/* Adobe's code for emulating a CFF stack (specification). */ +/* */ +/* Copyright 2007-2013 Adobe Systems Incorporated. */ +/* */ +/* This software, and all works of authorship, whether in source or */ +/* object code form as indicated by the copyright notice(s) included */ +/* herein (collectively, the "Work") is made available, and may only be */ +/* used, modified, and distributed under the FreeType Project License, */ +/* LICENSE.TXT. Additionally, subject to the terms and conditions of the */ +/* FreeType Project License, each contributor to the Work hereby grants */ +/* to any individual or legal entity exercising permissions granted by */ +/* the FreeType Project License and this section (hereafter, "You" or */ +/* "Your") a perpetual, worldwide, non-exclusive, no-charge, */ +/* royalty-free, irrevocable (except as stated in this section) patent */ +/* license to make, have made, use, offer to sell, sell, import, and */ +/* otherwise transfer the Work, where such license applies only to those */ +/* patent claims licensable by such contributor that are necessarily */ +/* infringed by their contribution(s) alone or by combination of their */ +/* contribution(s) with the Work to which such contribution(s) was */ +/* submitted. If You institute patent litigation against any entity */ +/* (including a cross-claim or counterclaim in a lawsuit) alleging that */ +/* the Work or a contribution incorporated within the Work constitutes */ +/* direct or contributory patent infringement, then any patent licenses */ +/* granted to You under this License for that Work shall terminate as of */ +/* the date such litigation is filed. */ +/* */ +/* By using, modifying, or distributing the Work you indicate that you */ +/* have read and understood the terms and conditions of the */ +/* FreeType Project License as well as those provided in this section, */ +/* and you accept them fully. */ +/* */ +/***************************************************************************/ + + +#ifndef __CF2STACK_H__ +#define __CF2STACK_H__ + + +FT_BEGIN_HEADER + + + /* CFF operand stack; specified maximum of 48 or 192 values */ + typedef struct CF2_StackNumber_ + { + union + { + CF2_Fixed r; /* 16.16 fixed point */ + CF2_Frac f; /* 2.30 fixed point (for font matrix) */ + CF2_Int i; + } u; + + CF2_NumberType type; + + } CF2_StackNumber; + + + typedef struct CF2_StackRec_ + { + FT_Memory memory; + FT_Error* error; + CF2_StackNumber buffer[CF2_OPERAND_STACK_SIZE]; + CF2_StackNumber* top; + + } CF2_StackRec, *CF2_Stack; + + + FT_LOCAL( CF2_Stack ) + cf2_stack_init( FT_Memory memory, + FT_Error* error ); + FT_LOCAL( void ) + cf2_stack_free( CF2_Stack stack ); + + FT_LOCAL( CF2_UInt ) + cf2_stack_count( CF2_Stack stack ); + + FT_LOCAL( void ) + cf2_stack_pushInt( CF2_Stack stack, + CF2_Int val ); + FT_LOCAL( void ) + cf2_stack_pushFixed( CF2_Stack stack, + CF2_Fixed val ); + + FT_LOCAL( CF2_Int ) + cf2_stack_popInt( CF2_Stack stack ); + FT_LOCAL( CF2_Fixed ) + cf2_stack_popFixed( CF2_Stack stack ); + + FT_LOCAL( CF2_Fixed ) + cf2_stack_getReal( CF2_Stack stack, + CF2_UInt idx ); + + FT_LOCAL( void ) + cf2_stack_clear( CF2_Stack stack ); + + +FT_END_HEADER + + +#endif /* __CF2STACK_H__ */ + + +/* END */ diff --git a/src/cff/cf2types.h b/src/cff/cf2types.h new file mode 100644 index 0000000..ac6a022 --- /dev/null +++ b/src/cff/cf2types.h @@ -0,0 +1,78 @@ +/***************************************************************************/ +/* */ +/* cf2types.h */ +/* */ +/* Adobe's code for defining data types (specification only). */ +/* */ +/* Copyright 2011-2013 Adobe Systems Incorporated. */ +/* */ +/* This software, and all works of authorship, whether in source or */ +/* object code form as indicated by the copyright notice(s) included */ +/* herein (collectively, the "Work") is made available, and may only be */ +/* used, modified, and distributed under the FreeType Project License, */ +/* LICENSE.TXT. Additionally, subject to the terms and conditions of the */ +/* FreeType Project License, each contributor to the Work hereby grants */ +/* to any individual or legal entity exercising permissions granted by */ +/* the FreeType Project License and this section (hereafter, "You" or */ +/* "Your") a perpetual, worldwide, non-exclusive, no-charge, */ +/* royalty-free, irrevocable (except as stated in this section) patent */ +/* license to make, have made, use, offer to sell, sell, import, and */ +/* otherwise transfer the Work, where such license applies only to those */ +/* patent claims licensable by such contributor that are necessarily */ +/* infringed by their contribution(s) alone or by combination of their */ +/* contribution(s) with the Work to which such contribution(s) was */ +/* submitted. If You institute patent litigation against any entity */ +/* (including a cross-claim or counterclaim in a lawsuit) alleging that */ +/* the Work or a contribution incorporated within the Work constitutes */ +/* direct or contributory patent infringement, then any patent licenses */ +/* granted to You under this License for that Work shall terminate as of */ +/* the date such litigation is filed. */ +/* */ +/* By using, modifying, or distributing the Work you indicate that you */ +/* have read and understood the terms and conditions of the */ +/* FreeType Project License as well as those provided in this section, */ +/* and you accept them fully. */ +/* */ +/***************************************************************************/ + + +#ifndef __CF2TYPES_H__ +#define __CF2TYPES_H__ + +#include <ft2build.h> +#include FT_FREETYPE_H + + +FT_BEGIN_HEADER + + + /* + * The data models that we expect to support are as follows: + * + * name char short int long long-long pointer example + * ----------------------------------------------------- + * ILP32 8 16 32 32 64* 32 32-bit MacOS, x86 + * LLP64 8 16 32 32 64 64 x64 + * LP64 8 16 32 64 64 64 64-bit MacOS + * + * *) type may be supported by emulation on a 32-bit architecture + * + */ + + + /* integers at least 32 bits wide */ +#define CF2_UInt FT_UFast +#define CF2_Int FT_Fast + + + /* fixed-float numbers */ + typedef FT_Int32 CF2_F16Dot16; + + +FT_END_HEADER + + +#endif /* __CF2TYPES_H__ */ + + +/* END */ diff --git a/src/cff/cff.c b/src/cff/cff.c index fccfd44..c3840b5 100644 --- a/src/cff/cff.c +++ b/src/cff/cff.c @@ -4,7 +4,7 @@ /* */ /* FreeType OpenType driver component (body only). */ /* */ -/* Copyright 1996-2001, 2002 by */ +/* Copyright 1996-2001, 2002, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -19,6 +19,7 @@ #define FT_MAKE_OPTION_SINGLE_OBJECT #include <ft2build.h> + #include "cffpic.c" #include "cffdrivr.c" #include "cffparse.c" @@ -27,4 +28,14 @@ #include "cffgload.c" #include "cffcmap.c" +#include "cf2arrst.c" +#include "cf2blues.c" +#include "cf2error.c" +#include "cf2font.c" +#include "cf2ft.c" +#include "cf2hints.c" +#include "cf2intrp.c" +#include "cf2read.c" +#include "cf2stack.c" + /* END */ diff --git a/src/cff/cffcmap.c b/src/cff/cffcmap.c index 1298371..52248b2 100644 --- a/src/cff/cffcmap.c +++ b/src/cff/cffcmap.c @@ -4,7 +4,7 @@ /* */ /* CFF character mapping table (cmap) support (body). */ /* */ -/* Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2010 by */ +/* Copyright 2002-2007, 2010, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -16,6 +16,8 @@ /***************************************************************************/ +#include <ft2build.h> +#include FT_INTERNAL_DEBUG_H #include "cffcmap.h" #include "cffload.h" @@ -31,12 +33,15 @@ /*************************************************************************/ FT_CALLBACK_DEF( FT_Error ) - cff_cmap_encoding_init( CFF_CMapStd cmap ) + cff_cmap_encoding_init( CFF_CMapStd cmap, + FT_Pointer pointer ) { TT_Face face = (TT_Face)FT_CMAP_FACE( cmap ); CFF_Font cff = (CFF_Font)face->extra.data; CFF_Encoding encoding = &cff->encoding; + FT_UNUSED( pointer ); + cmap->gids = encoding->codes; @@ -133,7 +138,8 @@ FT_CALLBACK_DEF( FT_Error ) - cff_cmap_unicode_init( PS_Unicodes unicodes ) + cff_cmap_unicode_init( PS_Unicodes unicodes, + FT_Pointer pointer ) { TT_Face face = (TT_Face)FT_CMAP_FACE( unicodes ); FT_Memory memory = FT_FACE_MEMORY( face ); @@ -141,11 +147,13 @@ CFF_Charset charset = &cff->charset; FT_Service_PsCMaps psnames = (FT_Service_PsCMaps)cff->psnames; + FT_UNUSED( pointer ); + /* can't build Unicode map for CID-keyed font */ /* because we don't know glyph names. */ if ( !charset->sids ) - return CFF_Err_No_Unicode_Glyph_Name; + return FT_THROW( No_Unicode_Glyph_Name ); return psnames->unicodes_init( memory, unicodes, diff --git a/src/cff/cffdrivr.c b/src/cff/cffdrivr.c index eb4c14e..3e8898e 100644 --- a/src/cff/cffdrivr.c +++ b/src/cff/cffdrivr.c @@ -4,7 +4,7 @@ /* */ /* OpenType font driver implementation (body). */ /* */ -/* Copyright 1996-2012 by */ +/* Copyright 1996-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -37,6 +37,8 @@ #include FT_SERVICE_XFREE86_NAME_H #include FT_SERVICE_GLYPH_DICT_H +#include FT_SERVICE_PROPERTIES_H +#include FT_CFF_DRIVER_H /*************************************************************************/ @@ -115,7 +117,7 @@ if ( sfnt ) kerning->x = sfnt->get_kerning( face, left_glyph, right_glyph ); - return CFF_Err_Ok; + return FT_Err_Ok; } @@ -160,7 +162,9 @@ if ( !slot ) - return CFF_Err_Invalid_Slot_Handle; + return FT_THROW( Invalid_Slot_Handle ); + + FT_TRACE1(( "cff_glyph_load: glyph index %d\n", glyph_index )); /* check whether we want a scaled outline or bitmap */ if ( !size ) @@ -174,7 +178,7 @@ { /* these two objects must have the same parent */ if ( cffsize->face != cffslot->face ) - return CFF_Err_Invalid_Face_Handle; + return FT_THROW( Invalid_Face_Handle ); } /* now load the glyph outline if necessary */ @@ -195,7 +199,7 @@ FT_Fixed* advances ) { FT_UInt nn; - FT_Error error = CFF_Err_Ok; + FT_Error error = FT_Err_Ok; FT_GlyphSlot slot = face->glyph; @@ -239,7 +243,7 @@ " cannot get glyph name from CFF & CEF fonts\n" " " " without the `PSNames' module\n" )); - error = CFF_Err_Missing_Module; + error = FT_THROW( Missing_Module ); goto Exit; } @@ -252,7 +256,7 @@ if ( gname ) FT_STRCPYN( buffer, gname, buffer_max ); - error = CFF_Err_Ok; + error = FT_Err_Ok; Exit: return error; @@ -298,7 +302,8 @@ } - FT_DEFINE_SERVICE_GLYPHDICTREC(cff_service_glyph_dict, + FT_DEFINE_SERVICE_GLYPHDICTREC( + cff_service_glyph_dict, (FT_GlyphDict_GetNameFunc) cff_get_glyph_name, (FT_GlyphDict_NameIndexFunc)cff_get_name_index ) @@ -321,7 +326,7 @@ PS_FontInfoRec* afont_info ) { CFF_Font cff = (CFF_Font)face->extra.data; - FT_Error error = CFF_Err_Ok; + FT_Error error = FT_Err_Ok; if ( cff && cff->font_info == NULL ) @@ -360,7 +365,8 @@ } - FT_DEFINE_SERVICE_PSINFOREC(cff_service_ps_info, + FT_DEFINE_SERVICE_PSINFOREC( + cff_service_ps_info, (PS_GetFontInfoFunc) cff_ps_get_font_info, (PS_GetFontExtraFunc) NULL, (PS_HasGlyphNamesFunc) cff_ps_has_glyph_names, @@ -384,7 +390,8 @@ } - FT_DEFINE_SERVICE_PSFONTNAMEREC(cff_service_ps_name, + FT_DEFINE_SERVICE_PSFONTNAMEREC( + cff_service_ps_name, (FT_PsName_GetFunc)cff_get_ps_name ) @@ -404,16 +411,17 @@ TT_CMapInfo *cmap_info ) { FT_CMap cmap = FT_CMAP( charmap ); - FT_Error error = CFF_Err_Ok; - FT_Face face = FT_CMAP_FACE( cmap ); - FT_Library library = FT_FACE_LIBRARY( face ); + FT_Error error = FT_Err_Ok; + + FT_Face face = FT_CMAP_FACE( cmap ); + FT_Library library = FT_FACE_LIBRARY( face ); cmap_info->language = 0; cmap_info->format = 0; - if ( cmap->clazz != &FT_CFF_CMAP_ENCODING_CLASS_REC_GET && - cmap->clazz != &FT_CFF_CMAP_UNICODE_CLASS_REC_GET ) + if ( cmap->clazz != &CFF_CMAP_ENCODING_CLASS_REC_GET && + cmap->clazz != &CFF_CMAP_UNICODE_CLASS_REC_GET ) { FT_Module sfnt = FT_Get_Module( library, "sfnt" ); FT_Service_TTCMaps service = @@ -429,7 +437,8 @@ } - FT_DEFINE_SERVICE_TTCMAPSREC(cff_service_get_cmap_info, + FT_DEFINE_SERVICE_TTCMAPSREC( + cff_service_get_cmap_info, (TT_CMap_Info_GetFunc)cff_get_cmap_info ) @@ -444,7 +453,7 @@ const char* *ordering, FT_Int *supplement ) { - FT_Error error = CFF_Err_Ok; + FT_Error error = FT_Err_Ok; CFF_Font cff = (CFF_Font)face->extra.data; @@ -455,7 +464,7 @@ if ( dict->cid_registry == 0xFFFFU ) { - error = CFF_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Fail; } @@ -499,7 +508,7 @@ cff_get_is_cid( CFF_Face face, FT_Bool *is_cid ) { - FT_Error error = CFF_Err_Ok; + FT_Error error = FT_Err_Ok; CFF_Font cff = (CFF_Font)face->extra.data; @@ -523,7 +532,7 @@ FT_UInt glyph_index, FT_UInt *cid ) { - FT_Error error = CFF_Err_Ok; + FT_Error error = FT_Err_Ok; CFF_Font cff; @@ -537,13 +546,13 @@ if ( dict->cid_registry == 0xFFFFU ) { - error = CFF_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Fail; } if ( glyph_index > cff->num_glyphs ) { - error = CFF_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Fail; } @@ -558,13 +567,147 @@ } - FT_DEFINE_SERVICE_CIDREC(cff_service_cid_info, + FT_DEFINE_SERVICE_CIDREC( + cff_service_cid_info, (FT_CID_GetRegistryOrderingSupplementFunc)cff_get_ros, (FT_CID_GetIsInternallyCIDKeyedFunc) cff_get_is_cid, (FT_CID_GetCIDFromGlyphIndexFunc) cff_get_cid_from_glyph_index ) + /* + * PROPERTY SERVICE + * + */ + static FT_Error + cff_property_set( FT_Module module, /* CFF_Driver */ + const char* property_name, + const void* value ) + { + FT_Error error = FT_Err_Ok; + CFF_Driver driver = (CFF_Driver)module; + + + if ( !ft_strcmp( property_name, "darkening-parameters" ) ) + { + FT_Int* darken_params = (FT_Int*)value; + + FT_Int x1 = darken_params[0]; + FT_Int y1 = darken_params[1]; + FT_Int x2 = darken_params[2]; + FT_Int y2 = darken_params[3]; + FT_Int x3 = darken_params[4]; + FT_Int y3 = darken_params[5]; + FT_Int x4 = darken_params[6]; + FT_Int y4 = darken_params[7]; + + + if ( x1 < 0 || x2 < 0 || x3 < 0 || x4 < 0 || + y1 < 0 || y2 < 0 || y3 < 0 || y4 < 0 || + x1 > x2 || x2 > x3 || x3 > x4 || + y1 > 500 || y2 > 500 || y3 > 500 || y4 > 500 ) + return FT_THROW( Invalid_Argument ); + + driver->darken_params[0] = x1; + driver->darken_params[1] = y1; + driver->darken_params[2] = x2; + driver->darken_params[3] = y2; + driver->darken_params[4] = x3; + driver->darken_params[5] = y3; + driver->darken_params[6] = x4; + driver->darken_params[7] = y4; + + return error; + } + else if ( !ft_strcmp( property_name, "hinting-engine" ) ) + { + FT_UInt* hinting_engine = (FT_UInt*)value; + + +#ifndef CFF_CONFIG_OPTION_OLD_ENGINE + if ( *hinting_engine != FT_CFF_HINTING_ADOBE ) + error = FT_ERR( Unimplemented_Feature ); + else +#endif + driver->hinting_engine = *hinting_engine; + + return error; + } + else if ( !ft_strcmp( property_name, "no-stem-darkening" ) ) + { + FT_Bool* no_stem_darkening = (FT_Bool*)value; + + + driver->no_stem_darkening = *no_stem_darkening; + + return error; + } + + FT_TRACE0(( "cff_property_set: missing property `%s'\n", + property_name )); + return FT_THROW( Missing_Property ); + } + + + static FT_Error + cff_property_get( FT_Module module, /* CFF_Driver */ + const char* property_name, + const void* value ) + { + FT_Error error = FT_Err_Ok; + CFF_Driver driver = (CFF_Driver)module; + + + if ( !ft_strcmp( property_name, "darkening-parameters" ) ) + { + FT_Int* darken_params = driver->darken_params; + FT_Int* val = (FT_Int*)value; + + + val[0] = darken_params[0]; + val[1] = darken_params[1]; + val[2] = darken_params[2]; + val[3] = darken_params[3]; + val[4] = darken_params[4]; + val[5] = darken_params[5]; + val[6] = darken_params[6]; + val[7] = darken_params[7]; + + return error; + } + else if ( !ft_strcmp( property_name, "hinting-engine" ) ) + { + FT_UInt hinting_engine = driver->hinting_engine; + FT_UInt* val = (FT_UInt*)value; + + + *val = hinting_engine; + + return error; + } + else if ( !ft_strcmp( property_name, "no-stem-darkening" ) ) + { + FT_Bool no_stem_darkening = driver->no_stem_darkening; + FT_Bool* val = (FT_Bool*)value; + + + *val = no_stem_darkening; + + return error; + } + + FT_TRACE0(( "cff_property_get: missing property `%s'\n", + property_name )); + return FT_THROW( Missing_Property ); + } + + + FT_DEFINE_SERVICE_PROPERTIESREC( + cff_service_properties, + (FT_Properties_SetFunc)cff_property_set, + (FT_Properties_GetFunc)cff_property_get ) + + /*************************************************************************/ /*************************************************************************/ /*************************************************************************/ @@ -576,25 +719,31 @@ /*************************************************************************/ /*************************************************************************/ /*************************************************************************/ + #ifndef FT_CONFIG_OPTION_NO_GLYPH_NAMES - FT_DEFINE_SERVICEDESCREC6(cff_services, + FT_DEFINE_SERVICEDESCREC7( + cff_services, FT_SERVICE_ID_XF86_NAME, FT_XF86_FORMAT_CFF, - FT_SERVICE_ID_POSTSCRIPT_INFO, &FT_CFF_SERVICE_PS_INFO_GET, - FT_SERVICE_ID_POSTSCRIPT_FONT_NAME, &FT_CFF_SERVICE_PS_NAME_GET, - FT_SERVICE_ID_GLYPH_DICT, &FT_CFF_SERVICE_GLYPH_DICT_GET, - FT_SERVICE_ID_TT_CMAP, &FT_CFF_SERVICE_GET_CMAP_INFO_GET, - FT_SERVICE_ID_CID, &FT_CFF_SERVICE_CID_INFO_GET + FT_SERVICE_ID_POSTSCRIPT_INFO, &CFF_SERVICE_PS_INFO_GET, + FT_SERVICE_ID_POSTSCRIPT_FONT_NAME, &CFF_SERVICE_PS_NAME_GET, + FT_SERVICE_ID_GLYPH_DICT, &CFF_SERVICE_GLYPH_DICT_GET, + FT_SERVICE_ID_TT_CMAP, &CFF_SERVICE_GET_CMAP_INFO_GET, + FT_SERVICE_ID_CID, &CFF_SERVICE_CID_INFO_GET, + FT_SERVICE_ID_PROPERTIES, &CFF_SERVICE_PROPERTIES_GET ) #else - FT_DEFINE_SERVICEDESCREC5(cff_services, + FT_DEFINE_SERVICEDESCREC6( + cff_services, FT_SERVICE_ID_XF86_NAME, FT_XF86_FORMAT_CFF, - FT_SERVICE_ID_POSTSCRIPT_INFO, &FT_CFF_SERVICE_PS_INFO_GET, - FT_SERVICE_ID_POSTSCRIPT_FONT_NAME, &FT_CFF_SERVICE_PS_NAME_GET, - FT_SERVICE_ID_TT_CMAP, &FT_CFF_SERVICE_GET_CMAP_INFO_GET, - FT_SERVICE_ID_CID, &FT_CFF_SERVICE_CID_INFO_GET + FT_SERVICE_ID_POSTSCRIPT_INFO, &CFF_SERVICE_PS_INFO_GET, + FT_SERVICE_ID_POSTSCRIPT_FONT_NAME, &CFF_SERVICE_PS_NAME_GET, + FT_SERVICE_ID_TT_CMAP, &CFF_SERVICE_GET_CMAP_INFO_GET, + FT_SERVICE_ID_CID, &CFF_SERVICE_CID_INFO_GET, + FT_SERVICE_ID_PROPERTIES, &CFF_SERVICE_PROPERTIES_GET ) #endif + FT_CALLBACK_DEF( FT_Module_Interface ) cff_get_interface( FT_Module driver, /* CFF_Driver */ const char* module_interface ) @@ -604,7 +753,7 @@ FT_Module_Interface result; - /* FT_CFF_SERVICES_GET derefers `library' in PIC mode */ + /* CFF_SERVICES_GET dereferences `library' in PIC mode */ #ifdef FT_CONFIG_OPTION_PIC if ( !driver ) return NULL; @@ -613,7 +762,7 @@ return NULL; #endif - result = ft_service_list_lookup( FT_CFF_SERVICES_GET, module_interface ); + result = ft_service_list_lookup( CFF_SERVICES_GET, module_interface ); if ( result != NULL ) return result; @@ -641,7 +790,8 @@ #define CFF_SIZE_SELECT 0 #endif - FT_DEFINE_DRIVER( cff_driver_class, + FT_DEFINE_DRIVER( + cff_driver_class, FT_MODULE_FONT_DRIVER | FT_MODULE_DRIVER_SCALABLE | @@ -670,9 +820,6 @@ cff_slot_init, cff_slot_done, - ft_stub_set_char_sizes, /* FT_CONFIG_OPTION_OLD_INTERNALS */ - ft_stub_set_pixel_sizes, /* FT_CONFIG_OPTION_OLD_INTERNALS */ - cff_glyph_load, cff_get_kerning, diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c index 84847fd..758a3d3 100644 --- a/src/cff/cffgload.c +++ b/src/cff/cffgload.c @@ -4,7 +4,7 @@ /* */ /* OpenType Glyph Loader (body). */ /* */ -/* Copyright 1996-2012 by */ +/* Copyright 1996-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -21,10 +21,12 @@ #include FT_INTERNAL_STREAM_H #include FT_INTERNAL_SFNT_H #include FT_OUTLINE_H +#include FT_CFF_DRIVER_H #include "cffobjs.h" #include "cffload.h" #include "cffgload.h" +#include "cf2ft.h" /* for cf2_decoder_parse_charstrings */ #include "cfferrs.h" @@ -39,6 +41,8 @@ #define FT_COMPONENT trace_cffgload +#ifdef CFF_CONFIG_OPTION_OLD_ENGINE + typedef enum CFF_Operator_ { cff_op_unknown = 0, @@ -209,6 +213,8 @@ 2 /* setcurrentpoint */ }; +#endif /* CFF_CONFIG_OPTION_OLD_ENGINE */ + /*************************************************************************/ /*************************************************************************/ @@ -412,7 +418,7 @@ CFF_Builder *builder = &decoder->builder; CFF_Font cff = (CFF_Font)builder->face->extra.data; CFF_SubFont sub = &cff->top_font; - FT_Error error = CFF_Err_Ok; + FT_Error error = FT_Err_Ok; /* manage CID fonts */ @@ -424,11 +430,11 @@ if ( fd_index >= cff->num_subfonts ) { FT_TRACE4(( "cff_decoder_prepare: invalid CID subfont index\n" )); - error = CFF_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } - FT_TRACE3(( "glyph index %d (subfont %d):\n", glyph_index, fd_index )); + FT_TRACE3(( " in subfont %d:\n", fd_index )); sub = cff->subfonts[fd_index]; @@ -441,10 +447,6 @@ builder->hints_globals = (void *)internal->subfonts[fd_index]; } } -#ifdef FT_DEBUG_LEVEL_TRACE - else - FT_TRACE3(( "glyph index %d:\n", glyph_index )); -#endif decoder->num_locals = sub->local_subrs_index.count; decoder->locals = sub->local_subrs; @@ -455,22 +457,24 @@ decoder->glyph_width = sub->private_dict.default_width; decoder->nominal_width = sub->private_dict.nominal_width; + decoder->current_subfont = sub; /* for Adobe's CFF handler */ + Exit: return error; } /* check that there is enough space for `count' more points */ - static FT_Error - check_points( CFF_Builder* builder, - FT_Int count ) + FT_LOCAL_DEF( FT_Error ) + cff_check_points( CFF_Builder* builder, + FT_Int count ) { return FT_GLYPHLOADER_CHECK_POINTS( builder->loader, count, 0 ); } /* add a new point, do not check space */ - static void + FT_LOCAL_DEF( void ) cff_builder_add_point( CFF_Builder* builder, FT_Pos x, FT_Pos y, @@ -484,9 +488,22 @@ FT_Vector* point = outline->points + outline->n_points; FT_Byte* control = (FT_Byte*)outline->tags + outline->n_points; +#ifdef CFF_CONFIG_OPTION_OLD_ENGINE + CFF_Driver driver = (CFF_Driver)FT_FACE_DRIVER( builder->face ); + - point->x = x >> 16; - point->y = y >> 16; + if ( driver->hinting_engine == FT_CFF_HINTING_FREETYPE ) + { + point->x = x >> 16; + point->y = y >> 16; + } + else +#endif + { + /* cf2_decoder_parse_charstrings uses 16.16 coordinates */ + point->x = x >> 10; + point->y = y >> 10; + } *control = (FT_Byte)( flag ? FT_CURVE_TAG_ON : FT_CURVE_TAG_CUBIC ); } @@ -495,7 +512,7 @@ /* check space for a new on-curve point, then add it */ - static FT_Error + FT_LOCAL_DEF( FT_Error ) cff_builder_add_point1( CFF_Builder* builder, FT_Pos x, FT_Pos y ) @@ -503,7 +520,7 @@ FT_Error error; - error = check_points( builder, 1 ); + error = cff_check_points( builder, 1 ); if ( !error ) cff_builder_add_point( builder, x, y, 1 ); @@ -522,7 +539,7 @@ if ( !builder->load_points ) { outline->n_contours++; - return CFF_Err_Ok; + return FT_Err_Ok; } error = FT_GLYPHLOADER_CHECK_POINTS( builder->loader, 0, 1 ); @@ -540,12 +557,12 @@ /* if a path was begun, add its first on-curve point */ - static FT_Error + FT_LOCAL_DEF( FT_Error ) cff_builder_start_point( CFF_Builder* builder, FT_Pos x, FT_Pos y ) { - FT_Error error = CFF_Err_Ok; + FT_Error error = FT_Err_Ok; /* test whether we are building a new contour */ @@ -562,7 +579,7 @@ /* close the current contour */ - static void + FT_LOCAL_DEF( void ) cff_builder_close_contour( CFF_Builder* builder ) { FT_Outline* outline = builder->current; @@ -607,7 +624,7 @@ } - static FT_Int + FT_LOCAL_DEF( FT_Int ) cff_lookup_glyph_by_stdcharcode( CFF_Font cff, FT_Int charcode ) { @@ -636,7 +653,7 @@ } - static FT_Error + FT_LOCAL_DEF( FT_Error ) cff_get_glyph_data( TT_Face face, FT_UInt glyph_index, FT_Byte** pointer, @@ -672,7 +689,7 @@ } - static void + FT_LOCAL_DEF( void ) cff_free_glyph_data( TT_Face face, FT_Byte** pointer, FT_ULong length ) @@ -686,7 +703,7 @@ /* callback function. */ if ( face->root.internal->incremental_interface ) { - FT_Data data; + FT_Data data; data.pointer = *pointer; @@ -707,6 +724,8 @@ } +#ifdef CFF_CONFIG_OPTION_OLD_ENGINE + static FT_Error cff_operator_seac( CFF_Decoder* decoder, FT_Pos asb, @@ -728,7 +747,7 @@ if ( decoder->seac ) { FT_ERROR(( "cff_operator_seac: invalid nested seac\n" )); - return CFF_Err_Syntax_Error; + return FT_THROW( Syntax_Error ); } adx += decoder->builder.left_bearing.x; @@ -756,7 +775,7 @@ { FT_ERROR(( "cff_operator_seac:" " invalid seac character code arguments\n" )); - return CFF_Err_Syntax_Error; + return FT_THROW( Syntax_Error ); } /* If we are trying to load a composite glyph, do not load the */ @@ -925,7 +944,7 @@ limit = zone->limit = charstring_base + charstring_len; ip = zone->cursor = zone->base; - error = CFF_Err_Ok; + error = FT_Err_Ok; x = builder->pos_x; y = builder->pos_y; @@ -953,11 +972,14 @@ /* this is an operand, push it on the stack */ + + /* if we use shifts, all computations are done with unsigned */ + /* values; the conversion to a signed value is the last step */ if ( v == 28 ) { if ( ip + 1 >= limit ) goto Syntax_Error; - val = (FT_Short)( ( (FT_Short)ip[0] << 8 ) | ip[1] ); + val = (FT_Short)( ( (FT_UShort)ip[0] << 8 ) | ip[1] ); ip += 2; } else if ( v < 247 ) @@ -978,10 +1000,10 @@ { if ( ip + 3 >= limit ) goto Syntax_Error; - val = ( (FT_Int32)ip[0] << 24 ) | - ( (FT_Int32)ip[1] << 16 ) | - ( (FT_Int32)ip[2] << 8 ) | - ip[3]; + val = (FT_Int32)( ( (FT_UInt32)ip[0] << 24 ) | + ( (FT_UInt32)ip[1] << 16 ) | + ( (FT_UInt32)ip[2] << 8 ) | + (FT_UInt32)ip[3] ); ip += 4; if ( charstring_type == 2 ) shift = 0; @@ -989,12 +1011,12 @@ if ( decoder->top - stack >= CFF_MAX_OPERANDS ) goto Stack_Overflow; - val <<= shift; + val = (FT_Int32)( (FT_UInt32)val << shift ); *decoder->top++ = val; #ifdef FT_DEBUG_LEVEL_TRACE if ( !( val & 0xFFFFL ) ) - FT_TRACE4(( " %ld", (FT_Int32)( val >> 16 ) )); + FT_TRACE4(( " %hd", (FT_Short)( (FT_UInt32)val >> 16 ) )); else FT_TRACE4(( " %.2f", val / 65536.0 )); #endif @@ -1411,8 +1433,8 @@ case cff_op_rlineto: FT_TRACE4(( " rlineto\n" )); - if ( cff_builder_start_point ( builder, x, y ) || - check_points( builder, num_args / 2 ) ) + if ( cff_builder_start_point( builder, x, y ) || + cff_check_points( builder, num_args / 2 ) ) goto Fail; if ( num_args < 2 ) @@ -1446,8 +1468,8 @@ if ( num_args == 0 ) break; - if ( cff_builder_start_point ( builder, x, y ) || - check_points( builder, num_args ) ) + if ( cff_builder_start_point( builder, x, y ) || + cff_check_points( builder, num_args ) ) goto Fail; args = stack; @@ -1480,8 +1502,8 @@ nargs = num_args - num_args % 6; - if ( cff_builder_start_point ( builder, x, y ) || - check_points( builder, nargs / 2 ) ) + if ( cff_builder_start_point( builder, x, y ) || + cff_check_points( builder, nargs / 2 ) ) goto Fail; args -= nargs; @@ -1529,7 +1551,7 @@ nargs--; } - if ( check_points( builder, 3 * ( nargs / 4 ) ) ) + if ( cff_check_points( builder, 3 * ( nargs / 4 ) ) ) goto Fail; while ( args < decoder->top ) @@ -1573,7 +1595,7 @@ nargs--; } - if ( check_points( builder, 3 * ( nargs / 4 ) ) ) + if ( cff_check_points( builder, 3 * ( nargs / 4 ) ) ) goto Fail; while ( args < decoder->top ) @@ -1613,7 +1635,7 @@ nargs = num_args & ~2; args -= nargs; - if ( check_points( builder, ( nargs / 4 ) * 3 ) ) + if ( cff_check_points( builder, ( nargs / 4 ) * 3 ) ) goto Stack_Underflow; phase = ( op == cff_op_hvcurveto ); @@ -1666,8 +1688,8 @@ nargs = num_args & ~1; num_lines = ( nargs - 6 ) / 2; - if ( cff_builder_start_point( builder, x, y ) || - check_points( builder, num_lines + 3 ) ) + if ( cff_builder_start_point( builder, x, y ) || + cff_check_points( builder, num_lines + 3 ) ) goto Fail; args -= nargs; @@ -1711,8 +1733,8 @@ nargs = nargs - nargs % 6 + 2; num_curves = ( nargs - 2 ) / 6; - if ( cff_builder_start_point ( builder, x, y ) || - check_points( builder, num_curves * 3 + 2 ) ) + if ( cff_builder_start_point( builder, x, y ) || + cff_check_points( builder, num_curves * 3 + 2 ) ) goto Fail; args -= nargs; @@ -1752,7 +1774,7 @@ /* -- make sure we have enough space for the start point if it */ /* needs to be added */ if ( cff_builder_start_point( builder, x, y ) || - check_points( builder, 6 ) ) + cff_check_points( builder, 6 ) ) goto Fail; /* record the starting point's y position for later use */ @@ -1801,7 +1823,7 @@ /* adding six more points; 4 control points, 2 on-curve points */ if ( cff_builder_start_point( builder, x, y ) || - check_points( builder, 6 ) ) + cff_check_points( builder, 6 ) ) goto Fail; /* record the starting point's y-position for later use */ @@ -1854,7 +1876,7 @@ /* adding six more points; 4 control points, 2 on-curve points */ if ( cff_builder_start_point( builder, x, y ) || - check_points( builder, 6 ) ) + cff_check_points( builder, 6 ) ) goto Fail; /* record the starting point's x, y position for later use */ @@ -1917,7 +1939,7 @@ FT_TRACE4(( " flex\n" )); if ( cff_builder_start_point( builder, x, y ) || - check_points( builder, 6 ) ) + cff_check_points( builder, 6 ) ) goto Fail; for ( count = 6; count > 0; count-- ) @@ -1967,9 +1989,6 @@ } else { - if ( !error ) - error = CFF_Err_Ok; - cff_builder_close_contour( builder ); /* close hints recording session */ @@ -1980,10 +1999,12 @@ goto Syntax_Error; /* apply hints to the loaded glyph outline now */ - hinter->apply( hinter->hints, - builder->current, - (PSH_Globals)builder->hints_globals, - decoder->hint_mode ); + error = hinter->apply( hinter->hints, + builder->current, + (PSH_Globals)builder->hints_globals, + decoder->hint_mode ); + if ( error ) + goto Fail; } /* add current outline to the glyph slot */ @@ -2470,7 +2491,7 @@ FT_ERROR(( " %d", ip[0] )); FT_ERROR(( "\n" )); - return CFF_Err_Unimplemented_Feature; + return FT_THROW( Unimplemented_Feature ); } decoder->top = args; @@ -2489,17 +2510,19 @@ Syntax_Error: FT_TRACE4(( "cff_decoder_parse_charstrings: syntax error\n" )); - return CFF_Err_Invalid_File_Format; + return FT_THROW( Invalid_File_Format ); Stack_Underflow: FT_TRACE4(( "cff_decoder_parse_charstrings: stack underflow\n" )); - return CFF_Err_Too_Few_Arguments; + return FT_THROW( Too_Few_Arguments ); Stack_Overflow: FT_TRACE4(( "cff_decoder_parse_charstrings: stack overflow\n" )); - return CFF_Err_Stack_Overflow; + return FT_THROW( Stack_Overflow ); } +#endif /* CFF_CONFIG_OPTION_OLD_ENGINE */ + /*************************************************************************/ /*************************************************************************/ @@ -2526,7 +2549,7 @@ cff_compute_max_advance( TT_Face face, FT_Int* max_advance ) { - FT_Error error = CFF_Err_Ok; + FT_Error error = FT_Err_Ok; CFF_Decoder decoder; FT_Int glyph_index; CFF_Font cff = (CFF_Font)face->other; @@ -2564,12 +2587,12 @@ } /* ignore the error if one has occurred -- skip to next glyph */ - error = CFF_Err_Ok; + error = FT_Err_Ok; } *max_advance = decoder.builder.advance.x; - return CFF_Err_Ok; + return FT_Err_Ok; } @@ -2585,7 +2608,7 @@ FT_Error error; CFF_Decoder decoder; TT_Face face = (TT_Face)glyph->root.face; - FT_Bool hinting, force_scaling; + FT_Bool hinting, scaled, force_scaling; CFF_Font cff = (CFF_Font)face->extra.data; FT_Matrix font_matrix; @@ -2606,11 +2629,11 @@ glyph_index = cff_charset_cid_to_gindex( &cff->charset, glyph_index ); if ( glyph_index == 0 ) - return CFF_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); } } else if ( glyph_index >= cff->num_glyphs ) - return CFF_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); if ( load_flags & FT_LOAD_NO_RECURSE ) load_flags |= FT_LOAD_NO_SCALE | FT_LOAD_NO_HINTING; @@ -2653,6 +2676,11 @@ if ( !error ) { + FT_Bool has_vertical_info; + FT_UShort advance; + FT_Short dummy; + + glyph->root.outline.n_points = 0; glyph->root.outline.n_contours = 0; @@ -2679,6 +2707,39 @@ glyph->root.bitmap_left = metrics.horiBearingX; glyph->root.bitmap_top = metrics.horiBearingY; } + + /* compute linear advance widths */ + + (void)( (SFNT_Service)face->sfnt )->get_metrics( face, 0, + glyph_index, + &dummy, + &advance ); + glyph->root.linearHoriAdvance = advance; + + has_vertical_info = FT_BOOL( + face->vertical_info && + face->vertical.number_Of_VMetrics > 0 ); + + /* get the vertical metrics from the vtmx table if we have one */ + if ( has_vertical_info ) + { + (void)( (SFNT_Service)face->sfnt )->get_metrics( face, 1, + glyph_index, + &dummy, + &advance ); + glyph->root.linearVertAdvance = advance; + } + else + { + /* make up vertical ones */ + if ( face->os2.version != 0xFFFFU ) + glyph->root.linearVertAdvance = (FT_Pos) + ( face->os2.sTypoAscender - face->os2.sTypoDescender ); + else + glyph->root.linearVertAdvance = (FT_Pos) + ( face->horizontal.Ascender - face->horizontal.Descender ); + } + return error; } } @@ -2688,7 +2749,7 @@ /* return immediately if we only want the embedded bitmaps */ if ( load_flags & FT_LOAD_SBITS_ONLY ) - return CFF_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); /* if we have a CID subfont, use its matrix (which has already */ /* been multiplied with the root matrix) */ @@ -2700,6 +2761,7 @@ FT_Byte fd_index = cff_fd_select_get( &cff->fd_select, glyph_index ); + if ( fd_index >= cff->num_subfonts ) fd_index = (FT_Byte)( cff->num_subfonts - 1 ); @@ -2727,12 +2789,21 @@ glyph->root.outline.n_points = 0; glyph->root.outline.n_contours = 0; - hinting = FT_BOOL( ( load_flags & FT_LOAD_NO_SCALE ) == 0 && - ( load_flags & FT_LOAD_NO_HINTING ) == 0 ); + /* top-level code ensures that FT_LOAD_NO_HINTING is set */ + /* if FT_LOAD_NO_SCALE is active */ + hinting = FT_BOOL( ( load_flags & FT_LOAD_NO_HINTING ) == 0 ); + scaled = FT_BOOL( ( load_flags & FT_LOAD_NO_SCALE ) == 0 ); + glyph->hint = hinting; + glyph->scaled = scaled; glyph->root.format = FT_GLYPH_FORMAT_OUTLINE; /* by default */ { +#ifdef CFF_CONFIG_OPTION_OLD_ENGINE + CFF_Driver driver = (CFF_Driver)FT_FACE_DRIVER( face ); +#endif + + FT_Byte* charstring; FT_ULong charstring_len; @@ -2756,9 +2827,35 @@ if ( error ) goto Glyph_Build_Finished; - error = cff_decoder_parse_charstrings( &decoder, - charstring, - charstring_len ); +#ifdef CFF_CONFIG_OPTION_OLD_ENGINE + /* choose which CFF renderer to use */ + if ( driver->hinting_engine == FT_CFF_HINTING_FREETYPE ) + error = cff_decoder_parse_charstrings( &decoder, + charstring, + charstring_len ); + else +#endif + { + error = cf2_decoder_parse_charstrings( &decoder, + charstring, + charstring_len ); + + /* Adobe's engine uses 16.16 numbers everywhere; */ + /* as a consequence, glyphs larger than 2000ppem get rejected */ + if ( FT_ERR_EQ( error, Glyph_Too_Big ) ) + { + /* this time, we retry unhinted and scale up the glyph later on */ + /* (the engine uses and sets the hardcoded value 0x10000 / 64 = */ + /* 0x400 for both `x_scale' and `y_scale' in this case) */ + hinting = FALSE; + force_scaling = TRUE; + glyph->hint = hinting; + + error = cf2_decoder_parse_charstrings( &decoder, + charstring, + charstring_len ); + } + } cff_free_glyph_data( face, &charstring, charstring_len ); @@ -2856,14 +2953,8 @@ glyph->root.linearHoriAdvance = decoder.glyph_width; glyph->root.internal->glyph_transformed = 0; -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS - has_vertical_info = FT_BOOL( face->vertical_info && - face->vertical.number_Of_VMetrics > 0 && - face->vertical.long_metrics ); -#else has_vertical_info = FT_BOOL( face->vertical_info && face->vertical.number_Of_VMetrics > 0 ); -#endif /* get the vertical metrics from the vtmx table if we have one */ if ( has_vertical_info ) @@ -2872,10 +2963,10 @@ FT_UShort vertAdvance = 0; - ( (SFNT_Service)face->sfnt )->get_metrics( face, 1, - glyph_index, - &vertBearingY, - &vertAdvance ); + (void)( (SFNT_Service)face->sfnt )->get_metrics( face, 1, + glyph_index, + &vertBearingY, + &vertAdvance ); metrics->vertBearingY = vertBearingY; metrics->vertAdvance = vertAdvance; } diff --git a/src/cff/cffgload.h b/src/cff/cffgload.h index 38937be..41df7db 100644 --- a/src/cff/cffgload.h +++ b/src/cff/cffgload.h @@ -4,7 +4,7 @@ /* */ /* OpenType Glyph Loader (specification). */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 by */ +/* Copyright 1996-2004, 2006-2009, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -106,6 +106,41 @@ FT_BEGIN_HEADER } CFF_Builder; + FT_LOCAL( FT_Error ) + cff_check_points( CFF_Builder* builder, + FT_Int count ); + + FT_LOCAL( void ) + cff_builder_add_point( CFF_Builder* builder, + FT_Pos x, + FT_Pos y, + FT_Byte flag ); + FT_LOCAL( FT_Error ) + cff_builder_add_point1( CFF_Builder* builder, + FT_Pos x, + FT_Pos y ); + FT_LOCAL( FT_Error ) + cff_builder_start_point( CFF_Builder* builder, + FT_Pos x, + FT_Pos y ); + FT_LOCAL( void ) + cff_builder_close_contour( CFF_Builder* builder ); + + + FT_LOCAL( FT_Int ) + cff_lookup_glyph_by_stdcharcode( CFF_Font cff, + FT_Int charcode ); + FT_LOCAL( FT_Error ) + cff_get_glyph_data( TT_Face face, + FT_UInt glyph_index, + FT_Byte** pointer, + FT_ULong* length ); + FT_LOCAL( void ) + cff_free_glyph_data( TT_Face face, + FT_Byte** pointer, + FT_ULong length ); + + /* execution context charstring zone */ typedef struct CFF_Decoder_Zone_ @@ -156,6 +191,8 @@ FT_BEGIN_HEADER FT_Bool seac; + CFF_SubFont current_subfont; /* for current glyph_index */ + } CFF_Decoder; @@ -181,10 +218,12 @@ FT_BEGIN_HEADER #endif /* 0 */ +#ifdef CFF_CONFIG_OPTION_OLD_ENGINE FT_LOCAL( FT_Error ) cff_decoder_parse_charstrings( CFF_Decoder* decoder, FT_Byte* charstring_base, FT_ULong charstring_len ); +#endif FT_LOCAL( FT_Error ) cff_slot_load( CFF_GlyphSlot glyph, diff --git a/src/cff/cffload.c b/src/cff/cffload.c index 2be6ba0..d9bec59 100644 --- a/src/cff/cffload.c +++ b/src/cff/cffload.c @@ -4,7 +4,7 @@ /* */ /* OpenType and CFF data/program tables loader (body). */ /* */ -/* Copyright 1996-2011 by */ +/* Copyright 1996-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -250,7 +250,7 @@ if ( offsize < 1 || offsize > 4 ) { - error = CFF_Err_Invalid_Table; + error = FT_THROW( Invalid_Table ); goto Exit; } @@ -269,7 +269,7 @@ if ( size == 0 ) { - error = CFF_Err_Invalid_Table; + error = FT_THROW( Invalid_Table ); goto Exit; } @@ -318,7 +318,7 @@ static FT_Error cff_index_load_offsets( CFF_Index idx ) { - FT_Error error = CFF_Err_Ok; + FT_Error error = FT_Err_Ok; FT_Stream stream = idx->stream; FT_Memory memory = stream->memory; @@ -384,9 +384,10 @@ FT_Byte*** table, FT_Byte** pool ) { - FT_Error error = CFF_Err_Ok; + FT_Error error = FT_Err_Ok; FT_Memory memory = idx->stream->memory; - FT_Byte** t = NULL; + + FT_Byte** t = NULL; FT_Byte* new_bytes = NULL; @@ -413,7 +414,7 @@ cur_offset = idx->offsets[0] - 1; /* sanity check */ - if ( cur_offset >= idx->data_size ) + if ( cur_offset != 0 ) { FT_TRACE0(( "cff_index_get_pointers:" " invalid first offset value %d set to zero\n", @@ -431,11 +432,11 @@ FT_ULong next_offset = idx->offsets[n] - 1; - /* empty slot + two sanity checks for invalid offset tables */ - if ( next_offset == 0 || - next_offset < cur_offset || - ( next_offset >= idx->data_size && n < idx->count ) ) + /* two sanity checks for invalid offset tables */ + if ( next_offset < cur_offset ) next_offset = cur_offset; + else if ( next_offset > idx->data_size ) + next_offset = idx->data_size; if ( !pool ) t[n] = org_bytes + next_offset; @@ -471,7 +472,7 @@ FT_Byte** pbytes, FT_ULong* pbyte_len ) { - FT_Error error = CFF_Err_Ok; + FT_Error error = FT_Err_Ok; if ( idx && idx->count > element ) @@ -556,7 +557,7 @@ } } else - error = CFF_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); Exit: return error; @@ -688,6 +689,13 @@ if ( FT_READ_USHORT( num_ranges ) ) goto Exit; + if ( !num_ranges ) + { + FT_TRACE0(( "CFF_Load_FD_Select: empty FDSelect array\n" )); + error = FT_THROW( Invalid_File_Format ); + goto Exit; + } + fdselect->data_size = num_ranges * 3 + 2; Load_Data: @@ -696,7 +704,7 @@ break; default: /* hmm... that's wrong */ - error = CFF_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); } Exit: @@ -718,7 +726,7 @@ break; case 3: - /* first, compare to cache */ + /* first, compare to the cache */ if ( (FT_UInt)( glyph_index - fdselect->cache_first ) < fdselect->cache_count ) { @@ -726,7 +734,7 @@ break; } - /* then, lookup the ranges array */ + /* then, look up the ranges array */ { FT_Byte* p = fdselect->data; FT_Byte* p_limit = p + fdselect->data_size; @@ -749,7 +757,7 @@ /* update cache */ fdselect->cache_first = first; - fdselect->cache_count = limit-first; + fdselect->cache_count = limit - first; fdselect->cache_fd = fd2; break; } @@ -780,7 +788,7 @@ FT_UInt num_glyphs, FT_Memory memory ) { - FT_Error error = CFF_Err_Ok; + FT_Error error = FT_Err_Ok; FT_UInt i; FT_Long j; FT_UShort max_cid = 0; @@ -859,7 +867,7 @@ FT_Bool invert ) { FT_Memory memory = stream->memory; - FT_Error error = CFF_Err_Ok; + FT_Error error = FT_Err_Ok; FT_UShort glyph_sid; @@ -943,7 +951,7 @@ default: FT_ERROR(( "cff_charset_load: invalid table format\n" )); - error = CFF_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } } @@ -966,7 +974,7 @@ { FT_ERROR(( "cff_charset_load: implicit charset larger than\n" "predefined charset (Adobe ISO-Latin)\n" )); - error = CFF_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } @@ -984,7 +992,7 @@ { FT_ERROR(( "cff_charset_load: implicit charset larger than\n" "predefined charset (Adobe Expert)\n" )); - error = CFF_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } @@ -1002,7 +1010,7 @@ { FT_ERROR(( "cff_charset_load: implicit charset larger than\n" "predefined charset (Adobe Expert Subset)\n" )); - error = CFF_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } @@ -1016,7 +1024,7 @@ break; default: - error = CFF_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } } @@ -1057,7 +1065,7 @@ FT_ULong base_offset, FT_ULong offset ) { - FT_Error error = CFF_Err_Ok; + FT_Error error = FT_Err_Ok; FT_UInt count; FT_UInt j; FT_UShort glyph_sid; @@ -1067,7 +1075,7 @@ /* Check for charset->sids. If we do not have this, we fail. */ if ( !charset->sids ) { - error = CFF_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } @@ -1187,7 +1195,7 @@ default: FT_ERROR(( "cff_encoding_load: invalid table format\n" )); - error = CFF_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } @@ -1280,7 +1288,7 @@ default: FT_ERROR(( "cff_encoding_load: invalid table format\n" )); - error = CFF_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } } @@ -1313,7 +1321,7 @@ /* set defaults */ FT_MEM_ZERO( top, sizeof ( *top ) ); - top->underline_position = -100L << 16; + top->underline_position = -( 100L << 16 ); top->underline_thickness = 50L << 16; top->charstring_type = 2; top->font_matrix.xx = 0x10000L; @@ -1439,6 +1447,7 @@ FT_ULong base_offset; CFF_FontRecDict dict; CFF_IndexRec string_index; + FT_Int subfont_index; FT_ZERO( font ); @@ -1459,7 +1468,7 @@ font->absolute_offsize > 4 ) { FT_TRACE2(( " not a CFF font header\n" )); - error = CFF_Err_Unknown_File_Format; + error = FT_THROW( Unknown_File_Format ); goto Exit; } @@ -1483,13 +1492,35 @@ font->num_strings = string_index.count; - /* well, we don't really forget the `disabled' fonts... */ - font->num_faces = font->name_index.count; - if ( face_index >= (FT_Int)font->num_faces ) + if ( pure_cff ) + { + /* well, we don't really forget the `disabled' fonts... */ + subfont_index = face_index; + + if ( subfont_index >= (FT_Int)font->name_index.count ) + { + FT_ERROR(( "cff_font_load:" + " invalid subfont index for pure CFF font (%d)\n", + subfont_index )); + error = FT_THROW( Invalid_Argument ); + goto Exit; + } + + font->num_faces = font->name_index.count; + } + else { - FT_ERROR(( "cff_font_load: incorrect face index = %d\n", - face_index )); - error = CFF_Err_Invalid_Argument; + subfont_index = 0; + + if ( font->name_index.count > 1 ) + { + FT_ERROR(( "cff_font_load:" + " invalid CFF font with multiple subfonts\n" + " " + " in SFNT wrapper\n" )); + error = FT_THROW( Invalid_File_Format ); + goto Exit; + } } /* in case of a font format check, simply exit now */ @@ -1500,7 +1531,7 @@ FT_TRACE4(( "parsing top-level\n" )); error = cff_subfont_load( &font->top_font, &font->font_dict_index, - face_index, + subfont_index, stream, base_offset, library ); @@ -1576,7 +1607,7 @@ if ( dict->charstrings_offset == 0 ) { FT_ERROR(( "cff_font_load: no charstrings offset\n" )); - error = CFF_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } @@ -1615,7 +1646,7 @@ /* get the font name (/CIDFontName for CID-keyed fonts, */ /* /FontName otherwise) */ - font->font_name = cff_index_get_name( font, face_index ); + font->font_name = cff_index_get_name( font, subfont_index ); Exit: cff_index_done( &string_index ); @@ -1660,6 +1691,12 @@ FT_FREE( font->global_subrs ); FT_FREE( font->strings ); FT_FREE( font->string_pool ); + + if ( font->cf2_instance.finalizer ) + { + font->cf2_instance.finalizer( font->cf2_instance.data ); + FT_FREE( font->cf2_instance.data ); + } } diff --git a/src/cff/cffobjs.c b/src/cff/cffobjs.c index 6ad0e50..da3d019 100644 --- a/src/cff/cffobjs.c +++ b/src/cff/cffobjs.c @@ -4,7 +4,7 @@ /* */ /* OpenType objects manager (body). */ /* */ -/* Copyright 1996-2012 by */ +/* Copyright 1996-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -17,6 +17,7 @@ #include <ft2build.h> + #include FT_INTERNAL_DEBUG_H #include FT_INTERNAL_CALC_H #include FT_INTERNAL_STREAM_H @@ -24,12 +25,15 @@ #include FT_TRUETYPE_IDS_H #include FT_TRUETYPE_TAGS_H #include FT_INTERNAL_SFNT_H +#include FT_CFF_DRIVER_H + #include "cffobjs.h" #include "cffload.h" #include "cffcmap.h" -#include "cfferrs.h" #include "cffpic.h" +#include "cfferrs.h" + /*************************************************************************/ /* */ @@ -153,7 +157,7 @@ cff_size_init( FT_Size cffsize ) /* CFF_Size */ { CFF_Size size = (CFF_Size)cffsize; - FT_Error error = CFF_Err_Ok; + FT_Error error = FT_Err_Ok; PSH_Globals_Funcs funcs = cff_size_get_globals_funcs( size ); @@ -253,7 +257,7 @@ } } - return CFF_Err_Ok; + return FT_Err_Ok; } #endif /* TT_CONFIG_OPTION_EMBEDDED_BITMAPS */ @@ -325,7 +329,7 @@ } } - return CFF_Err_Ok; + return FT_Err_Ok; } @@ -367,7 +371,7 @@ } } - return CFF_Err_Ok; + return FT_Err_Ok; } @@ -401,7 +405,7 @@ remove_subset_prefix( FT_String* name ) { FT_Int32 idx = 0; - FT_Int32 length = strlen( name ) + 1; + FT_Int32 length = (FT_Int32)strlen( name ) + 1; FT_Bool continue_search = 1; @@ -438,8 +442,8 @@ FT_Int32 family_name_length, style_name_length; - family_name_length = strlen( family_name ); - style_name_length = strlen( style_name ); + family_name_length = (FT_Int32)strlen( family_name ); + style_name_length = (FT_Int32)strlen( style_name ); if ( family_name_length > style_name_length ) { @@ -496,7 +500,7 @@ if ( !sfnt ) { FT_ERROR(( "cff_face_init: cannot access `sfnt' module\n" )); - error = CFF_Err_Missing_Module; + error = FT_THROW( Missing_Module ); goto Exit; } @@ -518,21 +522,13 @@ if ( face->format_tag != TTAG_OTTO ) /* `OTTO'; OpenType/CFF font */ { FT_TRACE2(( " not an OpenType/CFF font\n" )); - error = CFF_Err_Unknown_File_Format; + error = FT_THROW( Unknown_File_Format ); goto Exit; } /* if we are performing a simple font format check, exit immediately */ if ( face_index < 0 ) - return CFF_Err_Ok; - - /* UNDOCUMENTED! A CFF in an SFNT can have only a single font. */ - if ( face_index > 0 ) - { - FT_ERROR(( "cff_face_init: invalid face index\n" )); - error = CFF_Err_Invalid_Argument; - goto Exit; - } + return FT_Err_Ok; sfnt_format = 1; @@ -544,7 +540,8 @@ pure_cff = 0; /* load font directory */ - error = sfnt->load_face( stream, face, 0, num_params, params ); + error = sfnt->load_face( stream, face, face_index, + num_params, params ); if ( error ) goto Exit; } @@ -554,10 +551,6 @@ error = sfnt->load_cmap( face, stream ); if ( error ) goto Exit; - - /* XXX: we don't load the GPOS table, as OpenType Layout */ - /* support will be added later to a layout library on top of */ - /* FreeType 2 */ } /* now load the CFF part of the file */ @@ -570,7 +563,7 @@ /* rewind to start of file; we are going to load a pure-CFF font */ if ( FT_STREAM_SEEK( 0 ) ) goto Exit; - error = CFF_Err_Ok; + error = FT_Err_Ok; } /* now load and parse the CFF table in the file */ @@ -611,7 +604,7 @@ " cannot open CFF & CEF fonts\n" " " " without the `PSNames' module\n" )); - error = CFF_Err_Missing_Module; + error = FT_THROW( Missing_Module ); goto Exit; } @@ -873,7 +866,7 @@ flags |= FT_FACE_FLAG_KERNING; #endif - cffface->face_flags = flags; + cffface->face_flags |= flags; /*******************************************************************/ /* */ @@ -950,16 +943,6 @@ if ( pure_cff && cff->top_font.font_dict.cid_registry != 0xFFFFU ) goto Exit; -#ifdef FT_MAX_CHARMAP_CACHEABLE - if ( nn + 1 > FT_MAX_CHARMAP_CACHEABLE ) - { - FT_ERROR(( "cff_face_init: no Unicode cmap is found, " - "and too many subtables (%d) to add synthesized cmap\n", - nn )); - goto Exit; - } -#endif - /* we didn't find a Unicode charmap -- synthesize one */ cmaprec.face = cffface; cmaprec.platform_id = TT_PLATFORM_MICROSOFT; @@ -968,9 +951,10 @@ nn = (FT_UInt)cffface->num_charmaps; - error = FT_CMap_New( &FT_CFF_CMAP_UNICODE_CLASS_REC_GET, NULL, + error = FT_CMap_New( &CFF_CMAP_UNICODE_CLASS_REC_GET, NULL, &cmaprec, NULL ); - if ( error && FT_Err_No_Unicode_Glyph_Name != error ) + if ( error && + FT_ERR_NEQ( error, No_Unicode_Glyph_Name ) ) goto Exit; error = FT_Err_Ok; @@ -979,15 +963,6 @@ cffface->charmap = cffface->charmaps[nn]; Skip_Unicode: -#ifdef FT_MAX_CHARMAP_CACHEABLE - if ( nn > FT_MAX_CHARMAP_CACHEABLE ) - { - FT_ERROR(( "cff_face_init: Unicode cmap is found, " - "but too many preceding subtables (%d) to access\n", - nn - 1 )); - goto Exit; - } -#endif if ( encoding->count > 0 ) { FT_CMap_Class clazz; @@ -1000,19 +975,19 @@ { cmaprec.encoding_id = TT_ADOBE_ID_STANDARD; cmaprec.encoding = FT_ENCODING_ADOBE_STANDARD; - clazz = &FT_CFF_CMAP_ENCODING_CLASS_REC_GET; + clazz = &CFF_CMAP_ENCODING_CLASS_REC_GET; } else if ( encoding->offset == 1 ) { cmaprec.encoding_id = TT_ADOBE_ID_EXPERT; cmaprec.encoding = FT_ENCODING_ADOBE_EXPERT; - clazz = &FT_CFF_CMAP_ENCODING_CLASS_REC_GET; + clazz = &CFF_CMAP_ENCODING_CLASS_REC_GET; } else { cmaprec.encoding_id = TT_ADOBE_ID_CUSTOM; cmaprec.encoding = FT_ENCODING_ADOBE_CUSTOM; - clazz = &FT_CFF_CMAP_ENCODING_CLASS_REC_GET; + clazz = &CFF_CMAP_ENCODING_CLASS_REC_GET; } error = FT_CMap_New( clazz, NULL, &cmaprec, NULL ); @@ -1056,16 +1031,35 @@ FT_LOCAL_DEF( FT_Error ) - cff_driver_init( FT_Module module ) + cff_driver_init( FT_Module module ) /* CFF_Driver */ { - FT_UNUSED( module ); + CFF_Driver driver = (CFF_Driver)module; + + + /* set default property values, cf. `ftcffdrv.h' */ +#ifdef CFF_CONFIG_OPTION_OLD_ENGINE + driver->hinting_engine = FT_CFF_HINTING_FREETYPE; +#else + driver->hinting_engine = FT_CFF_HINTING_ADOBE; +#endif + + driver->no_stem_darkening = FALSE; + + driver->darken_params[0] = CFF_CONFIG_OPTION_DARKENING_PARAMETER_X1; + driver->darken_params[1] = CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y1; + driver->darken_params[2] = CFF_CONFIG_OPTION_DARKENING_PARAMETER_X2; + driver->darken_params[3] = CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y2; + driver->darken_params[4] = CFF_CONFIG_OPTION_DARKENING_PARAMETER_X3; + driver->darken_params[5] = CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y3; + driver->darken_params[6] = CFF_CONFIG_OPTION_DARKENING_PARAMETER_X4; + driver->darken_params[7] = CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y4; - return CFF_Err_Ok; + return FT_Err_Ok; } FT_LOCAL_DEF( void ) - cff_driver_done( FT_Module module ) + cff_driver_done( FT_Module module ) /* CFF_Driver */ { FT_UNUSED( module ); } diff --git a/src/cff/cffobjs.h b/src/cff/cffobjs.h index 3c81cee..dfbf9a9 100644 --- a/src/cff/cffobjs.h +++ b/src/cff/cffobjs.h @@ -4,7 +4,7 @@ /* */ /* OpenType objects manager (specification). */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2004, 2006, 2007, 2008 by */ +/* Copyright 1996-2004, 2006-2008, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -112,12 +112,16 @@ FT_BEGIN_HEADER /***********************************************************************/ /* */ - /* TrueType driver class. */ + /* CFF driver class. */ /* */ typedef struct CFF_DriverRec_ { FT_DriverRec root; - void* extension_component; + + FT_UInt hinting_engine; + FT_Bool no_stem_darkening; + + FT_Int darken_params[8]; } CFF_DriverRec; @@ -167,10 +171,10 @@ FT_BEGIN_HEADER /* Driver functions */ /* */ FT_LOCAL( FT_Error ) - cff_driver_init( FT_Module module ); + cff_driver_init( FT_Module module ); /* CFF_Driver */ FT_LOCAL( void ) - cff_driver_done( FT_Module module ); + cff_driver_done( FT_Module module ); /* CFF_Driver */ FT_END_HEADER diff --git a/src/cff/cffparse.c b/src/cff/cffparse.c index 61fa87c..c79ab62 100644 --- a/src/cff/cffparse.c +++ b/src/cff/cffparse.c @@ -4,7 +4,7 @@ /* */ /* CFF token stream parser (body) */ /* */ -/* Copyright 1996-2004, 2007-2011 by */ +/* Copyright 1996-2004, 2007-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -65,19 +65,17 @@ if ( p + 2 > limit ) goto Bad; - val = (FT_Short)( ( (FT_Int)p[0] << 8 ) | p[1] ); - p += 2; + val = (FT_Short)( ( (FT_UShort)p[0] << 8 ) | p[1] ); } else if ( v == 29 ) { if ( p + 4 > limit ) goto Bad; - val = ( (FT_Long)p[0] << 24 ) | - ( (FT_Long)p[1] << 16 ) | - ( (FT_Long)p[2] << 8 ) | - p[3]; - p += 4; + val = (FT_Long)( ( (FT_ULong)p[0] << 24 ) | + ( (FT_ULong)p[1] << 16 ) | + ( (FT_ULong)p[2] << 8 ) | + (FT_ULong)p[3] ); } else if ( v < 247 ) { @@ -89,7 +87,6 @@ goto Bad; val = ( v - 247 ) * 256 + p[0] + 108; - p++; } else { @@ -97,7 +94,6 @@ goto Bad; val = -( v - 251 ) * 256 - p[0] - 108; - p++; } Exit: @@ -105,6 +101,7 @@ Bad: val = 0; + FT_TRACE4(( "!!!END OF DATA:!!!" )); goto Exit; } @@ -136,7 +133,7 @@ FT_UInt phase; FT_Long result, number, exponent; - FT_Int sign = 0, exponent_sign = 0; + FT_Int sign = 0, exponent_sign = 0, have_overflow = 0; FT_Long exponent_add, integer_length, fraction_length; @@ -165,7 +162,7 @@ /* Make sure we don't read past the end. */ if ( p >= limit ) - goto Exit; + goto Bad; } /* Get the nibble. */ @@ -191,7 +188,7 @@ } /* Read fraction part, if any. */ - if ( nib == 0xa ) + if ( nib == 0xA ) for (;;) { /* If we entered this iteration with phase == 4, we need */ @@ -202,7 +199,7 @@ /* Make sure we don't read past the end. */ if ( p >= limit ) - goto Exit; + goto Bad; } /* Get the nibble. */ @@ -241,7 +238,7 @@ /* Make sure we don't read past the end. */ if ( p >= limit ) - goto Exit; + goto Bad; } /* Get the nibble. */ @@ -250,17 +247,28 @@ if ( nib >= 10 ) break; - exponent = exponent * 10 + nib; - /* Arbitrarily limit exponent. */ if ( exponent > 1000 ) - goto Exit; + have_overflow = 1; + else + exponent = exponent * 10 + nib; } if ( exponent_sign ) exponent = -exponent; } + if ( !number ) + goto Exit; + + if ( have_overflow ) + { + if ( exponent_sign ) + goto Underflow; + else + goto Overflow; + } + /* We don't check `power_ten' and `exponent_add'. */ exponent += power_ten + exponent_add; @@ -286,20 +294,25 @@ /* Make `scaling' as small as possible. */ new_fraction_length = FT_MIN( exponent, 5 ); - exponent -= new_fraction_length; shift = new_fraction_length - fraction_length; - number *= power_tens[shift]; - if ( number > 0x7FFFL ) + if ( shift > 0 ) { - number /= 10; - exponent += 1; + exponent -= new_fraction_length; + number *= power_tens[shift]; + if ( number > 0x7FFFL ) + { + number /= 10; + exponent += 1; + } } + else + exponent -= fraction_length; } else exponent -= fraction_length; - result = number << 16; + result = (FT_Long)( (FT_ULong)number << 16 ); *scaling = exponent; } } @@ -322,9 +335,10 @@ integer_length += exponent; fraction_length -= exponent; - /* Check for overflow and underflow. */ - if ( FT_ABS( integer_length ) > 5 ) - goto Exit; + if ( integer_length > 5 ) + goto Overflow; + if ( integer_length < -5 ) + goto Underflow; /* Remove non-significant digits. */ if ( integer_length < 0 ) @@ -353,17 +367,32 @@ number *= power_tens[-fraction_length]; if ( number > 0x7FFFL ) - goto Exit; + goto Overflow; - result = number << 16; + result = (FT_Long)( (FT_ULong)number << 16 ); } } + Exit: if ( sign ) result = -result; - Exit: return result; + + Overflow: + result = 0x7FFFFFFFL; + FT_TRACE4(( "!!!OVERFLOW:!!!" )); + goto Exit; + + Underflow: + result = 0; + FT_TRACE4(( "!!!UNDERFLOW:!!!" )); + goto Exit; + + Bad: + result = 0; + FT_TRACE4(( "!!!END OF DATA:!!!" )); + goto Exit; } @@ -378,10 +407,44 @@ /* read a floating point number, either integer or real */ static FT_Fixed + do_fixed( FT_Byte** d, + FT_Long scaling ) + { + if ( **d == 30 ) + return cff_parse_real( d[0], d[1], scaling, NULL ); + else + { + FT_Long val = cff_parse_integer( d[0], d[1] ); + + + if ( scaling ) + val *= power_tens[scaling]; + + if ( val > 0x7FFF ) + { + val = 0x7FFFFFFFL; + goto Overflow; + } + else if ( val < -0x7FFF ) + { + val = -0x7FFFFFFFL; + goto Overflow; + } + + return (FT_Long)( (FT_ULong)val << 16 ); + + Overflow: + FT_TRACE4(( "!!!OVERFLOW:!!!" )); + return val; + } + } + + + /* read a floating point number, either integer or real */ + static FT_Fixed cff_parse_fixed( FT_Byte** d ) { - return **d == 30 ? cff_parse_real( d[0], d[1], 0, NULL ) - : cff_parse_integer( d[0], d[1] ) << 16; + return do_fixed( d, 0 ); } @@ -391,9 +454,7 @@ cff_parse_fixed_scaled( FT_Byte** d, FT_Long scaling ) { - return **d == 30 ? cff_parse_real( d[0], d[1], scaling, NULL ) - : ( cff_parse_integer( d[0], d[1] ) * - power_tens[scaling] ) << 16; + return do_fixed( d, scaling ); } @@ -436,7 +497,7 @@ else { *scaling = 0; - return number << 16; + return (FT_Long)( (FT_ULong)number << 16 ); } } } @@ -450,7 +511,7 @@ FT_Vector* offset = &dict->font_offset; FT_ULong* upm = &dict->units_per_em; FT_Byte** data = parser->stack; - FT_Error error = CFF_Err_Stack_Underflow; + FT_Error error = FT_ERR( Stack_Underflow ); if ( parser->top >= parser->stack + 6 ) @@ -458,7 +519,7 @@ FT_Long scaling; - error = CFF_Err_Ok; + error = FT_Err_Ok; dict->has_font_matrix = TRUE; @@ -523,7 +584,7 @@ FT_Error error; - error = CFF_Err_Stack_Underflow; + error = FT_ERR( Stack_Underflow ); if ( parser->top >= parser->stack + 4 ) { @@ -531,7 +592,7 @@ bbox->yMin = FT_RoundFix( cff_parse_fixed( data++ ) ); bbox->xMax = FT_RoundFix( cff_parse_fixed( data++ ) ); bbox->yMax = FT_RoundFix( cff_parse_fixed( data ) ); - error = CFF_Err_Ok; + error = FT_Err_Ok; FT_TRACE4(( " [%d %d %d %d]\n", bbox->xMin / 65536, @@ -552,7 +613,7 @@ FT_Error error; - error = CFF_Err_Stack_Underflow; + error = FT_ERR( Stack_Underflow ); if ( parser->top >= parser->stack + 2 ) { @@ -561,7 +622,7 @@ FT_TRACE4(( " %lu %lu\n", dict->private_size, dict->private_offset )); - error = CFF_Err_Ok; + error = FT_Err_Ok; } return error; @@ -576,7 +637,7 @@ FT_Error error; - error = CFF_Err_Stack_Underflow; + error = FT_ERR( Stack_Underflow ); if ( parser->top >= parser->stack + 3 ) { @@ -588,7 +649,7 @@ if ( dict->cid_supplement < 0 ) FT_TRACE1(( "cff_parse_cid_ros: negative supplement %d is found\n", dict->cid_supplement )); - error = CFF_Err_Ok; + error = FT_Err_Ok; FT_TRACE4(( " %d %d %d\n", dict->cid_registry, @@ -730,7 +791,7 @@ FT_Create_Class_cff_field_handlers( FT_Library library, CFF_Field_Handler** output_class ) { - CFF_Field_Handler* clazz; + CFF_Field_Handler* clazz = NULL; FT_Error error; FT_Memory memory = library->memory; @@ -857,7 +918,7 @@ *output_class = clazz; - return CFF_Err_Ok; + return FT_Err_Ok; } @@ -870,7 +931,7 @@ FT_Byte* limit ) { FT_Byte* p = start; - FT_Error error = CFF_Err_Ok; + FT_Error error = FT_Err_Ok; FT_Library library = parser->library; FT_UNUSED( library ); @@ -944,7 +1005,7 @@ } code = code | parser->object_code; - for ( field = FT_CFF_FIELD_HANDLERS_GET; field->kind; field++ ) + for ( field = CFF_FIELD_HANDLERS_GET; field->kind; field++ ) { if ( field->code == (FT_Int)code ) { @@ -1096,15 +1157,15 @@ return error; Stack_Overflow: - error = CFF_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Exit; Stack_Underflow: - error = CFF_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Exit; Syntax_Error: - error = CFF_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Exit; } diff --git a/src/cff/cffpic.c b/src/cff/cffpic.c index 1c19d58..f22e4f0 100644 --- a/src/cff/cffpic.c +++ b/src/cff/cffpic.c @@ -4,7 +4,7 @@ /* */ /* The FreeType position independent code services for cff module. */ /* */ -/* Copyright 2009, 2010 by */ +/* Copyright 2009, 2010, 2012, 2013 by */ /* Oran Agra and Mickey Gabel. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -23,65 +23,51 @@ #include "cffpic.h" #include "cfferrs.h" + #ifdef FT_CONFIG_OPTION_PIC /* forward declaration of PIC init functions from cffdrivr.c */ FT_Error - FT_Create_Class_cff_services( - FT_Library library, - FT_ServiceDescRec** output_class ); - + FT_Create_Class_cff_services( FT_Library library, + FT_ServiceDescRec** output_class ); void - FT_Destroy_Class_cff_services( - FT_Library library, - FT_ServiceDescRec* clazz ); - + FT_Destroy_Class_cff_services( FT_Library library, + FT_ServiceDescRec* clazz ); void - FT_Init_Class_cff_service_ps_info( - FT_Library library, - FT_Service_PsInfoRec* clazz ); - + FT_Init_Class_cff_service_ps_info( FT_Library library, + FT_Service_PsInfoRec* clazz ); void - FT_Init_Class_cff_service_glyph_dict( - FT_Library library, - FT_Service_GlyphDictRec* clazz ); - + FT_Init_Class_cff_service_glyph_dict( FT_Library library, + FT_Service_GlyphDictRec* clazz ); void - FT_Init_Class_cff_service_ps_name( - FT_Library library, - FT_Service_PsFontNameRec* clazz ); - + FT_Init_Class_cff_service_ps_name( FT_Library library, + FT_Service_PsFontNameRec* clazz ); void - FT_Init_Class_cff_service_get_cmap_info( - FT_Library library, - FT_Service_TTCMapsRec* clazz ); - + FT_Init_Class_cff_service_get_cmap_info( FT_Library library, + FT_Service_TTCMapsRec* clazz ); void - FT_Init_Class_cff_service_cid_info( - FT_Library library, - FT_Service_CIDRec* clazz ); + FT_Init_Class_cff_service_cid_info( FT_Library library, + FT_Service_CIDRec* clazz ); /* forward declaration of PIC init functions from cffparse.c */ FT_Error - FT_Create_Class_cff_field_handlers( - FT_Library library, - CFF_Field_Handler** output_class ); - + FT_Create_Class_cff_field_handlers( FT_Library library, + CFF_Field_Handler** output_class ); void - FT_Destroy_Class_cff_field_handlers( - FT_Library library, - CFF_Field_Handler* clazz ); + FT_Destroy_Class_cff_field_handlers( FT_Library library, + CFF_Field_Handler* clazz ); + void cff_driver_class_pic_free( FT_Library library ) { FT_PIC_Container* pic_container = &library->pic_container; - FT_Memory memory = library->memory; + FT_Memory memory = library->memory; if ( pic_container->cff ) { - CffModulePIC* container = ( CffModulePIC* )pic_container->cff; + CffModulePIC* container = (CffModulePIC*)pic_container->cff; if ( container->cff_services ) @@ -102,8 +88,8 @@ cff_driver_class_pic_init( FT_Library library ) { FT_PIC_Container* pic_container = &library->pic_container; - FT_Error error = CFF_Err_Ok; - CffModulePIC* container; + FT_Error error = FT_Err_Ok; + CffModulePIC* container = NULL; FT_Memory memory = library->memory; @@ -113,15 +99,18 @@ FT_MEM_SET( container, 0, sizeof ( *container ) ); pic_container->cff = container; - /* initialize pointer table - this is how the module usually expects this data */ + /* initialize pointer table - */ + /* this is how the module usually expects this data */ error = FT_Create_Class_cff_services( library, &container->cff_services ); if ( error ) goto Exit; + error = FT_Create_Class_cff_field_handlers( library, &container->cff_field_handlers ); if ( error ) goto Exit; + FT_Init_Class_cff_service_ps_info( library, &container->cff_service_ps_info ); FT_Init_Class_cff_service_glyph_dict( @@ -136,7 +125,8 @@ library, &container->cff_cmap_encoding_class_rec ); FT_Init_Class_cff_cmap_unicode_class_rec( library, &container->cff_cmap_unicode_class_rec ); -Exit: + + Exit: if ( error ) cff_driver_class_pic_free( library ); return error; diff --git a/src/cff/cffpic.h b/src/cff/cffpic.h index 342edd8..50bab4c 100644 --- a/src/cff/cffpic.h +++ b/src/cff/cffpic.h @@ -4,7 +4,7 @@ /* */ /* The FreeType position independent code services for cff module. */ /* */ -/* Copyright 2009 by */ +/* Copyright 2009, 2012, 2013 by */ /* Oran Agra and Mickey Gabel. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -24,16 +24,19 @@ FT_BEGIN_HEADER #include FT_INTERNAL_PIC_H + #ifndef FT_CONFIG_OPTION_PIC -#define FT_CFF_SERVICE_PS_INFO_GET cff_service_ps_info -#define FT_CFF_SERVICE_GLYPH_DICT_GET cff_service_glyph_dict -#define FT_CFF_SERVICE_PS_NAME_GET cff_service_ps_name -#define FT_CFF_SERVICE_GET_CMAP_INFO_GET cff_service_get_cmap_info -#define FT_CFF_SERVICE_CID_INFO_GET cff_service_cid_info -#define FT_CFF_SERVICES_GET cff_services -#define FT_CFF_CMAP_ENCODING_CLASS_REC_GET cff_cmap_encoding_class_rec -#define FT_CFF_CMAP_UNICODE_CLASS_REC_GET cff_cmap_unicode_class_rec -#define FT_CFF_FIELD_HANDLERS_GET cff_field_handlers + +#define CFF_SERVICE_PS_INFO_GET cff_service_ps_info +#define CFF_SERVICE_GLYPH_DICT_GET cff_service_glyph_dict +#define CFF_SERVICE_PS_NAME_GET cff_service_ps_name +#define CFF_SERVICE_GET_CMAP_INFO_GET cff_service_get_cmap_info +#define CFF_SERVICE_CID_INFO_GET cff_service_cid_info +#define CFF_SERVICE_PROPERTIES_GET cff_service_properties +#define CFF_SERVICES_GET cff_services +#define CFF_CMAP_ENCODING_CLASS_REC_GET cff_cmap_encoding_class_rec +#define CFF_CMAP_UNICODE_CLASS_REC_GET cff_cmap_unicode_class_rec +#define CFF_FIELD_HANDLERS_GET cff_field_handlers #else /* FT_CONFIG_OPTION_PIC */ @@ -43,30 +46,48 @@ FT_BEGIN_HEADER #include FT_SERVICE_POSTSCRIPT_NAME_H #include FT_SERVICE_TT_CMAP_H #include FT_SERVICE_CID_H +#include FT_SERVICE_PROPERTIES_H + - typedef struct CffModulePIC_ + typedef struct CffModulePIC_ { - FT_ServiceDescRec* cff_services; - CFF_Field_Handler* cff_field_handlers; - FT_Service_PsInfoRec cff_service_ps_info; - FT_Service_GlyphDictRec cff_service_glyph_dict; - FT_Service_PsFontNameRec cff_service_ps_name; - FT_Service_TTCMapsRec cff_service_get_cmap_info; - FT_Service_CIDRec cff_service_cid_info; - FT_CMap_ClassRec cff_cmap_encoding_class_rec; - FT_CMap_ClassRec cff_cmap_unicode_class_rec; + FT_ServiceDescRec* cff_services; + CFF_Field_Handler* cff_field_handlers; + FT_Service_PsInfoRec cff_service_ps_info; + FT_Service_GlyphDictRec cff_service_glyph_dict; + FT_Service_PsFontNameRec cff_service_ps_name; + FT_Service_TTCMapsRec cff_service_get_cmap_info; + FT_Service_CIDRec cff_service_cid_info; + FT_Service_PropertiesRec cff_service_properties; + FT_CMap_ClassRec cff_cmap_encoding_class_rec; + FT_CMap_ClassRec cff_cmap_unicode_class_rec; + } CffModulePIC; -#define GET_PIC(lib) ((CffModulePIC*)((lib)->pic_container.cff)) -#define FT_CFF_SERVICE_PS_INFO_GET (GET_PIC(library)->cff_service_ps_info) -#define FT_CFF_SERVICE_GLYPH_DICT_GET (GET_PIC(library)->cff_service_glyph_dict) -#define FT_CFF_SERVICE_PS_NAME_GET (GET_PIC(library)->cff_service_ps_name) -#define FT_CFF_SERVICE_GET_CMAP_INFO_GET (GET_PIC(library)->cff_service_get_cmap_info) -#define FT_CFF_SERVICE_CID_INFO_GET (GET_PIC(library)->cff_service_cid_info) -#define FT_CFF_SERVICES_GET (GET_PIC(library)->cff_services) -#define FT_CFF_CMAP_ENCODING_CLASS_REC_GET (GET_PIC(library)->cff_cmap_encoding_class_rec) -#define FT_CFF_CMAP_UNICODE_CLASS_REC_GET (GET_PIC(library)->cff_cmap_unicode_class_rec) -#define FT_CFF_FIELD_HANDLERS_GET (GET_PIC(library)->cff_field_handlers) + +#define GET_PIC( lib ) \ + ( (CffModulePIC*)( (lib)->pic_container.cff ) ) + +#define CFF_SERVICE_PS_INFO_GET \ + ( GET_PIC( library )->cff_service_ps_info ) +#define CFF_SERVICE_GLYPH_DICT_GET \ + ( GET_PIC( library )->cff_service_glyph_dict ) +#define CFF_SERVICE_PS_NAME_GET \ + ( GET_PIC( library )->cff_service_ps_name ) +#define CFF_SERVICE_GET_CMAP_INFO_GET \ + ( GET_PIC( library )->cff_service_get_cmap_info ) +#define CFF_SERVICE_CID_INFO_GET \ + ( GET_PIC( library )->cff_service_cid_info ) +#define CFF_SERVICE_PROPERTIES_GET \ + ( GET_PIC( library )->cff_service_properties ) +#define CFF_SERVICES_GET \ + ( GET_PIC( library )->cff_services ) +#define CFF_CMAP_ENCODING_CLASS_REC_GET \ + ( GET_PIC( library )->cff_cmap_encoding_class_rec ) +#define CFF_CMAP_UNICODE_CLASS_REC_GET \ + ( GET_PIC( library )->cff_cmap_unicode_class_rec ) +#define CFF_FIELD_HANDLERS_GET \ + ( GET_PIC( library )->cff_field_handlers ) /* see cffpic.c for the implementation */ void diff --git a/src/cff/cfftypes.h b/src/cff/cfftypes.h index 7c99036..8727446 100644 --- a/src/cff/cfftypes.h +++ b/src/cff/cfftypes.h @@ -5,7 +5,7 @@ /* Basic OpenType/CFF type definitions and interface (specification */ /* only). */ /* */ -/* Copyright 1996-2003, 2006-2008, 2010-2011 by */ +/* Copyright 1996-2003, 2006-2008, 2010-2011, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -270,6 +270,9 @@ FT_BEGIN_HEADER FT_String* registry; FT_String* ordering; + /* since version 2.4.12 */ + FT_Generic cf2_instance; + } CFF_FontRec, *CFF_Font; diff --git a/src/cff/rules.mk b/src/cff/rules.mk index ca7aa5d..13115c2 100644 --- a/src/cff/rules.mk +++ b/src/cff/rules.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2000, 2001, 2003, 2011 by +# Copyright 1996-2001, 2003, 2011, 2013 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -29,14 +29,27 @@ CFF_DRV_SRC := $(CFF_DIR)/cffcmap.c \ $(CFF_DIR)/cffload.c \ $(CFF_DIR)/cffobjs.c \ $(CFF_DIR)/cffparse.c \ - $(CFF_DIR)/cffpic.c + $(CFF_DIR)/cffpic.c \ + $(CFF_DIR)/cf2arrst.c \ + $(CFF_DIR)/cf2blues.c \ + $(CFF_DIR)/cf2error.c \ + $(CFF_DIR)/cf2font.c \ + $(CFF_DIR)/cf2ft.c \ + $(CFF_DIR)/cf2hints.c \ + $(CFF_DIR)/cf2intrp.c \ + $(CFF_DIR)/cf2read.c \ + $(CFF_DIR)/cf2stack.c + # CFF driver headers # CFF_DRV_H := $(CFF_DRV_SRC:%.c=%.h) \ $(CFF_DIR)/cfferrs.h \ $(CFF_DIR)/cfftoken.h \ - $(CFF_DIR)/cfftypes.h + $(CFF_DIR)/cfftypes.h \ + $(CFF_DIR)/cf2fixed.h \ + $(CFF_DIR)/cf2glue.h \ + $(CFF_DIR)/cf2types.h # CFF driver object(s) diff --git a/src/cid/cidgload.c b/src/cid/cidgload.c index bd84023..7febab8 100644 --- a/src/cid/cidgload.c +++ b/src/cid/cidgload.c @@ -4,7 +4,7 @@ /* */ /* CID-keyed Type1 Glyph Loader (body). */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010 by */ +/* Copyright 1996-2007, 2009, 2010, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -46,7 +46,7 @@ FT_Byte* p; FT_UInt fd_select; FT_Stream stream = face->cid_stream; - FT_Error error = CID_Err_Ok; + FT_Error error = FT_Err_Ok; FT_Byte* charstring = 0; FT_Memory memory = face->root.memory; FT_ULong glyph_length = 0; @@ -58,7 +58,7 @@ #endif - FT_TRACE4(( "cid_load_glyph: glyph index %d\n", glyph_index )); + FT_TRACE1(( "cid_load_glyph: glyph index %d\n", glyph_index )); #ifdef FT_CONFIG_OPTION_INCREMENTAL @@ -117,7 +117,7 @@ if ( fd_select >= (FT_UInt)cid->num_dicts ) { - error = CID_Err_Invalid_Offset; + error = FT_THROW( Invalid_Offset ); goto Exit; } if ( glyph_length == 0 ) @@ -258,7 +258,7 @@ psaux->t1_decoder_funcs->done( &decoder ); - return CID_Err_Ok; + return FT_Err_Ok; } @@ -284,7 +284,7 @@ if ( glyph_index >= (FT_UInt)face->root.num_glyphs ) { - error = CID_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Exit; } diff --git a/src/cid/cidload.c b/src/cid/cidload.c index 3b840b7..1cda0ee 100644 --- a/src/cid/cidload.c +++ b/src/cid/cidload.c @@ -4,7 +4,7 @@ /* */ /* CID-keyed Type1 font loader (body). */ /* */ -/* Copyright 1996-2006, 2009, 2011-2012 by */ +/* Copyright 1996-2006, 2009, 2011-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -42,7 +42,7 @@ cid_get_offset( FT_Byte* *start, FT_Byte offsize ) { - FT_Long result; + FT_ULong result; FT_Byte* p = *start; @@ -53,7 +53,7 @@ } *start = p; - return result; + return (FT_Long)result; } @@ -114,7 +114,7 @@ { FT_ERROR(( "cid_load_keyword: invalid use of `%s'\n", keyword->ident )); - error = CID_Err_Syntax_Error; + error = FT_THROW( Syntax_Error ); goto Exit; } @@ -150,8 +150,6 @@ cid_parse_font_matrix( CID_Face face, CID_Parser* parser ) { - FT_Matrix* matrix; - FT_Vector* offset; CID_FaceDict dict; FT_Face root = (FT_Face)&face->root; FT_Fixed temp[6]; @@ -160,19 +158,33 @@ if ( parser->num_dict >= 0 && parser->num_dict < face->cid.num_dicts ) { + FT_Matrix* matrix; + FT_Vector* offset; + FT_Int result; + + dict = face->cid.font_dicts + parser->num_dict; matrix = &dict->font_matrix; offset = &dict->font_offset; - (void)cid_parser_to_fixed_array( parser, 6, temp, 3 ); + result = cid_parser_to_fixed_array( parser, 6, temp, 3 ); + + if ( result < 6 ) + return FT_THROW( Invalid_File_Format ); temp_scale = FT_ABS( temp[3] ); - /* Set units per EM based on FontMatrix values. We set the value to */ - /* `1000/temp_scale', because temp_scale was already multiplied by */ - /* 1000 (in `t1_tofixed', from psobjs.c). */ - root->units_per_EM = (FT_UShort)( FT_DivFix( 0x10000L, - FT_DivFix( temp_scale, 1000 ) ) ); + if ( temp_scale == 0 ) + { + FT_ERROR(( "cid_parse_font_matrix: invalid font matrix\n" )); + return FT_THROW( Invalid_File_Format ); + } + + /* Set Units per EM based on FontMatrix values. We set the value to */ + /* 1000 / temp_scale, because temp_scale was already multiplied by */ + /* 1000 (in t1_tofixed, from psobjs.c). */ + + root->units_per_EM = (FT_UShort)FT_DivFix( 1000, temp_scale ); /* we need to scale the values by 1.0/temp[3] */ if ( temp_scale != 0x10000L ) @@ -182,7 +194,7 @@ temp[2] = FT_DivFix( temp[2], temp_scale ); temp[4] = FT_DivFix( temp[4], temp_scale ); temp[5] = FT_DivFix( temp[5], temp_scale ); - temp[3] = 0x10000L; + temp[3] = temp[3] < 0 ? -0x10000L : 0x10000L; } matrix->xx = temp[0]; @@ -195,8 +207,7 @@ offset->y = temp[5] >> 16; } - return CID_Err_Ok; /* this is a callback function; */ - /* we must return an error code */ + return FT_Err_Ok; } @@ -206,7 +217,7 @@ { CID_FaceInfo cid = &face->cid; FT_Memory memory = face->root.memory; - FT_Error error = CID_Err_Ok; + FT_Error error = FT_Err_Ok; FT_Long num_dicts; @@ -257,7 +268,7 @@ dict->private_dict.expansion_factor = dict->expansion_factor; } - return CID_Err_Ok; + return FT_Err_Ok; } @@ -286,7 +297,7 @@ parser->root.cursor = base; parser->root.limit = base + size; - parser->root.error = CID_Err_Ok; + parser->root.error = FT_Err_Ok; { FT_Byte* cur = base; @@ -416,7 +427,7 @@ /* Check for possible overflow. */ if ( num_subrs == FT_UINT_MAX ) { - error = CID_Err_Syntax_Error; + error = FT_THROW( Syntax_Error ); goto Fail; } @@ -428,7 +439,7 @@ if ( new_max <= max_offsets ) { - error = CID_Err_Syntax_Error; + error = FT_THROW( Syntax_Error ); goto Fail; } @@ -571,7 +582,7 @@ if ( size == 0 ) { - error = CID_Err_Syntax_Error; + error = FT_THROW( Syntax_Error ); goto Exit; } @@ -604,7 +615,7 @@ } else { - error = CID_Err_Syntax_Error; + error = FT_THROW( Syntax_Error ); goto Exit; } @@ -624,7 +635,7 @@ p++; } - error = CID_Err_Ok; + error = FT_Err_Ok; Exit: return error; diff --git a/src/cid/cidobjs.c b/src/cid/cidobjs.c index cc2a200..5932ffa 100644 --- a/src/cid/cidobjs.c +++ b/src/cid/cidobjs.c @@ -4,7 +4,7 @@ /* */ /* CID objects manager (body). */ /* */ -/* Copyright 1996-2006, 2008, 2010-2011 by */ +/* Copyright 1996-2006, 2008, 2010-2011, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -131,7 +131,7 @@ cid_size_init( FT_Size cidsize ) /* CID_Size */ { CID_Size size = (CID_Size)cidsize; - FT_Error error = CID_Err_Ok; + FT_Error error = FT_Err_Ok; PSH_Globals_Funcs funcs = cid_size_get_globals_funcs( size ); @@ -169,7 +169,7 @@ size->metrics.y_scale, 0, 0 ); - return CID_Err_Ok; + return FT_Err_Ok; } @@ -302,7 +302,7 @@ if ( !psaux ) { FT_ERROR(( "cid_face_init: cannot access `psaux' module\n" )); - error = CID_Err_Missing_Module; + error = FT_THROW( Missing_Module ); goto Exit; } @@ -337,7 +337,7 @@ if ( face_index != 0 ) { FT_ERROR(( "cid_face_init: invalid face index\n" )); - error = CID_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Exit; } @@ -355,9 +355,10 @@ cidface->num_charmaps = 0; cidface->face_index = face_index; - cidface->face_flags = FT_FACE_FLAG_SCALABLE | /* scalable outlines */ - FT_FACE_FLAG_HORIZONTAL | /* horizontal data */ - FT_FACE_FLAG_HINTER; /* has native hinter */ + + cidface->face_flags |= FT_FACE_FLAG_SCALABLE | /* scalable outlines */ + FT_FACE_FLAG_HORIZONTAL | /* horizontal data */ + FT_FACE_FLAG_HINTER; /* has native hinter */ if ( info->is_fixed_pitch ) cidface->face_flags |= FT_FACE_FLAG_FIXED_WIDTH; @@ -466,7 +467,7 @@ { FT_UNUSED( driver ); - return CID_Err_Ok; + return FT_Err_Ok; } diff --git a/src/cid/cidparse.c b/src/cid/cidparse.c index 4d21160..d8476cd 100644 --- a/src/cid/cidparse.c +++ b/src/cid/cidparse.c @@ -4,7 +4,7 @@ /* */ /* CID-keyed Type1 parser (body). */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 by */ +/* Copyright 1996-2007, 2009, 2013, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -74,7 +74,7 @@ "%!PS-Adobe-3.0 Resource-CIDFont", 31 ) ) { FT_TRACE2(( " not a CID-keyed font\n" )); - error = CID_Err_Unknown_File_Format; + error = FT_THROW( Unknown_File_Format ); } FT_FRAME_EXIT(); @@ -99,7 +99,7 @@ if ( stream_len == 0 ) { FT_TRACE2(( "cid_parser_new: no `StartData' keyword found\n" )); - error = CID_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } @@ -117,12 +117,12 @@ if ( p[0] == 'S' && ft_strncmp( (char*)p, "StartData", 9 ) == 0 ) { /* save offset of binary data after `StartData' */ - offset += p - buffer + 10; + offset += (FT_ULong)( p - buffer + 10 ); goto Found; } else if ( p[1] == 's' && ft_strncmp( (char*)p, "/sfnts", 6 ) == 0 ) { - offset += p - buffer + 7; + offset += (FT_ULong)( p - buffer + 7 ); goto Found; } } @@ -178,14 +178,12 @@ if ( ft_strncmp( (char*)arg1, "(Hex)", 5 ) == 0 ) parser->binary_length = ft_atol( (const char *)arg2 ); - limit = parser->root.limit; - cur = parser->root.cursor; goto Exit; } else if ( cur[1] == 's' && ft_strncmp( (char*)cur, "/sfnts", 6 ) == 0 ) { FT_TRACE2(( "cid_parser_new: cannot handle Type 11 fonts\n" )); - error = CID_Err_Unknown_File_Format; + error = FT_THROW( Unknown_File_Format ); goto Exit; } diff --git a/src/cid/cidparse.h b/src/cid/cidparse.h index ca37dea..f27be65 100644 --- a/src/cid/cidparse.h +++ b/src/cid/cidparse.h @@ -4,7 +4,7 @@ /* */ /* CID-keyed Type1 parser (specification). */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2004 by */ +/* Copyright 1996-2004, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -92,26 +92,26 @@ FT_BEGIN_HEADER /* */ /*************************************************************************/ -#define cid_parser_skip_spaces( p ) \ +#define cid_parser_skip_spaces( p ) \ (p)->root.funcs.skip_spaces( &(p)->root ) -#define cid_parser_skip_PS_token( p ) \ +#define cid_parser_skip_PS_token( p ) \ (p)->root.funcs.skip_PS_token( &(p)->root ) -#define cid_parser_to_int( p ) (p)->root.funcs.to_int( &(p)->root ) -#define cid_parser_to_fixed( p, t ) (p)->root.funcs.to_fixed( &(p)->root, t ) +#define cid_parser_to_int( p ) (p)->root.funcs.to_int( &(p)->root ) +#define cid_parser_to_fixed( p, t ) (p)->root.funcs.to_fixed( &(p)->root, t ) -#define cid_parser_to_coord_array( p, m, c ) \ +#define cid_parser_to_coord_array( p, m, c ) \ (p)->root.funcs.to_coord_array( &(p)->root, m, c ) -#define cid_parser_to_fixed_array( p, m, f, t ) \ +#define cid_parser_to_fixed_array( p, m, f, t ) \ (p)->root.funcs.to_fixed_array( &(p)->root, m, f, t ) -#define cid_parser_to_token( p, t ) \ +#define cid_parser_to_token( p, t ) \ (p)->root.funcs.to_token( &(p)->root, t ) -#define cid_parser_to_token_array( p, t, m, c ) \ +#define cid_parser_to_token_array( p, t, m, c ) \ (p)->root.funcs.to_token_array( &(p)->root, t, m, c ) -#define cid_parser_load_field( p, f, o ) \ +#define cid_parser_load_field( p, f, o ) \ (p)->root.funcs.load_field( &(p)->root, f, o, 0, 0 ) -#define cid_parser_load_field_table( p, f, o ) \ +#define cid_parser_load_field_table( p, f, o ) \ (p)->root.funcs.load_field_table( &(p)->root, f, o, 0, 0 ) diff --git a/src/cid/cidriver.c b/src/cid/cidriver.c index 694070a..6132a27 100644 --- a/src/cid/cidriver.c +++ b/src/cid/cidriver.c @@ -4,7 +4,7 @@ /* */ /* CID driver interface (body). */ /* */ -/* Copyright 1996-2004, 2006, 2008, 2009, 2011 by */ +/* Copyright 1996-2004, 2006, 2008, 2009, 2011, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -74,7 +74,7 @@ { *afont_info = ((CID_Face)face)->cid.font_info; - return CID_Err_Ok; + return FT_Err_Ok; } static FT_Error @@ -83,7 +83,7 @@ { *afont_extra = ((CID_Face)face)->font_extra; - return CID_Err_Ok; + return FT_Err_Ok; } static const FT_Service_PsInfoRec cid_service_ps_info = @@ -118,7 +118,7 @@ if ( supplement ) *supplement = cid->supplement; - return CID_Err_Ok; + return FT_Err_Ok; } @@ -126,7 +126,7 @@ cid_get_is_cid( CID_Face face, FT_Bool *is_cid ) { - FT_Error error = CID_Err_Ok; + FT_Error error = FT_Err_Ok; FT_UNUSED( face ); @@ -142,7 +142,7 @@ FT_UInt glyph_index, FT_UInt *cid ) { - FT_Error error = CID_Err_Ok; + FT_Error error = FT_Err_Ok; FT_UNUSED( face ); @@ -221,11 +221,6 @@ cid_slot_init, cid_slot_done, -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS - ft_stub_set_char_sizes, - ft_stub_set_pixel_sizes, -#endif - cid_slot_load_glyph, 0, /* FT_Face_GetKerningFunc */ diff --git a/src/gxvalid/gxvbsln.c b/src/gxvalid/gxvbsln.c index 3d10031..d165118 100644 --- a/src/gxvalid/gxvbsln.c +++ b/src/gxvalid/gxvbsln.c @@ -72,10 +72,10 @@ static void gxv_bsln_LookupValue_validate( FT_UShort glyph, GXV_LookupValueCPtr value_p, - GXV_Validator valid ) + GXV_Validator gxvalid ) { - FT_UShort v = value_p->u; - FT_UShort* ctlPoints; + FT_UShort v = value_p->u; + FT_UShort* ctlPoints; FT_UNUSED( glyph ); @@ -124,7 +124,7 @@ gxv_bsln_LookupFmt4_transit( FT_UShort relative_gindex, GXV_LookupValueCPtr base_value_p, FT_Bytes lookuptbl_limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p; FT_Bytes limit; @@ -135,7 +135,7 @@ offset = (FT_UShort)( base_value_p->u + ( relative_gindex * sizeof ( FT_UShort ) ) ); - p = valid->lookuptbl_head + offset; + p = gxvalid->lookuptbl_head + offset; limit = lookuptbl_limit; GXV_LIMIT_CHECK( 2 ); @@ -148,7 +148,7 @@ static void gxv_bsln_parts_fmt0_validate( FT_Bytes tables, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = tables; @@ -158,7 +158,7 @@ /* deltas */ GXV_LIMIT_CHECK( 2 * GXV_BSLN_VALUE_COUNT ); - valid->table_data = NULL; /* No ctlPoints here. */ + gxvalid->table_data = NULL; /* No ctlPoints here. */ GXV_EXIT; } @@ -167,7 +167,7 @@ static void gxv_bsln_parts_fmt1_validate( FT_Bytes tables, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = tables; @@ -175,15 +175,15 @@ GXV_NAME_ENTER( "parts format 1" ); /* deltas */ - gxv_bsln_parts_fmt0_validate( p, limit, valid ); + gxv_bsln_parts_fmt0_validate( p, limit, gxvalid ); /* mappingData */ - valid->lookupval_sign = GXV_LOOKUPVALUE_UNSIGNED; - valid->lookupval_func = gxv_bsln_LookupValue_validate; - valid->lookupfmt4_trans = gxv_bsln_LookupFmt4_transit; + gxvalid->lookupval_sign = GXV_LOOKUPVALUE_UNSIGNED; + gxvalid->lookupval_func = gxv_bsln_LookupValue_validate; + gxvalid->lookupfmt4_trans = gxv_bsln_LookupFmt4_transit; gxv_LookupTable_validate( p + 2 * GXV_BSLN_VALUE_COUNT, limit, - valid ); + gxvalid ); GXV_EXIT; } @@ -192,7 +192,7 @@ static void gxv_bsln_parts_fmt2_validate( FT_Bytes tables, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = tables; @@ -211,7 +211,7 @@ stdGlyph = FT_NEXT_USHORT( p ); GXV_TRACE(( " (stdGlyph = %u)\n", stdGlyph )); - gxv_glyphid_validate( stdGlyph, valid ); + gxv_glyphid_validate( stdGlyph, gxvalid ); /* Record the position of ctlPoints */ GXV_BSLN_DATA( ctlPoints_p ) = p; @@ -226,7 +226,7 @@ FT_INVALID_DATA; } else - gxv_ctlPoint_validate( stdGlyph, (FT_Short)ctlPoint, valid ); + gxv_ctlPoint_validate( stdGlyph, (FT_Short)ctlPoint, gxvalid ); } GXV_EXIT; @@ -236,7 +236,7 @@ static void gxv_bsln_parts_fmt3_validate( FT_Bytes tables, FT_Bytes limit, - GXV_Validator valid) + GXV_Validator gxvalid) { FT_Bytes p = tables; @@ -244,15 +244,15 @@ GXV_NAME_ENTER( "parts format 3" ); /* stdGlyph + ctlPoints */ - gxv_bsln_parts_fmt2_validate( p, limit, valid ); + gxv_bsln_parts_fmt2_validate( p, limit, gxvalid ); /* mappingData */ - valid->lookupval_sign = GXV_LOOKUPVALUE_UNSIGNED; - valid->lookupval_func = gxv_bsln_LookupValue_validate; - valid->lookupfmt4_trans = gxv_bsln_LookupFmt4_transit; + gxvalid->lookupval_sign = GXV_LOOKUPVALUE_UNSIGNED; + gxvalid->lookupval_func = gxv_bsln_LookupValue_validate; + gxvalid->lookupfmt4_trans = gxv_bsln_LookupFmt4_transit; gxv_LookupTable_validate( p + ( 2 + 2 * GXV_BSLN_VALUE_COUNT ), limit, - valid ); + gxvalid ); GXV_EXIT; } @@ -271,8 +271,8 @@ FT_Face face, FT_Validator ftvalid ) { - GXV_ValidatorRec validrec; - GXV_Validator valid = &validrec; + GXV_ValidatorRec gxvalidrec; + GXV_Validator gxvalid = &gxvalidrec; GXV_bsln_DataRec bslnrec; GXV_bsln_Data bsln = &bslnrec; @@ -293,9 +293,9 @@ }; - valid->root = ftvalid; - valid->table_data = bsln; - valid->face = face; + gxvalid->root = ftvalid; + gxvalid->table_data = bsln; + gxvalid->face = face; FT_TRACE3(( "validating `bsln' table\n" )); GXV_INIT; @@ -320,7 +320,7 @@ bsln->defaultBaseline = defaultBaseline; - fmt_funcs_table[format]( p, limit, valid ); + fmt_funcs_table[format]( p, limit, gxvalid ); FT_TRACE4(( "\n" )); } diff --git a/src/gxvalid/gxvcommn.c b/src/gxvalid/gxvcommn.c index 72efd6f..8e72a72 100644 --- a/src/gxvalid/gxvcommn.c +++ b/src/gxvalid/gxvcommn.c @@ -4,7 +4,7 @@ /* */ /* TrueTypeGX/AAT common tables validation (body). */ /* */ -/* Copyright 2004, 2005, 2009, 2010 */ +/* Copyright 2004, 2005, 2009, 2010, 2013 */ /* by suzuki toshiya, Masatake YAMATO, Red Hat K.K., */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ @@ -65,7 +65,7 @@ FT_UShort* buff, FT_UInt nmemb, FT_UShort limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_UInt i; @@ -130,7 +130,7 @@ FT_ULong* buff, FT_UInt nmemb, FT_ULong limit, - GXV_Validator valid) + GXV_Validator gxvalid) { FT_UInt i; @@ -182,7 +182,7 @@ FT_Bytes limit, FT_Byte* min, FT_Byte* max, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; @@ -202,7 +202,7 @@ *max = (FT_Byte)FT_MAX( *max, val ); } - valid->subtable_length = p - table; + gxvalid->subtable_length = p - table; } @@ -211,7 +211,7 @@ FT_Bytes limit, FT_UShort* min, FT_UShort* max, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; @@ -231,7 +231,7 @@ *max = (FT_Byte)FT_MAX( *max, val ); } - valid->subtable_length = p - table; + gxvalid->subtable_length = p - table; } @@ -256,7 +256,7 @@ static void gxv_BinSrchHeader_check_consistency( GXV_BinSrchHeader* binSrchHeader, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_UShort searchRange; FT_UShort entrySelector; @@ -329,7 +329,7 @@ FT_Bytes limit, FT_UShort* unitSize_p, FT_UShort* nUnits_p, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; GXV_BinSrchHeader binSrchHeader; @@ -359,7 +359,7 @@ binSrchHeader.rangeShift = FT_NEXT_USHORT( p ); GXV_TRACE(( "nUnits %d\n", binSrchHeader.nUnits )); - gxv_BinSrchHeader_check_consistency( &binSrchHeader, valid ); + gxv_BinSrchHeader_check_consistency( &binSrchHeader, gxvalid ); if ( *unitSize_p == 0 ) *unitSize_p = binSrchHeader.unitSize; @@ -367,7 +367,7 @@ if ( *nUnits_p == 0 ) *nUnits_p = binSrchHeader.nUnits; - valid->subtable_length = p - table; + gxvalid->subtable_length = p - table; GXV_EXIT; } @@ -422,7 +422,7 @@ static void gxv_LookupTable_fmt0_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; FT_UShort i; @@ -432,24 +432,24 @@ GXV_NAME_ENTER( "LookupTable format 0" ); - GXV_LIMIT_CHECK( 2 * valid->face->num_glyphs ); + GXV_LIMIT_CHECK( 2 * gxvalid->face->num_glyphs ); - for ( i = 0; i < valid->face->num_glyphs; i++ ) + for ( i = 0; i < gxvalid->face->num_glyphs; i++ ) { GXV_LIMIT_CHECK( 2 ); if ( p + 2 >= limit ) /* some fonts have too-short fmt0 array */ { GXV_TRACE(( "too short, glyphs %d - %d are missing\n", - i, valid->face->num_glyphs )); + i, gxvalid->face->num_glyphs )); GXV_SET_ERR_IF_PARANOID( FT_INVALID_GLYPH_ID ); break; } - value = GXV_LOOKUP_VALUE_LOAD( p, valid->lookupval_sign ); - valid->lookupval_func( i, &value, valid ); + value = GXV_LOOKUP_VALUE_LOAD( p, gxvalid->lookupval_sign ); + gxvalid->lookupval_func( i, &value, gxvalid ); } - valid->subtable_length = p - table; + gxvalid->subtable_length = p - table; GXV_EXIT; } @@ -473,12 +473,12 @@ static void gxv_LookupTable_fmt2_skip_endmarkers( FT_Bytes table, FT_UShort unitSize, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; - while ( ( p + 4 ) < valid->root->limit ) + while ( ( p + 4 ) < gxvalid->root->limit ) { if ( p[0] != 0xFF || p[1] != 0xFF || /* lastGlyph */ p[2] != 0xFF || p[3] != 0xFF ) /* firstGlyph */ @@ -486,14 +486,14 @@ p += unitSize; } - valid->subtable_length = p - table; + gxvalid->subtable_length = p - table; } static void gxv_LookupTable_fmt2_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; FT_UShort gid; @@ -509,8 +509,8 @@ GXV_NAME_ENTER( "LookupTable format 2" ); unitSize = nUnits = 0; - gxv_BinSrchHeader_validate( p, limit, &unitSize, &nUnits, valid ); - p += valid->subtable_length; + gxv_BinSrchHeader_validate( p, limit, &unitSize, &nUnits, gxvalid ); + p += gxvalid->subtable_length; GXV_UNITSIZE_VALIDATE( "format2", unitSize, nUnits, 6 ); @@ -519,10 +519,10 @@ GXV_LIMIT_CHECK( 2 + 2 + 2 ); lastGlyph = FT_NEXT_USHORT( p ); firstGlyph = FT_NEXT_USHORT( p ); - value = GXV_LOOKUP_VALUE_LOAD( p, valid->lookupval_sign ); + value = GXV_LOOKUP_VALUE_LOAD( p, gxvalid->lookupval_sign ); - gxv_glyphid_validate( firstGlyph, valid ); - gxv_glyphid_validate( lastGlyph, valid ); + gxv_glyphid_validate( firstGlyph, gxvalid ); + gxv_glyphid_validate( lastGlyph, gxvalid ); if ( lastGlyph < gid ) { @@ -539,7 +539,7 @@ unit, lastGlyph, firstGlyph )); GXV_SET_ERR_IF_PARANOID( FT_INVALID_GLYPH_ID ); - if ( valid->root->level == FT_VALIDATE_TIGHT ) + if ( gxvalid->root->level == FT_VALIDATE_TIGHT ) continue; /* ftxvalidator silently skips such an entry */ FT_TRACE4(( "continuing with exchanged values\n" )); @@ -549,13 +549,13 @@ } for ( gid = firstGlyph; gid <= lastGlyph; gid++ ) - valid->lookupval_func( gid, &value, valid ); + gxvalid->lookupval_func( gid, &value, gxvalid ); } - gxv_LookupTable_fmt2_skip_endmarkers( p, unitSize, valid ); - p += valid->subtable_length; + gxv_LookupTable_fmt2_skip_endmarkers( p, unitSize, gxvalid ); + p += gxvalid->subtable_length; - valid->subtable_length = p - table; + gxvalid->subtable_length = p - table; GXV_EXIT; } @@ -564,7 +564,7 @@ static void gxv_LookupTable_fmt4_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; FT_UShort unit; @@ -581,8 +581,8 @@ GXV_NAME_ENTER( "LookupTable format 4" ); unitSize = nUnits = 0; - gxv_BinSrchHeader_validate( p, limit, &unitSize, &nUnits, valid ); - p += valid->subtable_length; + gxv_BinSrchHeader_validate( p, limit, &unitSize, &nUnits, gxvalid ); + p += gxvalid->subtable_length; GXV_UNITSIZE_VALIDATE( "format4", unitSize, nUnits, 6 ); @@ -592,8 +592,8 @@ lastGlyph = FT_NEXT_USHORT( p ); firstGlyph = FT_NEXT_USHORT( p ); - gxv_glyphid_validate( firstGlyph, valid ); - gxv_glyphid_validate( lastGlyph, valid ); + gxv_glyphid_validate( firstGlyph, gxvalid ); + gxv_glyphid_validate( lastGlyph, gxvalid ); if ( lastGlyph < gid ) { @@ -610,7 +610,7 @@ unit, lastGlyph, firstGlyph )); GXV_SET_ERR_IF_PARANOID( FT_INVALID_GLYPH_ID ); - if ( valid->root->level == FT_VALIDATE_TIGHT ) + if ( gxvalid->root->level == FT_VALIDATE_TIGHT ) continue; /* ftxvalidator silently skips such an entry */ FT_TRACE4(( "continuing with exchanged values\n" )); @@ -624,19 +624,19 @@ for ( gid = firstGlyph; gid <= lastGlyph; gid++ ) { - value = valid->lookupfmt4_trans( (FT_UShort)( gid - firstGlyph ), + value = gxvalid->lookupfmt4_trans( (FT_UShort)( gid - firstGlyph ), &base_value, limit, - valid ); + gxvalid ); - valid->lookupval_func( gid, &value, valid ); + gxvalid->lookupval_func( gid, &value, gxvalid ); } } - gxv_LookupTable_fmt2_skip_endmarkers( p, unitSize, valid ); - p += valid->subtable_length; + gxv_LookupTable_fmt2_skip_endmarkers( p, unitSize, gxvalid ); + p += gxvalid->subtable_length; - valid->subtable_length = p - table; + gxvalid->subtable_length = p - table; GXV_EXIT; } @@ -645,26 +645,26 @@ static void gxv_LookupTable_fmt6_skip_endmarkers( FT_Bytes table, FT_UShort unitSize, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; - while ( p < valid->root->limit ) + while ( p < gxvalid->root->limit ) { if ( p[0] != 0xFF || p[1] != 0xFF ) break; p += unitSize; } - valid->subtable_length = p - table; + gxvalid->subtable_length = p - table; } static void gxv_LookupTable_fmt6_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; FT_UShort unit; @@ -679,8 +679,8 @@ GXV_NAME_ENTER( "LookupTable format 6" ); unitSize = nUnits = 0; - gxv_BinSrchHeader_validate( p, limit, &unitSize, &nUnits, valid ); - p += valid->subtable_length; + gxv_BinSrchHeader_validate( p, limit, &unitSize, &nUnits, gxvalid ); + p += gxvalid->subtable_length; GXV_UNITSIZE_VALIDATE( "format6", unitSize, nUnits, 4 ); @@ -688,9 +688,9 @@ { GXV_LIMIT_CHECK( 2 + 2 ); glyph = FT_NEXT_USHORT( p ); - value = GXV_LOOKUP_VALUE_LOAD( p, valid->lookupval_sign ); + value = GXV_LOOKUP_VALUE_LOAD( p, gxvalid->lookupval_sign ); - if ( gxv_glyphid_validate( glyph, valid ) ) + if ( gxv_glyphid_validate( glyph, gxvalid ) ) GXV_TRACE(( " endmarker found within defined range" " (entry %d < nUnits=%d)\n", unit, nUnits )); @@ -703,13 +703,13 @@ } prev_glyph = glyph; - valid->lookupval_func( glyph, &value, valid ); + gxvalid->lookupval_func( glyph, &value, gxvalid ); } - gxv_LookupTable_fmt6_skip_endmarkers( p, unitSize, valid ); - p += valid->subtable_length; + gxv_LookupTable_fmt6_skip_endmarkers( p, unitSize, gxvalid ); + p += gxvalid->subtable_length; - valid->subtable_length = p - table; + gxvalid->subtable_length = p - table; GXV_EXIT; } @@ -718,7 +718,7 @@ static void gxv_LookupTable_fmt8_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; FT_UShort i; @@ -735,18 +735,18 @@ firstGlyph = FT_NEXT_USHORT( p ); glyphCount = FT_NEXT_USHORT( p ); - gxv_glyphid_validate( firstGlyph, valid ); - gxv_glyphid_validate( (FT_UShort)( firstGlyph + glyphCount ), valid ); + gxv_glyphid_validate( firstGlyph, gxvalid ); + gxv_glyphid_validate( (FT_UShort)( firstGlyph + glyphCount ), gxvalid ); /* valueArray */ for ( i = 0; i < glyphCount; i++ ) { GXV_LIMIT_CHECK( 2 ); - value = GXV_LOOKUP_VALUE_LOAD( p, valid->lookupval_sign ); - valid->lookupval_func( (FT_UShort)( firstGlyph + i ), &value, valid ); + value = GXV_LOOKUP_VALUE_LOAD( p, gxvalid->lookupval_sign ); + gxvalid->lookupval_func( (FT_UShort)( firstGlyph + i ), &value, gxvalid ); } - valid->subtable_length = p - table; + gxvalid->subtable_length = p - table; GXV_EXIT; } @@ -754,7 +754,7 @@ FT_LOCAL_DEF( void ) gxv_LookupTable_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; FT_UShort format; @@ -778,7 +778,7 @@ GXV_NAME_ENTER( "LookupTable" ); /* lookuptbl_head may be used in fmt4 transit function. */ - valid->lookuptbl_head = table; + gxvalid->lookuptbl_head = table; /* format */ GXV_LIMIT_CHECK( 2 ); @@ -792,10 +792,10 @@ if ( func == NULL ) FT_INVALID_FORMAT; - func( p, limit, valid ); - p += valid->subtable_length; + func( p, limit, gxvalid ); + p += gxvalid->subtable_length; - valid->subtable_length = p - table; + gxvalid->subtable_length = p - table; GXV_EXIT; } @@ -811,7 +811,7 @@ FT_LOCAL_DEF( FT_Int ) gxv_glyphid_validate( FT_UShort gid, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Face face; @@ -822,7 +822,7 @@ return 1; } - face = valid->face; + face = gxvalid->face; if ( face->num_glyphs < gid ) { GXV_TRACE(( " gxv_glyphid_check() gid overflow: num_glyphs %d < %d\n", @@ -845,7 +845,7 @@ FT_LOCAL_DEF( void ) gxv_ctlPoint_validate( FT_UShort gid, FT_Short ctl_point, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Face face; FT_Error error; @@ -855,7 +855,7 @@ short n_points; - face = valid->face; + face = gxvalid->face; error = FT_Load_Glyph( face, gid, @@ -885,7 +885,7 @@ gxv_sfntName_validate( FT_UShort name_index, FT_UShort min_index, FT_UShort max_index, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_SfntName name; FT_UInt i; @@ -897,10 +897,10 @@ if ( name_index < min_index || max_index < name_index ) FT_INVALID_FORMAT; - nnames = FT_Get_Sfnt_Name_Count( valid->face ); + nnames = FT_Get_Sfnt_Name_Count( gxvalid->face ); for ( i = 0; i < nnames; i++ ) { - if ( FT_Get_Sfnt_Name( valid->face, i, &name ) != GXV_Err_Ok ) + if ( FT_Get_Sfnt_Name( gxvalid->face, i, &name ) != FT_Err_Ok ) continue ; if ( name.name_id == name_index ) @@ -944,7 +944,7 @@ FT_UShort* length_p, FT_UShort stateSize, FT_Byte* maxClassID_p, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; FT_Bytes limit = table + *length_p; @@ -965,7 +965,7 @@ if ( !nGlyphs ) goto Out; - gxv_glyphid_validate( (FT_UShort)( firstGlyph + nGlyphs ), valid ); + gxv_glyphid_validate( (FT_UShort)( firstGlyph + nGlyphs ), gxvalid ); { FT_Byte nGlyphInClass[256]; @@ -1022,9 +1022,9 @@ FT_UShort stateSize, FT_Byte* maxState_p, FT_Byte* maxEntry_p, - GXV_Validator valid ) + GXV_Validator gxvalid ) { - FT_Bytes p = table; + FT_Bytes p = table; FT_Bytes limit = table + *length_p; FT_Byte clazz; FT_Byte entry; @@ -1076,7 +1076,7 @@ FT_Byte maxClassID, FT_Bytes statetable_table, FT_Bytes statetable_limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; FT_Bytes limit = table + *length_p; @@ -1166,13 +1166,13 @@ goto Exit; } - if ( NULL != valid->statetable.entry_validate_func ) - valid->statetable.entry_validate_func( state, - flags, - &glyphOffset, - statetable_table, - statetable_limit, - valid ); + if ( NULL != gxvalid->statetable.entry_validate_func ) + gxvalid->statetable.entry_validate_func( state, + flags, + &glyphOffset, + statetable_table, + statetable_limit, + gxvalid ); } Exit: @@ -1192,7 +1192,7 @@ FT_UShort* classTable_length_p, FT_UShort* stateArray_length_p, FT_UShort* entryTable_length_p, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_UShort o[3]; FT_UShort* l[3]; @@ -1206,14 +1206,14 @@ l[1] = stateArray_length_p; l[2] = entryTable_length_p; - gxv_set_length_by_ushort_offset( o, l, buff, 3, table_size, valid ); + gxv_set_length_by_ushort_offset( o, l, buff, 3, table_size, gxvalid ); } FT_LOCAL_DEF( void ) gxv_StateTable_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_UShort stateSize; FT_UShort classTable; /* offset to Class(Sub)Table */ @@ -1250,11 +1250,11 @@ if ( stateSize > 0xFF ) FT_INVALID_DATA; - if ( valid->statetable.optdata_load_func != NULL ) - valid->statetable.optdata_load_func( p, limit, valid ); + if ( gxvalid->statetable.optdata_load_func != NULL ) + gxvalid->statetable.optdata_load_func( p, limit, gxvalid ); - if ( valid->statetable.subtable_setup_func != NULL) - setup_func = valid->statetable.subtable_setup_func; + if ( gxvalid->statetable.subtable_setup_func != NULL) + setup_func = gxvalid->statetable.subtable_setup_func; else setup_func = gxv_StateTable_subtable_setup; @@ -1265,7 +1265,7 @@ &classTable_length, &stateArray_length, &entryTable_length, - valid ); + gxvalid ); GXV_TRACE(( "StateTable Subtables\n" )); @@ -1274,7 +1274,7 @@ &classTable_length, stateSize, &maxClassID, - valid ); + gxvalid ); else maxClassID = (FT_Byte)( stateSize - 1 ); @@ -1285,10 +1285,12 @@ stateSize, &maxState, &maxEntry, - valid ); + gxvalid ); else { +#if 0 maxState = 1; /* 0:start of text, 1:start of line are predefined */ +#endif maxEntry = 0; } @@ -1304,7 +1306,7 @@ maxClassID, table, limit, - valid ); + gxvalid ); GXV_EXIT; } @@ -1320,7 +1322,7 @@ FT_ULong* classTable_length_p, FT_ULong* stateArray_length_p, FT_ULong* entryTable_length_p, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_ULong o[3]; FT_ULong* l[3]; @@ -1334,21 +1336,21 @@ l[1] = stateArray_length_p; l[2] = entryTable_length_p; - gxv_set_length_by_ulong_offset( o, l, buff, 3, table_size, valid ); + gxv_set_length_by_ulong_offset( o, l, buff, 3, table_size, gxvalid ); } static void gxv_XClassTable_lookupval_validate( FT_UShort glyph, GXV_LookupValueCPtr value_p, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_UNUSED( glyph ); - if ( value_p->u >= valid->xstatetable.nClasses ) + if ( value_p->u >= gxvalid->xstatetable.nClasses ) FT_INVALID_DATA; - if ( value_p->u > valid->xstatetable.maxClassID ) - valid->xstatetable.maxClassID = value_p->u; + if ( value_p->u > gxvalid->xstatetable.maxClassID ) + gxvalid->xstatetable.maxClassID = value_p->u; } @@ -1382,7 +1384,7 @@ gxv_XClassTable_lookupfmt4_transit( FT_UShort relative_gindex, GXV_LookupValueCPtr base_value_p, FT_Bytes lookuptbl_limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p; FT_Bytes limit; @@ -1393,7 +1395,7 @@ offset = (FT_UShort)( base_value_p->u + relative_gindex * sizeof ( FT_UShort ) ); - p = valid->lookuptbl_head + offset; + p = gxvalid->lookuptbl_head + offset; limit = lookuptbl_limit; GXV_LIMIT_CHECK ( 2 ); @@ -1410,7 +1412,7 @@ FT_ULong stateSize, FT_UShort* maxState_p, FT_UShort* maxEntry_p, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; FT_Bytes limit = table + *length_p; @@ -1461,7 +1463,7 @@ FT_UShort maxClassID, FT_Bytes xstatetable_table, FT_Bytes xstatetable_limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; FT_Bytes limit = table + *length_p; @@ -1538,13 +1540,13 @@ goto Exit; } - if ( NULL != valid->xstatetable.entry_validate_func ) - valid->xstatetable.entry_validate_func( state, - flags, - &glyphOffset, - xstatetable_table, - xstatetable_limit, - valid ); + if ( NULL != gxvalid->xstatetable.entry_validate_func ) + gxvalid->xstatetable.entry_validate_func( state, + flags, + &glyphOffset, + xstatetable_table, + xstatetable_limit, + gxvalid ); } Exit: @@ -1557,7 +1559,7 @@ FT_LOCAL_DEF( void ) gxv_XStateTable_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { /* StateHeader members */ FT_ULong classTable; /* offset to Class(Sub)Table */ @@ -1580,26 +1582,26 @@ GXV_TRACE(( "XStateTable header\n" )); GXV_LIMIT_CHECK( 4 + 4 + 4 + 4 ); - valid->xstatetable.nClasses = FT_NEXT_ULONG( p ); + gxvalid->xstatetable.nClasses = FT_NEXT_ULONG( p ); classTable = FT_NEXT_ULONG( p ); stateArray = FT_NEXT_ULONG( p ); entryTable = FT_NEXT_ULONG( p ); - GXV_TRACE(( "nClasses =0x%08x\n", valid->xstatetable.nClasses )); + GXV_TRACE(( "nClasses =0x%08x\n", gxvalid->xstatetable.nClasses )); GXV_TRACE(( "offset to classTable=0x%08x\n", classTable )); GXV_TRACE(( "offset to stateArray=0x%08x\n", stateArray )); GXV_TRACE(( "offset to entryTable=0x%08x\n", entryTable )); - if ( valid->xstatetable.nClasses > 0xFFFFU ) + if ( gxvalid->xstatetable.nClasses > 0xFFFFU ) FT_INVALID_DATA; GXV_TRACE(( "StateTable Subtables\n" )); - if ( valid->xstatetable.optdata_load_func != NULL ) - valid->xstatetable.optdata_load_func( p, limit, valid ); + if ( gxvalid->xstatetable.optdata_load_func != NULL ) + gxvalid->xstatetable.optdata_load_func( p, limit, gxvalid ); - if ( valid->xstatetable.subtable_setup_func != NULL ) - setup_func = valid->xstatetable.subtable_setup_func; + if ( gxvalid->xstatetable.subtable_setup_func != NULL ) + setup_func = gxvalid->xstatetable.subtable_setup_func; else setup_func = gxv_XStateTable_subtable_setup; @@ -1610,38 +1612,42 @@ &classTable_length, &stateArray_length, &entryTable_length, - valid ); + gxvalid ); if ( classTable != 0 ) { - valid->xstatetable.maxClassID = 0; - valid->lookupval_sign = GXV_LOOKUPVALUE_UNSIGNED; - valid->lookupval_func = gxv_XClassTable_lookupval_validate; - valid->lookupfmt4_trans = gxv_XClassTable_lookupfmt4_transit; + gxvalid->xstatetable.maxClassID = 0; + gxvalid->lookupval_sign = GXV_LOOKUPVALUE_UNSIGNED; + gxvalid->lookupval_func = gxv_XClassTable_lookupval_validate; + gxvalid->lookupfmt4_trans = gxv_XClassTable_lookupfmt4_transit; gxv_LookupTable_validate( table + classTable, table + classTable + classTable_length, - valid ); - if ( valid->subtable_length < classTable_length ) - classTable_length = valid->subtable_length; + gxvalid ); +#if 0 + if ( gxvalid->subtable_length < classTable_length ) + classTable_length = gxvalid->subtable_length; +#endif } else { /* XXX: check range? */ - valid->xstatetable.maxClassID = - (FT_UShort)( valid->xstatetable.nClasses - 1 ); + gxvalid->xstatetable.maxClassID = + (FT_UShort)( gxvalid->xstatetable.nClasses - 1 ); } if ( stateArray != 0 ) gxv_XStateArray_validate( table + stateArray, &stateArray_length, - valid->xstatetable.maxClassID, - valid->xstatetable.nClasses, + gxvalid->xstatetable.maxClassID, + gxvalid->xstatetable.nClasses, &maxState, &maxEntry, - valid ); + gxvalid ); else { +#if 0 maxState = 1; /* 0:start of text, 1:start of line are predefined */ +#endif maxEntry = 0; } @@ -1653,10 +1659,10 @@ &entryTable_length, maxEntry, stateArray_length, - valid->xstatetable.maxClassID, + gxvalid->xstatetable.maxClassID, table, limit, - valid ); + gxvalid ); GXV_EXIT; } @@ -1713,7 +1719,7 @@ FT_LOCAL_DEF( void ) gxv_odtect_validate( GXV_odtect_Range odtect, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_UInt i, j; @@ -1727,6 +1733,7 @@ odtect->range[j].start, odtect->range[j].length ) ) { +#ifdef FT_DEBUG_LEVEL_TRACE if ( odtect->range[i].name || odtect->range[j].name ) GXV_TRACE(( "found overlap between range %d and range %d\n", i, j )); @@ -1734,6 +1741,7 @@ GXV_TRACE(( "found overlap between `%s' and `%s\'\n", odtect->range[i].name, odtect->range[j].name )); +#endif FT_INVALID_OFFSET; } diff --git a/src/gxvalid/gxvcommn.h b/src/gxvalid/gxvcommn.h index 1ff87e4..f114345 100644 --- a/src/gxvalid/gxvcommn.h +++ b/src/gxvalid/gxvcommn.h @@ -4,7 +4,7 @@ /* */ /* TrueTypeGX/AAT common tables validation (specification). */ /* */ -/* Copyright 2004, 2005, 2012 */ +/* Copyright 2004, 2005, 2012, 2014 */ /* by suzuki toshiya, Masatake YAMATO, Red Hat K.K., */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ @@ -62,7 +62,7 @@ FT_BEGIN_HEADER #undef GXV_LOAD_UNUSED_VARS /* debug purpose */ -#define IS_PARANOID_VALIDATION ( valid->root->level >= FT_VALIDATE_PARANOID ) +#define IS_PARANOID_VALIDATION ( gxvalid->root->level >= FT_VALIDATE_PARANOID ) #define GXV_SET_ERR_IF_PARANOID( err ) { if ( IS_PARANOID_VALIDATION ) ( err ); } /*************************************************************************/ @@ -81,7 +81,7 @@ FT_BEGIN_HEADER typedef void (*GXV_Validate_Func)( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ); + GXV_Validator gxvalid ); /* ====================== LookupTable Validator ======================== */ @@ -106,13 +106,13 @@ FT_BEGIN_HEADER typedef void (*GXV_Lookup_Value_Validate_Func)( FT_UShort glyph, GXV_LookupValueCPtr value_p, - GXV_Validator valid ); + GXV_Validator gxvalid ); typedef GXV_LookupValueDesc (*GXV_Lookup_Fmt4_Transit_Func)( FT_UShort relative_gindex, GXV_LookupValueCPtr base_value_p, FT_Bytes lookuptbl_limit, - GXV_Validator valid ); + GXV_Validator gxvalid ); /* ====================== StateTable Validator ========================= */ @@ -131,10 +131,10 @@ FT_BEGIN_HEADER #define GXV_GLYPHOFFSET_FMT( table ) \ - ( valid->table.entry_glyphoffset_fmt ) + ( gxvalid->table.entry_glyphoffset_fmt ) #define GXV_GLYPHOFFSET_SIZE( table ) \ - ( valid->table.entry_glyphoffset_fmt / 2 ) + ( gxvalid->table.entry_glyphoffset_fmt / 2 ) /* ----------------------- 16bit StateTable ---------------------------- */ @@ -160,7 +160,7 @@ FT_BEGIN_HEADER FT_UShort* classTable_length_p, FT_UShort* stateArray_length_p, FT_UShort* entryTable_length_p, - GXV_Validator valid ); + GXV_Validator gxvalid ); typedef void (*GXV_StateTable_Entry_Validate_Func)( @@ -169,12 +169,12 @@ FT_BEGIN_HEADER GXV_StateTable_GlyphOffsetCPtr glyphOffset_p, FT_Bytes statetable_table, FT_Bytes statetable_limit, - GXV_Validator valid ); + GXV_Validator gxvalid ); typedef void (*GXV_StateTable_OptData_Load_Func)( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ); + GXV_Validator gxvalid ); typedef struct GXV_StateTable_ValidatorRec_ { @@ -202,7 +202,7 @@ FT_BEGIN_HEADER FT_ULong* classTable_length_p, FT_ULong* stateArray_length_p, FT_ULong* entryTable_length_p, - GXV_Validator valid ); + GXV_Validator gxvalid ); typedef void (*GXV_XStateTable_Entry_Validate_Func)( @@ -211,7 +211,7 @@ FT_BEGIN_HEADER GXV_StateTable_GlyphOffsetCPtr glyphOffset_p, FT_Bytes xstatetable_table, FT_Bytes xstatetable_limit, - GXV_Validator valid ); + GXV_Validator gxvalid ); typedef GXV_StateTable_OptData_Load_Func GXV_XStateTable_OptData_Load_Func; @@ -263,35 +263,35 @@ FT_BEGIN_HEADER #define GXV_TABLE_DATA( tag, field ) \ - ( ( (GXV_ ## tag ## _Data)valid->table_data )->field ) + ( ( (GXV_ ## tag ## _Data)gxvalid->table_data )->field ) #undef FT_INVALID_ -#define FT_INVALID_( _prefix, _error ) \ - ft_validator_error( valid->root, _prefix ## _error ) +#define FT_INVALID_( _error ) \ + ft_validator_error( gxvalid->root, FT_THROW( _error ) ) #define GXV_LIMIT_CHECK( _count ) \ FT_BEGIN_STMNT \ - if ( p + _count > ( limit? limit : valid->root->limit ) ) \ + if ( p + _count > ( limit? limit : gxvalid->root->limit ) ) \ FT_INVALID_TOO_SHORT; \ FT_END_STMNT #ifdef FT_DEBUG_LEVEL_TRACE -#define GXV_INIT valid->debug_indent = 0 +#define GXV_INIT gxvalid->debug_indent = 0 #define GXV_NAME_ENTER( name ) \ FT_BEGIN_STMNT \ - valid->debug_indent += 2; \ - FT_TRACE4(( "%*.s", valid->debug_indent, 0 )); \ + gxvalid->debug_indent += 2; \ + FT_TRACE4(( "%*.s", gxvalid->debug_indent, 0 )); \ FT_TRACE4(( "%s table\n", name )); \ FT_END_STMNT -#define GXV_EXIT valid->debug_indent -= 2 +#define GXV_EXIT gxvalid->debug_indent -= 2 #define GXV_TRACE( s ) \ FT_BEGIN_STMNT \ - FT_TRACE4(( "%*.s", valid->debug_indent, 0 )); \ + FT_TRACE4(( "%*.s", gxvalid->debug_indent, 0 )); \ FT_TRACE4( s ); \ FT_END_STMNT @@ -318,7 +318,7 @@ FT_BEGIN_HEADER FT_BEGIN_STMNT \ { \ if ( (a) & 3 ) \ - FT_INVALID_OFFSET ; \ + FT_INVALID_OFFSET; \ } \ FT_END_STMNT @@ -349,7 +349,7 @@ FT_BEGIN_HEADER \ \ for ( b = p; b < (FT_Bytes)p + len; b++ ) \ - if ( 0x40 < *b && *b < 0x7e ) \ + if ( 0x40 < *b && *b < 0x7E ) \ FT_TRACE1(("%c", *b)) ; \ else \ FT_TRACE1(("\\x%02x", *b)) ; \ @@ -373,12 +373,12 @@ FT_BEGIN_HEADER FT_Bytes limit, FT_UShort* unitSize_p, FT_UShort* nUnits_p, - GXV_Validator valid ); + GXV_Validator gxvalid ); FT_LOCAL( void ) gxv_LookupTable_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ); + GXV_Validator gxvalid ); /*************************************************************************/ @@ -391,7 +391,7 @@ FT_BEGIN_HEADER FT_LOCAL( FT_Int ) gxv_glyphid_validate( FT_UShort gid, - GXV_Validator valid ); + GXV_Validator gxvalid ); /*************************************************************************/ @@ -405,7 +405,7 @@ FT_BEGIN_HEADER FT_LOCAL( void ) gxv_ctlPoint_validate( FT_UShort gid, FT_Short ctl_point, - GXV_Validator valid ); + GXV_Validator gxvalid ); /*************************************************************************/ @@ -420,7 +420,7 @@ FT_BEGIN_HEADER gxv_sfntName_validate( FT_UShort name_index, FT_UShort min_index, FT_UShort max_index, - GXV_Validator valid ); + GXV_Validator gxvalid ); /*************************************************************************/ @@ -439,7 +439,7 @@ FT_BEGIN_HEADER FT_UShort* classTable_length_p, FT_UShort* stateArray_length_p, FT_UShort* entryTable_length_p, - GXV_Validator valid ); + GXV_Validator gxvalid ); FT_LOCAL( void ) gxv_XStateTable_subtable_setup( FT_ULong table_size, @@ -449,17 +449,17 @@ FT_BEGIN_HEADER FT_ULong* classTable_length_p, FT_ULong* stateArray_length_p, FT_ULong* entryTable_length_p, - GXV_Validator valid ); + GXV_Validator gxvalid ); FT_LOCAL( void ) gxv_StateTable_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ); + GXV_Validator gxvalid ); FT_LOCAL( void ) gxv_XStateTable_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ); + GXV_Validator gxvalid ); /*************************************************************************/ @@ -475,14 +475,14 @@ FT_BEGIN_HEADER FT_Bytes limit, FT_Byte* min, FT_Byte* max, - GXV_Validator valid ); + GXV_Validator gxvalid ); FT_LOCAL( void ) gxv_array_getlimits_ushort( FT_Bytes table, FT_Bytes limit, FT_UShort* min, FT_UShort* max, - GXV_Validator valid ); + GXV_Validator gxvalid ); FT_LOCAL( void ) gxv_set_length_by_ushort_offset( FT_UShort* offset, @@ -490,7 +490,7 @@ FT_BEGIN_HEADER FT_UShort* buff, FT_UInt nmemb, FT_UShort limit, - GXV_Validator valid ); + GXV_Validator gxvalid ); FT_LOCAL( void ) gxv_set_length_by_ulong_offset( FT_ULong* offset, @@ -498,19 +498,19 @@ FT_BEGIN_HEADER FT_ULong* buff, FT_UInt nmemb, FT_ULong limit, - GXV_Validator valid); + GXV_Validator gxvalid); #define GXV_SUBTABLE_OFFSET_CHECK( _offset ) \ FT_BEGIN_STMNT \ - if ( (_offset) > valid->subtable_length ) \ + if ( (_offset) > gxvalid->subtable_length ) \ FT_INVALID_OFFSET; \ FT_END_STMNT #define GXV_SUBTABLE_LIMIT_CHECK( _count ) \ FT_BEGIN_STMNT \ - if ( ( p + (_count) - valid->subtable_start ) > \ - valid->subtable_length ) \ + if ( ( p + (_count) - gxvalid->subtable_start ) > \ + gxvalid->subtable_length ) \ FT_INVALID_TOO_SHORT; \ FT_END_STMNT @@ -556,7 +556,7 @@ FT_BEGIN_HEADER FT_LOCAL( void ) gxv_odtect_validate( GXV_odtect_Range odtect, - GXV_Validator valid ); + GXV_Validator gxvalid ); #define GXV_ODTECT( n, odtect ) \ diff --git a/src/gxvalid/gxverror.h b/src/gxvalid/gxverror.h index 7d2ef78..c573b72 100644 --- a/src/gxvalid/gxverror.h +++ b/src/gxvalid/gxverror.h @@ -4,7 +4,7 @@ /* */ /* TrueTypeGX/AAT validation module error codes (specification only). */ /* */ -/* Copyright 2004, 2005, 2012 */ +/* Copyright 2004, 2005, 2012-2013 */ /* by suzuki toshiya, Masatake YAMATO, Red Hat K.K., */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ @@ -41,9 +41,7 @@ #undef FT_ERR_PREFIX #define FT_ERR_PREFIX GXV_Err_ -#define FT_ERR_BASE FT_Mod_Err_GXV - -#define FT_KEEP_ERR_PREFIX +#define FT_ERR_BASE FT_Mod_Err_GXvalid #include FT_ERRORS_H diff --git a/src/gxvalid/gxvfeat.c b/src/gxvalid/gxvfeat.c index 6f75650..69298b2 100644 --- a/src/gxvalid/gxvfeat.c +++ b/src/gxvalid/gxvfeat.c @@ -82,7 +82,7 @@ gxv_feat_registry_validate( FT_UShort feature, FT_UShort nSettings, FT_Bool exclusive, - GXV_Validator valid ) + GXV_Validator gxvalid ) { GXV_NAME_ENTER( "feature in registry" ); @@ -108,7 +108,7 @@ { /* Don't use here. Apple is reserved. */ GXV_TRACE(( "feature number %d is reserved by Apple\n", feature )); - if ( valid->root->level >= FT_VALIDATE_TIGHT ) + if ( gxvalid->root->level >= FT_VALIDATE_TIGHT ) FT_INVALID_DATA; } @@ -117,7 +117,7 @@ GXV_TRACE(( "feature %d: nSettings %d != defined nSettings %d\n", feature, nSettings, gxv_feat_registry[feature].nSettings )); - if ( valid->root->level >= FT_VALIDATE_TIGHT ) + if ( gxvalid->root->level >= FT_VALIDATE_TIGHT ) FT_INVALID_DATA; } @@ -125,7 +125,7 @@ { GXV_TRACE(( "exclusive flag %d differs from predefined value\n", exclusive )); - if ( valid->root->level >= FT_VALIDATE_TIGHT ) + if ( gxvalid->root->level >= FT_VALIDATE_TIGHT ) FT_INVALID_DATA; } @@ -137,7 +137,7 @@ static void gxv_feat_name_index_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; @@ -153,7 +153,7 @@ gxv_sfntName_validate( (FT_UShort)nameIndex, 255, 32768U, - valid ); + gxvalid ); GXV_EXIT; } @@ -163,7 +163,7 @@ gxv_feat_setting_validate( FT_Bytes table, FT_Bytes limit, FT_Bool exclusive, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; FT_UShort setting; @@ -179,7 +179,7 @@ if ( exclusive && ( setting & 1 ) == 0 ) FT_INVALID_DATA; - gxv_feat_name_index_validate( p, limit, valid ); + gxv_feat_name_index_validate( p, limit, gxvalid ); GXV_FEAT_DATA( setting ) = setting; @@ -190,7 +190,7 @@ static void gxv_feat_name_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; FT_UInt reserved_size = GXV_FEAT_DATA( reserved_size ); @@ -240,14 +240,14 @@ FT_INVALID_FORMAT; } - gxv_feat_registry_validate( feature, nSettings, exclusive, valid ); + gxv_feat_registry_validate( feature, nSettings, exclusive, gxvalid ); - gxv_feat_name_index_validate( p, limit, valid ); + gxv_feat_name_index_validate( p, limit, gxvalid ); - p = valid->root->base + settingTable; + p = gxvalid->root->base + settingTable; for ( last_setting = -1, i = 0; i < nSettings; i++ ) { - gxv_feat_setting_validate( p, limit, exclusive, valid ); + gxv_feat_setting_validate( p, limit, exclusive, gxvalid ); if ( (FT_Int)GXV_FEAT_DATA( setting ) <= last_setting ) GXV_SET_ERR_IF_PARANOID( FT_INVALID_FORMAT ); @@ -274,8 +274,8 @@ FT_Face face, FT_Validator ftvalid ) { - GXV_ValidatorRec validrec; - GXV_Validator valid = &validrec; + GXV_ValidatorRec gxvalidrec; + GXV_Validator gxvalid = &gxvalidrec; GXV_feat_DataRec featrec; GXV_feat_Data feat = &featrec; @@ -289,9 +289,9 @@ FT_Int last_feature; - valid->root = ftvalid; - valid->table_data = feat; - valid->face = face; + gxvalid->root = ftvalid; + gxvalid->table_data = feat; + gxvalid->face = face; FT_TRACE3(( "validating `feat' table\n" )); GXV_INIT; @@ -323,7 +323,7 @@ for ( last_feature = -1, i = 0; i < featureNameCount; i++ ) { - gxv_feat_name_validate( p, limit, valid ); + gxv_feat_name_validate( p, limit, gxvalid ); if ( (FT_Int)GXV_FEAT_DATA( feature ) <= last_feature ) GXV_SET_ERR_IF_PARANOID( FT_INVALID_FORMAT ); diff --git a/src/gxvalid/gxvjust.c b/src/gxvalid/gxvjust.c index 7816e0b..24c26a5 100644 --- a/src/gxvalid/gxvjust.c +++ b/src/gxvalid/gxvjust.c @@ -4,7 +4,7 @@ /* */ /* TrueTypeGX/AAT just table validation (body). */ /* */ -/* Copyright 2005 by suzuki toshiya, Masatake YAMATO, Red Hat K.K., */ +/* Copyright 2005, 2014 by suzuki toshiya, Masatake YAMATO, Red Hat K.K., */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -69,14 +69,14 @@ static void gxv_just_check_max_gid( FT_UShort gid, const FT_String* msg_tag, - GXV_Validator valid ) + GXV_Validator gxvalid ) { - if ( gid < valid->face->num_glyphs ) + if ( gid < gxvalid->face->num_glyphs ) return; GXV_TRACE(( "just table includes too large %s" " GID=%d > %d (in maxp)\n", - msg_tag, gid, valid->face->num_glyphs )); + msg_tag, gid, gxvalid->face->num_glyphs )); GXV_SET_ERR_IF_PARANOID( FT_INVALID_GLYPH_ID ); } @@ -84,7 +84,7 @@ static void gxv_just_wdp_entry_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; FT_ULong justClass; @@ -112,7 +112,7 @@ #endif /* According to Apple spec, only 7bits in justClass is used */ - if ( ( justClass & 0xFFFFFF80 ) != 0 ) + if ( ( justClass & 0xFFFFFF80UL ) != 0 ) { GXV_TRACE(( "just table includes non-zero value" " in unused justClass higher bits" @@ -120,14 +120,14 @@ GXV_SET_ERR_IF_PARANOID( FT_INVALID_DATA ); } - valid->subtable_length = p - table; + gxvalid->subtable_length = p - table; } static void gxv_just_wdc_entry_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; FT_ULong count, i; @@ -138,18 +138,18 @@ for ( i = 0; i < count; i++ ) { GXV_TRACE(( "validating wdc pair %d/%d\n", i + 1, count )); - gxv_just_wdp_entry_validate( p, limit, valid ); - p += valid->subtable_length; + gxv_just_wdp_entry_validate( p, limit, gxvalid ); + p += gxvalid->subtable_length; } - valid->subtable_length = p - table; + gxvalid->subtable_length = p - table; } static void gxv_just_widthDeltaClusters_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table ; FT_Bytes wdc_end = table + GXV_JUST_DATA( wdc_offset_max ); @@ -163,11 +163,11 @@ for ( i = 0; p <= wdc_end; i++ ) { - gxv_just_wdc_entry_validate( p, limit, valid ); - p += valid->subtable_length; + gxv_just_wdc_entry_validate( p, limit, gxvalid ); + p += gxvalid->subtable_length; } - valid->subtable_length = p - table; + gxvalid->subtable_length = p - table; GXV_EXIT; } @@ -176,7 +176,7 @@ static void gxv_just_actSubrecord_type0_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; @@ -214,17 +214,17 @@ GXV_LIMIT_CHECK( 2 ); glyphs = FT_NEXT_USHORT( p ); - gxv_just_check_max_gid( glyphs, "type0:glyphs", valid ); + gxv_just_check_max_gid( glyphs, "type0:glyphs", gxvalid ); } - valid->subtable_length = p - table; + gxvalid->subtable_length = p - table; } static void gxv_just_actSubrecord_type1_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; FT_UShort addGlyph; @@ -233,20 +233,20 @@ GXV_LIMIT_CHECK( 2 ); addGlyph = FT_NEXT_USHORT( p ); - gxv_just_check_max_gid( addGlyph, "type1:addGlyph", valid ); + gxv_just_check_max_gid( addGlyph, "type1:addGlyph", gxvalid ); - valid->subtable_length = p - table; + gxvalid->subtable_length = p - table; } static void gxv_just_actSubrecord_type2_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; #ifdef GXV_LOAD_UNUSED_VARS - FT_Fixed substThreshhold; /* Apple misspelled "Threshhold" */ + FT_Fixed substThreshhold; /* Apple misspelled "Threshhold" */ #endif FT_UShort addGlyph; FT_UShort substGlyph; @@ -262,18 +262,18 @@ substGlyph = FT_NEXT_USHORT( p ); if ( addGlyph != 0xFFFF ) - gxv_just_check_max_gid( addGlyph, "type2:addGlyph", valid ); + gxv_just_check_max_gid( addGlyph, "type2:addGlyph", gxvalid ); - gxv_just_check_max_gid( substGlyph, "type2:substGlyph", valid ); + gxv_just_check_max_gid( substGlyph, "type2:substGlyph", gxvalid ); - valid->subtable_length = p - table; + gxvalid->subtable_length = p - table; } static void gxv_just_actSubrecord_type4_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; FT_ULong variantsAxis; @@ -288,9 +288,9 @@ noStretchValue = FT_NEXT_ULONG( p ); maximumLimit = FT_NEXT_ULONG( p ); - valid->subtable_length = p - table; + gxvalid->subtable_length = p - table; - if ( variantsAxis != 0x64756374 ) /* 'duct' */ + if ( variantsAxis != 0x64756374L ) /* 'duct' */ GXV_TRACE(( "variantsAxis 0x%08x is non default value", variantsAxis )); @@ -310,7 +310,7 @@ static void gxv_just_actSubrecord_type5_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; FT_UShort flags; @@ -324,9 +324,9 @@ if ( flags ) GXV_TRACE(( "type5: nonzero value 0x%04x in unused flags\n", flags )); - gxv_just_check_max_gid( glyph, "type5:glyph", valid ); + gxv_just_check_max_gid( glyph, "type5:glyph", gxvalid ); - valid->subtable_length = p - table; + gxvalid->subtable_length = p - table; } @@ -334,7 +334,7 @@ static void gxv_just_actSubrecord_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; FT_UShort actionClass; @@ -354,21 +354,21 @@ GXV_SET_ERR_IF_PARANOID( FT_INVALID_DATA ); if ( actionType == 0 ) - gxv_just_actSubrecord_type0_validate( p, limit, valid ); + gxv_just_actSubrecord_type0_validate( p, limit, gxvalid ); else if ( actionType == 1 ) - gxv_just_actSubrecord_type1_validate( p, limit, valid ); + gxv_just_actSubrecord_type1_validate( p, limit, gxvalid ); else if ( actionType == 2 ) - gxv_just_actSubrecord_type2_validate( p, limit, valid ); + gxv_just_actSubrecord_type2_validate( p, limit, gxvalid ); else if ( actionType == 3 ) ; /* Stretch glyph action: no actionData */ else if ( actionType == 4 ) - gxv_just_actSubrecord_type4_validate( p, limit, valid ); + gxv_just_actSubrecord_type4_validate( p, limit, gxvalid ); else if ( actionType == 5 ) - gxv_just_actSubrecord_type5_validate( p, limit, valid ); + gxv_just_actSubrecord_type5_validate( p, limit, gxvalid ); else FT_INVALID_DATA; - valid->subtable_length = actionLength; + gxvalid->subtable_length = actionLength; GXV_EXIT; } @@ -377,7 +377,7 @@ static void gxv_just_pcActionRecord_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; FT_ULong actionCount; @@ -390,11 +390,11 @@ for ( i = 0; i < actionCount; i++ ) { - gxv_just_actSubrecord_validate( p, limit, valid ); - p += valid->subtable_length; + gxv_just_actSubrecord_validate( p, limit, gxvalid ); + p += gxvalid->subtable_length; } - valid->subtable_length = p - table; + gxvalid->subtable_length = p - table; GXV_EXIT; } @@ -403,7 +403,7 @@ static void gxv_just_pcTable_LookupValue_entry_validate( FT_UShort glyph, GXV_LookupValueCPtr value_p, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_UNUSED( glyph ); @@ -417,19 +417,19 @@ static void gxv_just_pcLookupTable_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { - FT_Bytes p = table; + FT_Bytes p = table; GXV_NAME_ENTER( "just pcLookupTable" ); GXV_JUST_DATA( pc_offset_max ) = 0x0000; GXV_JUST_DATA( pc_offset_min ) = 0xFFFFU; - valid->lookupval_sign = GXV_LOOKUPVALUE_UNSIGNED; - valid->lookupval_func = gxv_just_pcTable_LookupValue_entry_validate; + gxvalid->lookupval_sign = GXV_LOOKUPVALUE_UNSIGNED; + gxvalid->lookupval_func = gxv_just_pcTable_LookupValue_entry_validate; - gxv_LookupTable_validate( p, limit, valid ); + gxv_LookupTable_validate( p, limit, gxvalid ); /* subtable_length is set by gxv_LookupTable_validate() */ @@ -440,20 +440,20 @@ static void gxv_just_postcompTable_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; GXV_NAME_ENTER( "just postcompTable" ); - gxv_just_pcLookupTable_validate( p, limit, valid ); - p += valid->subtable_length; + gxv_just_pcLookupTable_validate( p, limit, gxvalid ); + p += gxvalid->subtable_length; - gxv_just_pcActionRecord_validate( p, limit, valid ); - p += valid->subtable_length; + gxv_just_pcActionRecord_validate( p, limit, gxvalid ); + p += gxvalid->subtable_length; - valid->subtable_length = p - table; + gxvalid->subtable_length = p - table; GXV_EXIT; } @@ -466,7 +466,7 @@ GXV_StateTable_GlyphOffsetCPtr glyphOffset_p, FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { #ifdef GXV_LOAD_UNUSED_VARS /* TODO: validate markClass & currentClass */ @@ -480,7 +480,7 @@ FT_UNUSED( glyphOffset_p ); FT_UNUSED( table ); FT_UNUSED( limit ); - FT_UNUSED( valid ); + FT_UNUSED( gxvalid ); #ifndef GXV_LOAD_UNUSED_VARS FT_UNUSED( flags ); @@ -496,7 +496,7 @@ static void gxv_just_justClassTable_validate ( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; FT_UShort length; @@ -521,14 +521,14 @@ GXV_TRACE(( " justClassTable: nonzero value (0x%08x)" " in unused subFeatureFlags\n", subFeatureFlags )); - valid->statetable.optdata = NULL; - valid->statetable.optdata_load_func = NULL; - valid->statetable.subtable_setup_func = NULL; - valid->statetable.entry_glyphoffset_fmt = GXV_GLYPHOFFSET_NONE; - valid->statetable.entry_validate_func = + gxvalid->statetable.optdata = NULL; + gxvalid->statetable.optdata_load_func = NULL; + gxvalid->statetable.subtable_setup_func = NULL; + gxvalid->statetable.entry_glyphoffset_fmt = GXV_GLYPHOFFSET_NONE; + gxvalid->statetable.entry_validate_func = gxv_just_classTable_entry_validate; - gxv_StateTable_validate( p, table + length, valid ); + gxv_StateTable_validate( p, table + length, gxvalid ); /* subtable_length is set by gxv_LookupTable_validate() */ @@ -539,7 +539,7 @@ static void gxv_just_wdcTable_LookupValue_validate( FT_UShort glyph, GXV_LookupValueCPtr value_p, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_UNUSED( glyph ); @@ -553,7 +553,7 @@ static void gxv_just_justData_lookuptable_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; @@ -561,10 +561,10 @@ GXV_JUST_DATA( wdc_offset_max ) = 0x0000; GXV_JUST_DATA( wdc_offset_min ) = 0xFFFFU; - valid->lookupval_sign = GXV_LOOKUPVALUE_UNSIGNED; - valid->lookupval_func = gxv_just_wdcTable_LookupValue_validate; + gxvalid->lookupval_sign = GXV_LOOKUPVALUE_UNSIGNED; + gxvalid->lookupval_func = gxv_just_wdcTable_LookupValue_validate; - gxv_LookupTable_validate( p, limit, valid ); + gxv_LookupTable_validate( p, limit, gxvalid ); /* subtable_length is set by gxv_LookupTable_validate() */ @@ -578,7 +578,7 @@ static void gxv_just_justData_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { /* * following 3 offsets are measured from the start of `just' @@ -604,36 +604,36 @@ GXV_TRACE(( " (wdcTableOffset = 0x%04x)\n", wdcTableOffset )); GXV_TRACE(( " (pcTableOffset = 0x%04x)\n", pcTableOffset )); - gxv_just_justData_lookuptable_validate( p, limit, valid ); - gxv_odtect_add_range( p, valid->subtable_length, + gxv_just_justData_lookuptable_validate( p, limit, gxvalid ); + gxv_odtect_add_range( p, gxvalid->subtable_length, "just_LookupTable", odtect ); if ( wdcTableOffset ) { gxv_just_widthDeltaClusters_validate( - valid->root->base + wdcTableOffset, limit, valid ); - gxv_odtect_add_range( valid->root->base + wdcTableOffset, - valid->subtable_length, "just_wdcTable", odtect ); + gxvalid->root->base + wdcTableOffset, limit, gxvalid ); + gxv_odtect_add_range( gxvalid->root->base + wdcTableOffset, + gxvalid->subtable_length, "just_wdcTable", odtect ); } if ( pcTableOffset ) { - gxv_just_postcompTable_validate( valid->root->base + pcTableOffset, - limit, valid ); - gxv_odtect_add_range( valid->root->base + pcTableOffset, - valid->subtable_length, "just_pcTable", odtect ); + gxv_just_postcompTable_validate( gxvalid->root->base + pcTableOffset, + limit, gxvalid ); + gxv_odtect_add_range( gxvalid->root->base + pcTableOffset, + gxvalid->subtable_length, "just_pcTable", odtect ); } if ( justClassTableOffset ) { gxv_just_justClassTable_validate( - valid->root->base + justClassTableOffset, limit, valid ); - gxv_odtect_add_range( valid->root->base + justClassTableOffset, - valid->subtable_length, "just_justClassTable", + gxvalid->root->base + justClassTableOffset, limit, gxvalid ); + gxv_odtect_add_range( gxvalid->root->base + justClassTableOffset, + gxvalid->subtable_length, "just_justClassTable", odtect ); } - gxv_odtect_validate( odtect, valid ); + gxv_odtect_validate( odtect, gxvalid ); GXV_EXIT; } @@ -647,8 +647,8 @@ FT_Bytes p = table; FT_Bytes limit = 0; - GXV_ValidatorRec validrec; - GXV_Validator valid = &validrec; + GXV_ValidatorRec gxvalidrec; + GXV_Validator gxvalid = &gxvalidrec; GXV_just_DataRec justrec; GXV_just_Data just = &justrec; @@ -662,14 +662,14 @@ GXV_ODTECT_INIT( odtect ); - valid->root = ftvalid; - valid->table_data = just; - valid->face = face; + gxvalid->root = ftvalid; + gxvalid->table_data = just; + gxvalid->face = face; FT_TRACE3(( "validating `just' table\n" )); GXV_INIT; - limit = valid->root->limit; + limit = gxvalid->root->limit; GXV_LIMIT_CHECK( 4 + 2 + 2 + 2 ); version = FT_NEXT_ULONG( p ); @@ -696,19 +696,19 @@ /* validate justData */ if ( 0 < horizOffset ) { - gxv_just_justData_validate( table + horizOffset, limit, valid ); - gxv_odtect_add_range( table + horizOffset, valid->subtable_length, + gxv_just_justData_validate( table + horizOffset, limit, gxvalid ); + gxv_odtect_add_range( table + horizOffset, gxvalid->subtable_length, "horizJustData", odtect ); } if ( 0 < vertOffset ) { - gxv_just_justData_validate( table + vertOffset, limit, valid ); - gxv_odtect_add_range( table + vertOffset, valid->subtable_length, + gxv_just_justData_validate( table + vertOffset, limit, gxvalid ); + gxv_odtect_add_range( table + vertOffset, gxvalid->subtable_length, "vertJustData", odtect ); } - gxv_odtect_validate( odtect, valid ); + gxv_odtect_validate( odtect, gxvalid ); FT_TRACE4(( "\n" )); } diff --git a/src/gxvalid/gxvkern.c b/src/gxvalid/gxvkern.c index 0ec978f..787e3db 100644 --- a/src/gxvalid/gxvkern.c +++ b/src/gxvalid/gxvkern.c @@ -4,7 +4,7 @@ /* */ /* TrueTypeGX/AAT kern table validation (body). */ /* */ -/* Copyright 2004, 2005, 2006, 2007 */ +/* Copyright 2004-2007, 2013 */ /* by suzuki toshiya, Masatake YAMATO, Red Hat K.K., */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ @@ -79,20 +79,20 @@ #define GXV_KERN_DATA( field ) GXV_TABLE_DATA( kern, field ) -#define KERN_IS_CLASSIC( valid ) \ +#define KERN_IS_CLASSIC( gxvalid ) \ ( KERN_VERSION_CLASSIC == GXV_KERN_DATA( version ) ) -#define KERN_IS_NEW( valid ) \ +#define KERN_IS_NEW( gxvalid ) \ ( KERN_VERSION_NEW == GXV_KERN_DATA( version ) ) -#define KERN_DIALECT( valid ) \ +#define KERN_DIALECT( gxvalid ) \ GXV_KERN_DATA( dialect_request ) -#define KERN_ALLOWS_MS( valid ) \ - ( KERN_DIALECT( valid ) & KERN_DIALECT_MS ) -#define KERN_ALLOWS_APPLE( valid ) \ - ( KERN_DIALECT( valid ) & KERN_DIALECT_APPLE ) +#define KERN_ALLOWS_MS( gxvalid ) \ + ( KERN_DIALECT( gxvalid ) & KERN_DIALECT_MS ) +#define KERN_ALLOWS_APPLE( gxvalid ) \ + ( KERN_DIALECT( gxvalid ) & KERN_DIALECT_APPLE ) -#define GXV_KERN_HEADER_SIZE ( KERN_IS_NEW( valid ) ? 8 : 4 ) -#define GXV_KERN_SUBTABLE_HEADER_SIZE ( KERN_IS_NEW( valid ) ? 8 : 6 ) +#define GXV_KERN_HEADER_SIZE ( KERN_IS_NEW( gxvalid ) ? 8 : 4 ) +#define GXV_KERN_SUBTABLE_HEADER_SIZE ( KERN_IS_NEW( gxvalid ) ? 8 : 6 ) /*************************************************************************/ @@ -110,7 +110,7 @@ gxv_kern_subtable_fmt0_pairs_validate( FT_Bytes table, FT_Bytes limit, FT_UShort nPairs, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; FT_UShort i; @@ -134,11 +134,11 @@ /* left */ gid_left = FT_NEXT_USHORT( p ); - gxv_glyphid_validate( gid_left, valid ); + gxv_glyphid_validate( gid_left, gxvalid ); /* right */ gid_right = FT_NEXT_USHORT( p ); - gxv_glyphid_validate( gid_right, valid ); + gxv_glyphid_validate( gid_right, gxvalid ); /* Pairs of left and right GIDs must be unique and sorted. */ GXV_TRACE(( "left gid = %u, right gid = %u\n", gid_left, gid_right )); @@ -171,7 +171,7 @@ static void gxv_kern_subtable_fmt0_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table + GXV_KERN_SUBTABLE_HEADER_SIZE; @@ -186,10 +186,10 @@ /* nPairs, searchRange, entrySelector, rangeShift */ GXV_LIMIT_CHECK( 2 + 2 + 2 + 2 ); - gxv_BinSrchHeader_validate( p, limit, &unitSize, &nPairs, valid ); + gxv_BinSrchHeader_validate( p, limit, &unitSize, &nPairs, gxvalid ); p += 2 + 2 + 2 + 2; - gxv_kern_subtable_fmt0_pairs_validate( p, limit, nPairs, valid ); + gxv_kern_subtable_fmt0_pairs_validate( p, limit, nPairs, gxvalid ); GXV_EXIT; } @@ -209,11 +209,11 @@ static void gxv_kern_subtable_fmt1_valueTable_load( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; GXV_kern_fmt1_StateOptRecData optdata = - (GXV_kern_fmt1_StateOptRecData)valid->statetable.optdata; + (GXV_kern_fmt1_StateOptRecData)gxvalid->statetable.optdata; GXV_LIMIT_CHECK( 2 ); @@ -232,14 +232,14 @@ FT_UShort* classTable_length_p, FT_UShort* stateArray_length_p, FT_UShort* entryTable_length_p, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_UShort o[4]; FT_UShort *l[4]; FT_UShort buff[5]; GXV_kern_fmt1_StateOptRecData optdata = - (GXV_kern_fmt1_StateOptRecData)valid->statetable.optdata; + (GXV_kern_fmt1_StateOptRecData)gxvalid->statetable.optdata; o[0] = classTable; @@ -251,7 +251,7 @@ l[2] = entryTable_length_p; l[3] = &(optdata->valueTable_length); - gxv_set_length_by_ushort_offset( o, l, buff, 4, table_size, valid ); + gxv_set_length_by_ushort_offset( o, l, buff, 4, table_size, gxvalid ); } @@ -265,7 +265,7 @@ GXV_StateTable_GlyphOffsetCPtr glyphOffset_p, FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { #ifdef GXV_LOAD_UNUSED_VARS FT_UShort push; @@ -289,7 +289,7 @@ { GXV_kern_fmt1_StateOptRecData vt_rec = - (GXV_kern_fmt1_StateOptRecData)valid->statetable.optdata; + (GXV_kern_fmt1_StateOptRecData)gxvalid->statetable.optdata; FT_Bytes p; @@ -303,8 +303,6 @@ #ifdef GXV_LOAD_UNUSED_VARS kernAction = FT_NEXT_USHORT( p ); kernValue = FT_NEXT_USHORT( p ); -#else - p += 4; #endif } } @@ -313,7 +311,7 @@ static void gxv_kern_subtable_fmt1_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; GXV_kern_fmt1_StateOptRec vt_rec; @@ -321,18 +319,18 @@ GXV_NAME_ENTER( "kern subtable format 1" ); - valid->statetable.optdata = + gxvalid->statetable.optdata = &vt_rec; - valid->statetable.optdata_load_func = + gxvalid->statetable.optdata_load_func = gxv_kern_subtable_fmt1_valueTable_load; - valid->statetable.subtable_setup_func = + gxvalid->statetable.subtable_setup_func = gxv_kern_subtable_fmt1_subtable_setup; - valid->statetable.entry_glyphoffset_fmt = + gxvalid->statetable.entry_glyphoffset_fmt = GXV_GLYPHOFFSET_NONE; - valid->statetable.entry_validate_func = + gxvalid->statetable.entry_validate_func = gxv_kern_subtable_fmt1_entry_validate; - gxv_StateTable_validate( p, limit, valid ); + gxv_StateTable_validate( p, limit, gxvalid ); GXV_EXIT; } @@ -375,7 +373,7 @@ gxv_kern_subtable_fmt2_clstbl_validate( FT_Bytes table, FT_Bytes limit, GXV_kern_ClassSpec spec, - GXV_Validator valid ) + GXV_Validator gxvalid ) { const FT_String* tag = GXV_KERN_FMT2_DATA( class_tag[spec] ); GXV_odtect_Range odtect = GXV_KERN_FMT2_DATA( odtect ); @@ -393,13 +391,13 @@ GXV_TRACE(( " %s firstGlyph=%d, nGlyphs=%d\n", tag, firstGlyph, nGlyphs )); - gxv_glyphid_validate( firstGlyph, valid ); - gxv_glyphid_validate( (FT_UShort)( firstGlyph + nGlyphs - 1 ), valid ); + gxv_glyphid_validate( firstGlyph, gxvalid ); + gxv_glyphid_validate( (FT_UShort)( firstGlyph + nGlyphs - 1 ), gxvalid ); gxv_array_getlimits_ushort( p, p + ( 2 * nGlyphs ), &( GXV_KERN_FMT2_DATA( offset_min[spec] ) ), &( GXV_KERN_FMT2_DATA( offset_max[spec] ) ), - valid ); + gxvalid ); gxv_odtect_add_range( table, 2 * nGlyphs, tag, odtect ); @@ -410,7 +408,7 @@ static void gxv_kern_subtable_fmt2_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { GXV_ODTECT( 3, odtect ); GXV_kern_subtable_fmt2_DataRec fmt2_rec = @@ -441,10 +439,10 @@ GXV_LIMIT_CHECK( GXV_KERN_FMT2_DATA( array ) ); gxv_kern_subtable_fmt2_clstbl_validate( table + leftOffsetTable, limit, - GXV_KERN_CLS_L, valid ); + GXV_KERN_CLS_L, gxvalid ); gxv_kern_subtable_fmt2_clstbl_validate( table + rightOffsetTable, limit, - GXV_KERN_CLS_R, valid ); + GXV_KERN_CLS_R, gxvalid ); if ( GXV_KERN_FMT2_DATA( offset_min[GXV_KERN_CLS_L] ) + GXV_KERN_FMT2_DATA( offset_min[GXV_KERN_CLS_R] ) @@ -457,7 +455,7 @@ - GXV_KERN_FMT2_DATA( array ), "array", odtect ); - gxv_odtect_validate( odtect, valid ); + gxv_odtect_validate( odtect, gxvalid ); GXV_EXIT; } @@ -468,7 +466,7 @@ static void gxv_kern_subtable_fmt3_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table + GXV_KERN_SUBTABLE_HEADER_SIZE; FT_UShort glyphCount; @@ -487,10 +485,10 @@ rightClassCount = FT_NEXT_BYTE( p ); flags = FT_NEXT_BYTE( p ); - if ( valid->face->num_glyphs != glyphCount ) + if ( gxvalid->face->num_glyphs != glyphCount ) { GXV_TRACE(( "maxGID=%d, but glyphCount=%d\n", - valid->face->num_glyphs, glyphCount )); + gxvalid->face->num_glyphs, glyphCount )); GXV_SET_ERR_IF_PARANOID( FT_INVALID_GLYPH_ID ); } @@ -511,8 +509,8 @@ GXV_LIMIT_CHECK( glyphCount ); - gxv_array_getlimits_byte( p, p + glyphCount, &min, &max, valid ); - p += valid->subtable_length; + gxv_array_getlimits_byte( p, p + glyphCount, &min, &max, gxvalid ); + p += gxvalid->subtable_length; if ( leftClassCount < max ) FT_INVALID_DATA; @@ -526,8 +524,8 @@ GXV_LIMIT_CHECK( glyphCount ); - gxv_array_getlimits_byte( p, p + glyphCount, &min, &max, valid ); - p += valid->subtable_length; + gxv_array_getlimits_byte( p, p + glyphCount, &min, &max, gxvalid ); + p += gxvalid->subtable_length; if ( rightClassCount < max ) FT_INVALID_DATA; @@ -551,7 +549,7 @@ } } - valid->subtable_length = p - table; + gxvalid->subtable_length = p - table; GXV_EXIT; } @@ -560,7 +558,7 @@ static FT_Bool gxv_kern_coverage_new_apple_validate( FT_UShort coverage, FT_UShort* format, - GXV_Validator valid ) + GXV_Validator gxvalid ) { /* new Apple-dialect */ #ifdef GXV_LOAD_TRACE_VARS @@ -569,7 +567,7 @@ FT_Bool kernVariation; #endif - FT_UNUSED( valid ); + FT_UNUSED( gxvalid ); /* reserved bits = 0 */ @@ -597,7 +595,7 @@ static FT_Bool gxv_kern_coverage_classic_apple_validate( FT_UShort coverage, FT_UShort* format, - GXV_Validator valid ) + GXV_Validator gxvalid ) { /* classic Apple-dialect */ #ifdef GXV_LOAD_TRACE_VARS @@ -607,7 +605,7 @@ /* check expected flags, but don't check if MS-dialect is impossible */ - if ( !( coverage & 0xFD00 ) && KERN_ALLOWS_MS( valid ) ) + if ( !( coverage & 0xFD00 ) && KERN_ALLOWS_MS( gxvalid ) ) return FALSE; /* reserved bits = 0 */ @@ -638,7 +636,7 @@ static FT_Bool gxv_kern_coverage_classic_microsoft_validate( FT_UShort coverage, FT_UShort* format, - GXV_Validator valid ) + GXV_Validator gxvalid ) { /* classic Microsoft-dialect */ #ifdef GXV_LOAD_TRACE_VARS @@ -648,7 +646,7 @@ FT_Bool override; #endif - FT_UNUSED( valid ); + FT_UNUSED( gxvalid ); /* reserved bits = 0 */ @@ -688,7 +686,7 @@ static GXV_kern_Dialect gxv_kern_coverage_validate( FT_UShort coverage, FT_UShort* format, - GXV_Validator valid ) + GXV_Validator gxvalid ) { GXV_kern_Dialect result = KERN_DIALECT_UNKNOWN; @@ -697,33 +695,33 @@ GXV_TRACE(( "interprete coverage 0x%04x by Apple style\n", coverage )); - if ( KERN_IS_NEW( valid ) ) + if ( KERN_IS_NEW( gxvalid ) ) { if ( gxv_kern_coverage_new_apple_validate( coverage, format, - valid ) ) + gxvalid ) ) { result = KERN_DIALECT_APPLE; goto Exit; } } - if ( KERN_IS_CLASSIC( valid ) && KERN_ALLOWS_APPLE( valid ) ) + if ( KERN_IS_CLASSIC( gxvalid ) && KERN_ALLOWS_APPLE( gxvalid ) ) { if ( gxv_kern_coverage_classic_apple_validate( coverage, format, - valid ) ) + gxvalid ) ) { result = KERN_DIALECT_APPLE; goto Exit; } } - if ( KERN_IS_CLASSIC( valid ) && KERN_ALLOWS_MS( valid ) ) + if ( KERN_IS_CLASSIC( gxvalid ) && KERN_ALLOWS_MS( gxvalid ) ) { if ( gxv_kern_coverage_classic_microsoft_validate( coverage, format, - valid ) ) + gxvalid ) ) { result = KERN_DIALECT_MS; goto Exit; @@ -741,7 +739,7 @@ static void gxv_kern_subtable_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; #ifdef GXV_LOAD_TRACE_VARS @@ -763,7 +761,7 @@ u16[1] = FT_NEXT_USHORT( p ); /* Apple: length_lo MS: length */ coverage = FT_NEXT_USHORT( p ); - switch ( gxv_kern_coverage_validate( coverage, &format, valid ) ) + switch ( gxv_kern_coverage_validate( coverage, &format, gxvalid ) ) { case KERN_DIALECT_MS: #ifdef GXV_LOAD_TRACE_VARS @@ -787,7 +785,7 @@ #endif GXV_TRACE(( "Subtable length = %d\n", length )); - if ( KERN_IS_NEW( valid ) ) + if ( KERN_IS_NEW( gxvalid ) ) { GXV_LIMIT_CHECK( 2 ); #ifdef GXV_LOAD_TRACE_VARS @@ -808,18 +806,18 @@ /* formats 1, 2, 3 require the position of the start of this subtable */ if ( format == 0 ) - gxv_kern_subtable_fmt0_validate( table, table + length, valid ); + gxv_kern_subtable_fmt0_validate( table, table + length, gxvalid ); else if ( format == 1 ) - gxv_kern_subtable_fmt1_validate( table, table + length, valid ); + gxv_kern_subtable_fmt1_validate( table, table + length, gxvalid ); else if ( format == 2 ) - gxv_kern_subtable_fmt2_validate( table, table + length, valid ); + gxv_kern_subtable_fmt2_validate( table, table + length, gxvalid ); else if ( format == 3 ) - gxv_kern_subtable_fmt3_validate( table, table + length, valid ); + gxv_kern_subtable_fmt3_validate( table, table + length, gxvalid ); else FT_INVALID_DATA; Exit: - valid->subtable_length = length; + gxvalid->subtable_length = length; GXV_EXIT; } @@ -839,8 +837,8 @@ GXV_kern_Dialect dialect_request, FT_Validator ftvalid ) { - GXV_ValidatorRec validrec; - GXV_Validator valid = &validrec; + GXV_ValidatorRec gxvalidrec; + GXV_Validator gxvalid = &gxvalidrec; GXV_kern_DataRec kernrec; GXV_kern_Data kern = &kernrec; @@ -852,13 +850,13 @@ FT_UInt i; - valid->root = ftvalid; - valid->table_data = kern; - valid->face = face; + gxvalid->root = ftvalid; + gxvalid->table_data = kern; + gxvalid->face = face; FT_TRACE3(( "validating `kern' table\n" )); GXV_INIT; - KERN_DIALECT( valid ) = dialect_request; + KERN_DIALECT( gxvalid ) = dialect_request; GXV_LIMIT_CHECK( 2 ); GXV_KERN_DATA( version ) = (GXV_kern_Version)FT_NEXT_USHORT( p ); @@ -867,12 +865,12 @@ if ( 0x0001 < GXV_KERN_DATA( version ) ) FT_INVALID_FORMAT; - else if ( KERN_IS_CLASSIC( valid ) ) + else if ( KERN_IS_CLASSIC( gxvalid ) ) { GXV_LIMIT_CHECK( 2 ); nTables = FT_NEXT_USHORT( p ); } - else if ( KERN_IS_NEW( valid ) ) + else if ( KERN_IS_NEW( gxvalid ) ) { if ( classic_only ) FT_INVALID_FORMAT; @@ -888,8 +886,8 @@ { GXV_TRACE(( "validating subtable %d/%d\n", i, nTables )); /* p should be 32bit-aligned? */ - gxv_kern_subtable_validate( p, 0, valid ); - p += valid->subtable_length; + gxv_kern_subtable_validate( p, 0, gxvalid ); + p += gxvalid->subtable_length; } FT_TRACE4(( "\n" )); diff --git a/src/gxvalid/gxvlcar.c b/src/gxvalid/gxvlcar.c index f14fa5b..48308b0 100644 --- a/src/gxvalid/gxvlcar.c +++ b/src/gxvalid/gxvlcar.c @@ -67,14 +67,14 @@ static void gxv_lcar_partial_validate( FT_UShort partial, FT_UShort glyph, - GXV_Validator valid ) + GXV_Validator gxvalid ) { GXV_NAME_ENTER( "partial" ); if ( GXV_LCAR_DATA( format ) != 1 ) goto Exit; - gxv_ctlPoint_validate( glyph, partial, valid ); + gxv_ctlPoint_validate( glyph, partial, gxvalid ); Exit: GXV_EXIT; @@ -84,10 +84,10 @@ static void gxv_lcar_LookupValue_validate( FT_UShort glyph, GXV_LookupValueCPtr value_p, - GXV_Validator valid ) + GXV_Validator gxvalid ) { - FT_Bytes p = valid->root->base + value_p->u; - FT_Bytes limit = valid->root->limit; + FT_Bytes p = gxvalid->root->base + value_p->u; + FT_Bytes limit = gxvalid->root->limit; FT_UShort count; FT_Short partial; FT_UShort i; @@ -102,7 +102,7 @@ for ( i = 0; i < count; i++ ) { partial = FT_NEXT_SHORT( p ); - gxv_lcar_partial_validate( partial, glyph, valid ); + gxv_lcar_partial_validate( partial, glyph, gxvalid ); } GXV_EXIT; @@ -148,7 +148,7 @@ gxv_lcar_LookupFmt4_transit( FT_UShort relative_gindex, GXV_LookupValueCPtr base_value_p, FT_Bytes lookuptbl_limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p; FT_Bytes limit; @@ -160,8 +160,8 @@ /* XXX: check range? */ offset = (FT_UShort)( base_value_p->u + relative_gindex * sizeof ( FT_UShort ) ); - p = valid->root->base + offset; - limit = valid->root->limit; + p = gxvalid->root->base + offset; + limit = gxvalid->root->limit; GXV_LIMIT_CHECK ( 2 ); value.u = FT_NEXT_USHORT( p ); @@ -185,8 +185,8 @@ { FT_Bytes p = table; FT_Bytes limit = 0; - GXV_ValidatorRec validrec; - GXV_Validator valid = &validrec; + GXV_ValidatorRec gxvalidrec; + GXV_Validator gxvalid = &gxvalidrec; GXV_lcar_DataRec lcarrec; GXV_lcar_Data lcar = &lcarrec; @@ -194,9 +194,9 @@ FT_Fixed version; - valid->root = ftvalid; - valid->table_data = lcar; - valid->face = face; + gxvalid->root = ftvalid; + gxvalid->table_data = lcar; + gxvalid->face = face; FT_TRACE3(( "validating `lcar' table\n" )); GXV_INIT; @@ -211,10 +211,10 @@ if ( GXV_LCAR_DATA( format ) > 1 ) FT_INVALID_FORMAT; - valid->lookupval_sign = GXV_LOOKUPVALUE_UNSIGNED; - valid->lookupval_func = gxv_lcar_LookupValue_validate; - valid->lookupfmt4_trans = gxv_lcar_LookupFmt4_transit; - gxv_LookupTable_validate( p, limit, valid ); + gxvalid->lookupval_sign = GXV_LOOKUPVALUE_UNSIGNED; + gxvalid->lookupval_func = gxv_lcar_LookupValue_validate; + gxvalid->lookupfmt4_trans = gxv_lcar_LookupFmt4_transit; + gxv_LookupTable_validate( p, limit, gxvalid ); FT_TRACE4(( "\n" )); } diff --git a/src/gxvalid/gxvmod.c b/src/gxvalid/gxvmod.c index 502fe5d..278d476 100644 --- a/src/gxvalid/gxvmod.c +++ b/src/gxvalid/gxvmod.c @@ -4,7 +4,7 @@ /* */ /* FreeType's TrueTypeGX/AAT validation module implementation (body). */ /* */ -/* Copyright 2004, 2005, 2006 */ +/* Copyright 2004-2006, 2013 */ /* by suzuki toshiya, Masatake YAMATO, Red Hat K.K., */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ @@ -58,8 +58,8 @@ error = FT_Load_Sfnt_Table( face, tag, 0, NULL, table_len ); - if ( error == GXV_Err_Table_Missing ) - return GXV_Err_Ok; + if ( FT_ERR_EQ( error, Table_Missing ) ) + return FT_Err_Ok; if ( error ) goto Exit; @@ -112,7 +112,7 @@ { FT_Memory volatile memory = FT_FACE_MEMORY( face ); - FT_Error error = GXV_Err_Ok; + FT_Error error = FT_Err_Ok; FT_ValidatorRec volatile valid; FT_UInt i; @@ -200,7 +200,7 @@ /* without volatile on `error' GCC 4.1.1. emits: */ /* warning: variable 'error' might be clobbered by 'longjmp' or 'vfork' */ /* this warning seems spurious but --- */ - FT_Error volatile error = GXV_Err_Ok; + FT_Error volatile error; FT_ValidatorRec volatile valid; diff --git a/src/gxvalid/gxvmort.c b/src/gxvalid/gxvmort.c index 465462a..55ff5a8 100644 --- a/src/gxvalid/gxvmort.c +++ b/src/gxvalid/gxvmort.c @@ -4,7 +4,7 @@ /* */ /* TrueTypeGX/AAT mort table validation (body). */ /* */ -/* Copyright 2005 by suzuki toshiya, Masatake YAMATO, Red Hat K.K., */ +/* Copyright 2005, 2013 by suzuki toshiya, Masatake YAMATO, Red Hat K.K., */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -40,7 +40,7 @@ static void gxv_mort_feature_validate( GXV_mort_feature f, - GXV_Validator valid ) + GXV_Validator gxvalid ) { if ( f->featureType >= gxv_feat_registry_length ) { @@ -89,7 +89,7 @@ gxv_mort_featurearray_validate( FT_Bytes table, FT_Bytes limit, FT_ULong nFeatureFlags, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; FT_ULong i; @@ -106,23 +106,24 @@ f.enableFlags = FT_NEXT_ULONG( p ); f.disableFlags = FT_NEXT_ULONG( p ); - gxv_mort_feature_validate( &f, valid ); + gxv_mort_feature_validate( &f, gxvalid ); } if ( !IS_GXV_MORT_FEATURE_OFF( f ) ) FT_INVALID_DATA; - valid->subtable_length = p - table; + gxvalid->subtable_length = p - table; GXV_EXIT; } FT_LOCAL_DEF( void ) gxv_mort_coverage_validate( FT_UShort coverage, - GXV_Validator valid ) + GXV_Validator gxvalid ) { - FT_UNUSED( valid ); + FT_UNUSED( gxvalid ); +#ifdef FT_DEBUG_LEVEL_TRACE if ( coverage & 0x8000U ) GXV_TRACE(( " this subtable is for vertical text only\n" )); else @@ -141,6 +142,7 @@ if ( coverage & 0x1FF8 ) GXV_TRACE(( " coverage has non-zero bits in reserved area\n" )); +#endif } @@ -148,7 +150,7 @@ gxv_mort_subtables_validate( FT_Bytes table, FT_Bytes limit, FT_UShort nSubtables, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; @@ -163,14 +165,15 @@ }; - GXV_Validate_Func func; - FT_UShort i; + FT_UShort i; GXV_NAME_ENTER( "subtables in a chain" ); for ( i = 0; i < nSubtables; i++ ) { + GXV_Validate_Func func; + FT_UShort length; FT_UShort coverage; #ifdef GXV_LOAD_UNUSED_VARS @@ -195,7 +198,7 @@ rest = length - ( 2 + 2 + 4 ); GXV_LIMIT_CHECK( rest ); - gxv_mort_coverage_validate( coverage, valid ); + gxv_mort_coverage_validate( coverage, gxvalid ); if ( type > 5 ) FT_INVALID_FORMAT; @@ -204,13 +207,13 @@ if ( func == NULL ) GXV_TRACE(( "morx type %d is reserved\n", type )); - func( p, p + rest, valid ); + func( p, p + rest, gxvalid ); p += rest; /* TODO: validate subFeatureFlags */ } - valid->subtable_length = p - table; + gxvalid->subtable_length = p - table; GXV_EXIT; } @@ -219,7 +222,7 @@ static void gxv_mort_chain_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; #ifdef GXV_LOAD_UNUSED_VARS @@ -243,10 +246,10 @@ nSubtables = FT_NEXT_USHORT( p ); gxv_mort_featurearray_validate( p, table + chainLength, - nFeatureFlags, valid ); - p += valid->subtable_length; - gxv_mort_subtables_validate( p, table + chainLength, nSubtables, valid ); - valid->subtable_length = chainLength; + nFeatureFlags, gxvalid ); + p += gxvalid->subtable_length; + gxv_mort_subtables_validate( p, table + chainLength, nSubtables, gxvalid ); + gxvalid->subtable_length = chainLength; /* TODO: validate defaultFlags */ GXV_EXIT; @@ -258,8 +261,8 @@ FT_Face face, FT_Validator ftvalid ) { - GXV_ValidatorRec validrec; - GXV_Validator valid = &validrec; + GXV_ValidatorRec gxvalidrec; + GXV_Validator gxvalid = &gxvalidrec; FT_Bytes p = table; FT_Bytes limit = 0; FT_ULong version; @@ -267,9 +270,9 @@ FT_ULong i; - valid->root = ftvalid; - valid->face = face; - limit = valid->root->limit; + gxvalid->root = ftvalid; + gxvalid->face = face; + limit = gxvalid->root->limit; FT_TRACE3(( "validating `mort' table\n" )); GXV_INIT; @@ -285,8 +288,8 @@ { GXV_TRACE(( "validating chain %d/%d\n", i + 1, nChains )); GXV_32BIT_ALIGNMENT_VALIDATE( p - table ); - gxv_mort_chain_validate( p, limit, valid ); - p += valid->subtable_length; + gxv_mort_chain_validate( p, limit, gxvalid ); + p += gxvalid->subtable_length; } FT_TRACE4(( "\n" )); diff --git a/src/gxvalid/gxvmort.h b/src/gxvalid/gxvmort.h index 1e5a1f5..8e62e52 100644 --- a/src/gxvalid/gxvmort.h +++ b/src/gxvalid/gxvmort.h @@ -55,36 +55,36 @@ gxv_mort_featurearray_validate( FT_Bytes table, FT_Bytes limit, FT_ULong nFeatureFlags, - GXV_Validator valid ); + GXV_Validator gxvalid ); FT_LOCAL( void ) gxv_mort_coverage_validate( FT_UShort coverage, - GXV_Validator valid ); + GXV_Validator gxvalid ); FT_LOCAL( void ) gxv_mort_subtable_type0_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ); + GXV_Validator gxvalid ); FT_LOCAL( void ) gxv_mort_subtable_type1_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ); + GXV_Validator gxvalid ); FT_LOCAL( void ) gxv_mort_subtable_type2_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ); + GXV_Validator gxvalid ); FT_LOCAL( void ) gxv_mort_subtable_type4_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ); + GXV_Validator gxvalid ); FT_LOCAL( void ) gxv_mort_subtable_type5_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ); + GXV_Validator gxvalid ); #endif /* __GXVMORT_H__ */ diff --git a/src/gxvalid/gxvmort0.c b/src/gxvalid/gxvmort0.c index b136ced..f19016e 100644 --- a/src/gxvalid/gxvmort0.c +++ b/src/gxvalid/gxvmort0.c @@ -67,7 +67,7 @@ GXV_StateTable_GlyphOffsetCPtr glyphOffset_p, FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_UShort markFirst; FT_UShort dontAdvance; @@ -125,7 +125,7 @@ FT_LOCAL_DEF( void ) gxv_mort_subtable_type0_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; @@ -135,14 +135,14 @@ GXV_LIMIT_CHECK( GXV_STATETABLE_HEADER_SIZE ); - valid->statetable.optdata = NULL; - valid->statetable.optdata_load_func = NULL; - valid->statetable.subtable_setup_func = NULL; - valid->statetable.entry_glyphoffset_fmt = GXV_GLYPHOFFSET_NONE; - valid->statetable.entry_validate_func = + gxvalid->statetable.optdata = NULL; + gxvalid->statetable.optdata_load_func = NULL; + gxvalid->statetable.subtable_setup_func = NULL; + gxvalid->statetable.entry_glyphoffset_fmt = GXV_GLYPHOFFSET_NONE; + gxvalid->statetable.entry_validate_func = gxv_mort_subtable_type0_entry_validate; - gxv_StateTable_validate( p, limit, valid ); + gxv_StateTable_validate( p, limit, gxvalid ); GXV_EXIT; } diff --git a/src/gxvalid/gxvmort1.c b/src/gxvalid/gxvmort1.c index 1c17a5d..0189504 100644 --- a/src/gxvalid/gxvmort1.c +++ b/src/gxvalid/gxvmort1.c @@ -53,12 +53,12 @@ static void gxv_mort_subtable_type1_substitutionTable_load( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; GXV_mort_subtable_type1_StateOptRecData optdata = - (GXV_mort_subtable_type1_StateOptRecData)valid->statetable.optdata; + (GXV_mort_subtable_type1_StateOptRecData)gxvalid->statetable.optdata; GXV_LIMIT_CHECK( 2 ); @@ -74,14 +74,14 @@ FT_UShort* classTable_length_p, FT_UShort* stateArray_length_p, FT_UShort* entryTable_length_p, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_UShort o[4]; FT_UShort *l[4]; FT_UShort buff[5]; GXV_mort_subtable_type1_StateOptRecData optdata = - (GXV_mort_subtable_type1_StateOptRecData)valid->statetable.optdata; + (GXV_mort_subtable_type1_StateOptRecData)gxvalid->statetable.optdata; o[0] = classTable; @@ -93,7 +93,7 @@ l[2] = entryTable_length_p; l[3] = &( optdata->substitutionTable_length ); - gxv_set_length_by_ushort_offset( o, l, buff, 4, table_size, valid ); + gxv_set_length_by_ushort_offset( o, l, buff, 4, table_size, gxvalid ); } @@ -102,7 +102,7 @@ FT_Short wordOffset, const FT_String* tag, FT_Byte state, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_UShort substTable; FT_UShort substTable_limit; @@ -113,16 +113,16 @@ substTable = ((GXV_mort_subtable_type1_StateOptRec *) - (valid->statetable.optdata))->substitutionTable; + (gxvalid->statetable.optdata))->substitutionTable; substTable_limit = (FT_UShort)( substTable + ((GXV_mort_subtable_type1_StateOptRec *) - (valid->statetable.optdata))->substitutionTable_length ); + (gxvalid->statetable.optdata))->substitutionTable_length ); - valid->min_gid = (FT_UShort)( ( substTable - wordOffset * 2 ) / 2 ); - valid->max_gid = (FT_UShort)( ( substTable_limit - wordOffset * 2 ) / 2 ); - valid->max_gid = (FT_UShort)( FT_MAX( valid->max_gid, - valid->face->num_glyphs ) ); + gxvalid->min_gid = (FT_UShort)( ( substTable - wordOffset * 2 ) / 2 ); + gxvalid->max_gid = (FT_UShort)( ( substTable_limit - wordOffset * 2 ) / 2 ); + gxvalid->max_gid = (FT_UShort)( FT_MAX( gxvalid->max_gid, + gxvalid->face->num_glyphs ) ); /* XXX: check range? */ @@ -137,7 +137,7 @@ GXV_StateTable_GlyphOffsetCPtr glyphOffset_p, FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { #ifdef GXV_LOAD_UNUSED_VARS FT_UShort setMark; @@ -169,24 +169,24 @@ gxv_mort_subtable_type1_offset_to_subst_validate( markOffset, "markOffset", state, - valid ); + gxvalid ); gxv_mort_subtable_type1_offset_to_subst_validate( currentOffset, "currentOffset", state, - valid ); + gxvalid ); } static void gxv_mort_subtable_type1_substTable_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; FT_UShort num_gids = (FT_UShort)( ((GXV_mort_subtable_type1_StateOptRec *) - (valid->statetable.optdata))->substitutionTable_length / 2 ); + (gxvalid->statetable.optdata))->substitutionTable_length / 2 ); FT_UShort i; @@ -202,11 +202,11 @@ if ( dst_gid >= 0xFFFFU ) continue; - if ( dst_gid < valid->min_gid || valid->max_gid < dst_gid ) + if ( dst_gid < gxvalid->min_gid || gxvalid->max_gid < dst_gid ) { GXV_TRACE(( "substTable include a strange gid[%d]=%d >" " out of define range (%d..%d)\n", - i, dst_gid, valid->min_gid, valid->max_gid )); + i, dst_gid, gxvalid->min_gid, gxvalid->max_gid )); GXV_SET_ERR_IF_PARANOID( FT_INVALID_GLYPH_ID ); } } @@ -223,7 +223,7 @@ FT_LOCAL_DEF( void ) gxv_mort_subtable_type1_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; @@ -234,23 +234,23 @@ GXV_LIMIT_CHECK( GXV_MORT_SUBTABLE_TYPE1_HEADER_SIZE ); - valid->statetable.optdata = + gxvalid->statetable.optdata = &st_rec; - valid->statetable.optdata_load_func = + gxvalid->statetable.optdata_load_func = gxv_mort_subtable_type1_substitutionTable_load; - valid->statetable.subtable_setup_func = + gxvalid->statetable.subtable_setup_func = gxv_mort_subtable_type1_subtable_setup; - valid->statetable.entry_glyphoffset_fmt = + gxvalid->statetable.entry_glyphoffset_fmt = GXV_GLYPHOFFSET_ULONG; - valid->statetable.entry_validate_func = + gxvalid->statetable.entry_validate_func = gxv_mort_subtable_type1_entry_validate; - gxv_StateTable_validate( p, limit, valid ); + gxv_StateTable_validate( p, limit, gxvalid ); gxv_mort_subtable_type1_substTable_validate( table + st_rec.substitutionTable, table + st_rec.substitutionTable + st_rec.substitutionTable_length, - valid ); + gxvalid ); GXV_EXIT; } diff --git a/src/gxvalid/gxvmort2.c b/src/gxvalid/gxvmort2.c index 9e08fb7..099ffd4 100644 --- a/src/gxvalid/gxvmort2.c +++ b/src/gxvalid/gxvmort2.c @@ -57,11 +57,11 @@ static void gxv_mort_subtable_type2_opttable_load( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { - FT_Bytes p = table; + FT_Bytes p = table; GXV_mort_subtable_type2_StateOptRecData optdata = - (GXV_mort_subtable_type2_StateOptRecData)valid->statetable.optdata; + (GXV_mort_subtable_type2_StateOptRecData)gxvalid->statetable.optdata; GXV_LIMIT_CHECK( 2 + 2 + 2 ); @@ -86,14 +86,14 @@ FT_UShort *classTable_length_p, FT_UShort *stateArray_length_p, FT_UShort *entryTable_length_p, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_UShort o[6]; FT_UShort *l[6]; FT_UShort buff[7]; GXV_mort_subtable_type2_StateOptRecData optdata = - (GXV_mort_subtable_type2_StateOptRecData)valid->statetable.optdata; + (GXV_mort_subtable_type2_StateOptRecData)gxvalid->statetable.optdata; GXV_NAME_ENTER( "subtable boundaries setup" ); @@ -111,7 +111,7 @@ l[4] = &(optdata->componentTable_length); l[5] = &(optdata->ligatureTable_length); - gxv_set_length_by_ushort_offset( o, l, buff, 6, table_size, valid ); + gxv_set_length_by_ushort_offset( o, l, buff, 6, table_size, gxvalid ); GXV_TRACE(( "classTable: offset=0x%04x length=0x%04x\n", classTable, *classTable_length_p )); @@ -137,11 +137,11 @@ gxv_mort_subtable_type2_ligActionOffset_validate( FT_Bytes table, FT_UShort ligActionOffset, - GXV_Validator valid ) + GXV_Validator gxvalid ) { /* access ligActionTable */ GXV_mort_subtable_type2_StateOptRecData optdata = - (GXV_mort_subtable_type2_StateOptRecData)valid->statetable.optdata; + (GXV_mort_subtable_type2_StateOptRecData)gxvalid->statetable.optdata; FT_Bytes lat_base = table + optdata->ligActionTable; FT_Bytes p = table + ligActionOffset; @@ -214,7 +214,7 @@ GXV_StateTable_GlyphOffsetCPtr glyphOffset_p, FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { #ifdef GXV_LOAD_UNUSED_VARS FT_UShort setComponent; @@ -236,16 +236,16 @@ if ( 0 < offset ) gxv_mort_subtable_type2_ligActionOffset_validate( table, offset, - valid ); + gxvalid ); } static void gxv_mort_subtable_type2_ligatureTable_validate( FT_Bytes table, - GXV_Validator valid ) + GXV_Validator gxvalid ) { GXV_mort_subtable_type2_StateOptRecData optdata = - (GXV_mort_subtable_type2_StateOptRecData)valid->statetable.optdata; + (GXV_mort_subtable_type2_StateOptRecData)gxvalid->statetable.optdata; FT_Bytes p = table + optdata->ligatureTable; FT_Bytes limit = table + optdata->ligatureTable @@ -264,7 +264,7 @@ GXV_LIMIT_CHECK( 2 ); lig_gid = FT_NEXT_USHORT( p ); - if ( valid->face->num_glyphs < lig_gid ) + if ( gxvalid->face->num_glyphs < lig_gid ) GXV_SET_ERR_IF_PARANOID( FT_INVALID_GLYPH_ID ); } } @@ -275,7 +275,7 @@ FT_LOCAL_DEF( void ) gxv_mort_subtable_type2_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; @@ -286,23 +286,23 @@ GXV_LIMIT_CHECK( GXV_MORT_SUBTABLE_TYPE2_HEADER_SIZE ); - valid->statetable.optdata = + gxvalid->statetable.optdata = &lig_rec; - valid->statetable.optdata_load_func = + gxvalid->statetable.optdata_load_func = gxv_mort_subtable_type2_opttable_load; - valid->statetable.subtable_setup_func = + gxvalid->statetable.subtable_setup_func = gxv_mort_subtable_type2_subtable_setup; - valid->statetable.entry_glyphoffset_fmt = + gxvalid->statetable.entry_glyphoffset_fmt = GXV_GLYPHOFFSET_NONE; - valid->statetable.entry_validate_func = + gxvalid->statetable.entry_validate_func = gxv_mort_subtable_type2_entry_validate; - gxv_StateTable_validate( p, limit, valid ); + gxv_StateTable_validate( p, limit, gxvalid ); - p += valid->subtable_length; - gxv_mort_subtable_type2_ligatureTable_validate( table, valid ); + p += gxvalid->subtable_length; + gxv_mort_subtable_type2_ligatureTable_validate( table, gxvalid ); - valid->subtable_length = p - table; + gxvalid->subtable_length = p - table; GXV_EXIT; } diff --git a/src/gxvalid/gxvmort4.c b/src/gxvalid/gxvmort4.c index 8347098..9e86af4 100644 --- a/src/gxvalid/gxvmort4.c +++ b/src/gxvalid/gxvmort4.c @@ -41,11 +41,11 @@ static void gxv_mort_subtable_type4_lookupval_validate( FT_UShort glyph, GXV_LookupValueCPtr value_p, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_UNUSED( glyph ); - gxv_glyphid_validate( value_p->u, valid ); + gxv_glyphid_validate( value_p->u, gxvalid ); } /* @@ -80,7 +80,7 @@ FT_UShort relative_gindex, GXV_LookupValueCPtr base_value_p, FT_Bytes lookuptbl_limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p; FT_Bytes limit; @@ -91,7 +91,7 @@ offset = (FT_UShort)( base_value_p->u + relative_gindex * sizeof ( FT_UShort ) ); - p = valid->lookuptbl_head + offset; + p = gxvalid->lookuptbl_head + offset; limit = lookuptbl_limit; GXV_LIMIT_CHECK( 2 ); @@ -104,7 +104,7 @@ FT_LOCAL_DEF( void ) gxv_mort_subtable_type4_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; @@ -112,11 +112,11 @@ GXV_NAME_ENTER( "mort chain subtable type4 " "(Non-Contextual Glyph Substitution)" ); - valid->lookupval_sign = GXV_LOOKUPVALUE_UNSIGNED; - valid->lookupval_func = gxv_mort_subtable_type4_lookupval_validate; - valid->lookupfmt4_trans = gxv_mort_subtable_type4_lookupfmt4_transit; + gxvalid->lookupval_sign = GXV_LOOKUPVALUE_UNSIGNED; + gxvalid->lookupval_func = gxv_mort_subtable_type4_lookupval_validate; + gxvalid->lookupfmt4_trans = gxv_mort_subtable_type4_lookupfmt4_transit; - gxv_LookupTable_validate( p, limit, valid ); + gxv_LookupTable_validate( p, limit, gxvalid ); GXV_EXIT; } diff --git a/src/gxvalid/gxvmort5.c b/src/gxvalid/gxvmort5.c index 32cfb03..9498b10 100644 --- a/src/gxvalid/gxvmort5.c +++ b/src/gxvalid/gxvmort5.c @@ -70,10 +70,10 @@ FT_UShort* classTable_length_p, FT_UShort* stateArray_length_p, FT_UShort* entryTable_length_p, - GXV_Validator valid ) + GXV_Validator gxvalid ) { GXV_mort_subtable_type5_StateOptRecData optdata = - (GXV_mort_subtable_type5_StateOptRecData)valid->statetable.optdata; + (GXV_mort_subtable_type5_StateOptRecData)gxvalid->statetable.optdata; gxv_StateTable_subtable_setup( table_size, @@ -83,7 +83,7 @@ classTable_length_p, stateArray_length_p, entryTable_length_p, - valid ); + gxvalid ); optdata->classTable = classTable; optdata->stateArray = stateArray; @@ -100,7 +100,7 @@ FT_UShort count, FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { /* * We don't know the range of insertion-glyph-list. @@ -109,7 +109,7 @@ FT_Bytes p = table + offset; GXV_mort_subtable_type5_StateOptRecData optdata = - (GXV_mort_subtable_type5_StateOptRecData)valid->statetable.optdata; + (GXV_mort_subtable_type5_StateOptRecData)gxvalid->statetable.optdata; if ( optdata->classTable < offset && offset < optdata->classTable + *(optdata->classTable_length_p) ) @@ -145,7 +145,7 @@ GXV_StateTable_GlyphOffsetCPtr glyphOffset, FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { #ifdef GXV_LOAD_UNUSED_VARS FT_Bool setMark; @@ -184,7 +184,7 @@ currentInsertCount, table, limit, - valid ); + gxvalid ); } if ( 0 != markedInsertList && 0 != markedInsertCount ) @@ -193,7 +193,7 @@ markedInsertCount, table, limit, - valid ); + gxvalid ); } } @@ -201,7 +201,7 @@ FT_LOCAL_DEF( void ) gxv_mort_subtable_type5_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; @@ -213,18 +213,18 @@ GXV_LIMIT_CHECK( GXV_MORT_SUBTABLE_TYPE5_HEADER_SIZE ); - valid->statetable.optdata = + gxvalid->statetable.optdata = et; - valid->statetable.optdata_load_func = + gxvalid->statetable.optdata_load_func = NULL; - valid->statetable.subtable_setup_func = + gxvalid->statetable.subtable_setup_func = gxv_mort_subtable_type5_subtable_setup; - valid->statetable.entry_glyphoffset_fmt = + gxvalid->statetable.entry_glyphoffset_fmt = GXV_GLYPHOFFSET_ULONG; - valid->statetable.entry_validate_func = + gxvalid->statetable.entry_validate_func = gxv_mort_subtable_type5_entry_validate; - gxv_StateTable_validate( p, limit, valid ); + gxv_StateTable_validate( p, limit, gxvalid ); GXV_EXIT; } diff --git a/src/gxvalid/gxvmorx.c b/src/gxvalid/gxvmorx.c index 4b1dd00..96dba63 100644 --- a/src/gxvalid/gxvmorx.c +++ b/src/gxvalid/gxvmorx.c @@ -4,7 +4,7 @@ /* */ /* TrueTypeGX/AAT morx table validation (body). */ /* */ -/* Copyright 2005, 2008 by */ +/* Copyright 2005, 2008, 2013 by */ /* suzuki toshiya, Masatake YAMATO, Red Hat K.K., */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ @@ -42,7 +42,7 @@ gxv_morx_subtables_validate( FT_Bytes table, FT_Bytes limit, FT_UShort nSubtables, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; @@ -57,8 +57,6 @@ }; - GXV_Validate_Func func; - FT_UShort i; @@ -66,6 +64,8 @@ for ( i = 0; i < nSubtables; i++ ) { + GXV_Validate_Func func; + FT_ULong length; FT_ULong coverage; #ifdef GXV_LOAD_UNUSED_VARS @@ -93,7 +93,7 @@ /* morx coverage consists of mort_coverage & 16bit padding */ gxv_mort_coverage_validate( (FT_UShort)( ( coverage >> 16 ) | coverage ), - valid ); + gxvalid ); if ( type > 5 ) FT_INVALID_FORMAT; @@ -101,13 +101,13 @@ if ( func == NULL ) GXV_TRACE(( "morx type %d is reserved\n", type )); - func( p, p + rest, valid ); + func( p, p + rest, gxvalid ); /* TODO: subFeatureFlags should be unique in a table? */ p += rest; } - valid->subtable_length = p - table; + gxvalid->subtable_length = p - table; GXV_EXIT; } @@ -116,7 +116,7 @@ static void gxv_morx_chain_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; #ifdef GXV_LOAD_UNUSED_VARS @@ -140,16 +140,16 @@ nSubtables = FT_NEXT_ULONG( p ); /* feature-array of morx is same with that of mort */ - gxv_mort_featurearray_validate( p, limit, nFeatureFlags, valid ); - p += valid->subtable_length; + gxv_mort_featurearray_validate( p, limit, nFeatureFlags, gxvalid ); + p += gxvalid->subtable_length; if ( nSubtables >= 0x10000L ) FT_INVALID_DATA; gxv_morx_subtables_validate( p, table + chainLength, - (FT_UShort)nSubtables, valid ); + (FT_UShort)nSubtables, gxvalid ); - valid->subtable_length = chainLength; + gxvalid->subtable_length = chainLength; /* TODO: defaultFlags should be compared with the flags in tables */ @@ -162,8 +162,8 @@ FT_Face face, FT_Validator ftvalid ) { - GXV_ValidatorRec validrec; - GXV_Validator valid = &validrec; + GXV_ValidatorRec gxvalidrec; + GXV_Validator gxvalid = &gxvalidrec; FT_Bytes p = table; FT_Bytes limit = 0; FT_ULong version; @@ -171,8 +171,8 @@ FT_ULong i; - valid->root = ftvalid; - valid->face = face; + gxvalid->root = ftvalid; + gxvalid->face = face; FT_TRACE3(( "validating `morx' table\n" )); GXV_INIT; @@ -188,8 +188,8 @@ { GXV_TRACE(( "validating chain %d/%d\n", i + 1, nChains )); GXV_32BIT_ALIGNMENT_VALIDATE( p - table ); - gxv_morx_chain_validate( p, limit, valid ); - p += valid->subtable_length; + gxv_morx_chain_validate( p, limit, gxvalid ); + p += gxvalid->subtable_length; } FT_TRACE4(( "\n" )); diff --git a/src/gxvalid/gxvmorx.h b/src/gxvalid/gxvmorx.h index 28c1a44..9ed907a 100644 --- a/src/gxvalid/gxvmorx.h +++ b/src/gxvalid/gxvmorx.h @@ -38,27 +38,27 @@ FT_LOCAL( void ) gxv_morx_subtable_type0_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ); + GXV_Validator gxvalid ); FT_LOCAL( void ) gxv_morx_subtable_type1_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ); + GXV_Validator gxvalid ); FT_LOCAL( void ) gxv_morx_subtable_type2_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ); + GXV_Validator gxvalid ); FT_LOCAL( void ) gxv_morx_subtable_type4_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ); + GXV_Validator gxvalid ); FT_LOCAL( void ) gxv_morx_subtable_type5_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ); + GXV_Validator gxvalid ); #endif /* __GXVMORX_H__ */ diff --git a/src/gxvalid/gxvmorx0.c b/src/gxvalid/gxvmorx0.c index 6a736c1..db165f4 100644 --- a/src/gxvalid/gxvmorx0.c +++ b/src/gxvalid/gxvmorx0.c @@ -45,7 +45,7 @@ GXV_XStateTable_GlyphOffsetCPtr glyphOffset_p, FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { #ifdef GXV_LOAD_UNUSED_VARS FT_UShort markFirst; @@ -85,7 +85,7 @@ FT_LOCAL_DEF( void ) gxv_morx_subtable_type0_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; @@ -95,14 +95,14 @@ GXV_LIMIT_CHECK( GXV_STATETABLE_HEADER_SIZE ); - valid->xstatetable.optdata = NULL; - valid->xstatetable.optdata_load_func = NULL; - valid->xstatetable.subtable_setup_func = NULL; - valid->xstatetable.entry_glyphoffset_fmt = GXV_GLYPHOFFSET_NONE; - valid->xstatetable.entry_validate_func = + gxvalid->xstatetable.optdata = NULL; + gxvalid->xstatetable.optdata_load_func = NULL; + gxvalid->xstatetable.subtable_setup_func = NULL; + gxvalid->xstatetable.entry_glyphoffset_fmt = GXV_GLYPHOFFSET_NONE; + gxvalid->xstatetable.entry_validate_func = gxv_morx_subtable_type0_entry_validate; - gxv_XStateTable_validate( p, limit, valid ); + gxv_XStateTable_validate( p, limit, gxvalid ); GXV_EXIT; } diff --git a/src/gxvalid/gxvmorx1.c b/src/gxvalid/gxvmorx1.c index ce0009a..49f53d1 100644 --- a/src/gxvalid/gxvmorx1.c +++ b/src/gxvalid/gxvmorx1.c @@ -55,12 +55,12 @@ static void gxv_morx_subtable_type1_substitutionTable_load( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; GXV_morx_subtable_type1_StateOptRecData optdata = - (GXV_morx_subtable_type1_StateOptRecData)valid->xstatetable.optdata; + (GXV_morx_subtable_type1_StateOptRecData)gxvalid->xstatetable.optdata; GXV_LIMIT_CHECK( 2 ); @@ -76,14 +76,14 @@ FT_ULong* classTable_length_p, FT_ULong* stateArray_length_p, FT_ULong* entryTable_length_p, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_ULong o[4]; FT_ULong *l[4]; FT_ULong buff[5]; GXV_morx_subtable_type1_StateOptRecData optdata = - (GXV_morx_subtable_type1_StateOptRecData)valid->xstatetable.optdata; + (GXV_morx_subtable_type1_StateOptRecData)gxvalid->xstatetable.optdata; o[0] = classTable; @@ -95,7 +95,7 @@ l[2] = entryTable_length_p; l[3] = &(optdata->substitutionTable_length); - gxv_set_length_by_ulong_offset( o, l, buff, 4, table_size, valid ); + gxv_set_length_by_ulong_offset( o, l, buff, 4, table_size, gxvalid ); } @@ -106,7 +106,7 @@ GXV_StateTable_GlyphOffsetCPtr glyphOffset_p, FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { #ifdef GXV_LOAD_TRACE_VARS FT_UShort setMark; @@ -117,7 +117,7 @@ FT_Short currentIndex; GXV_morx_subtable_type1_StateOptRecData optdata = - (GXV_morx_subtable_type1_StateOptRecData)valid->xstatetable.optdata; + (GXV_morx_subtable_type1_StateOptRecData)gxvalid->xstatetable.optdata; FT_UNUSED( state ); FT_UNUSED( table ); @@ -159,13 +159,13 @@ static void gxv_morx_subtable_type1_LookupValue_validate( FT_UShort glyph, GXV_LookupValueCPtr value_p, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_UNUSED( glyph ); /* for the non-debugging case */ GXV_TRACE(( "morx subtable type1 subst.: %d -> %d\n", glyph, value_p->u )); - if ( value_p->u > valid->face->num_glyphs ) + if ( value_p->u > gxvalid->face->num_glyphs ) FT_INVALID_GLYPH_ID; } @@ -175,7 +175,7 @@ FT_UShort relative_gindex, GXV_LookupValueCPtr base_value_p, FT_Bytes lookuptbl_limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p; FT_Bytes limit; @@ -186,7 +186,7 @@ offset = (FT_UShort)( base_value_p->u + relative_gindex * sizeof ( FT_UShort ) ); - p = valid->lookuptbl_head + offset; + p = gxvalid->lookuptbl_head + offset; limit = lookuptbl_limit; GXV_LIMIT_CHECK ( 2 ); @@ -202,19 +202,19 @@ static void gxv_morx_subtable_type1_substitutionTable_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; FT_UShort i; GXV_morx_subtable_type1_StateOptRecData optdata = - (GXV_morx_subtable_type1_StateOptRecData)valid->xstatetable.optdata; + (GXV_morx_subtable_type1_StateOptRecData)gxvalid->xstatetable.optdata; /* TODO: calculate offset/length for each lookupTables */ - valid->lookupval_sign = GXV_LOOKUPVALUE_UNSIGNED; - valid->lookupval_func = gxv_morx_subtable_type1_LookupValue_validate; - valid->lookupfmt4_trans = gxv_morx_subtable_type1_LookupFmt4_transit; + gxvalid->lookupval_sign = GXV_LOOKUPVALUE_UNSIGNED; + gxvalid->lookupval_func = gxv_morx_subtable_type1_LookupValue_validate; + gxvalid->lookupfmt4_trans = gxv_morx_subtable_type1_LookupFmt4_transit; for ( i = 0; i < optdata->substitutionTable_num_lookupTables; i++ ) { @@ -224,7 +224,7 @@ GXV_LIMIT_CHECK( 4 ); offset = FT_NEXT_ULONG( p ); - gxv_LookupTable_validate( table + offset, limit, valid ); + gxv_LookupTable_validate( table + offset, limit, gxvalid ); } /* TODO: overlapping of lookupTables in substitutionTable */ @@ -239,7 +239,7 @@ FT_LOCAL_DEF( void ) gxv_morx_subtable_type1_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; @@ -252,23 +252,23 @@ st_rec.substitutionTable_num_lookupTables = 0; - valid->xstatetable.optdata = + gxvalid->xstatetable.optdata = &st_rec; - valid->xstatetable.optdata_load_func = + gxvalid->xstatetable.optdata_load_func = gxv_morx_subtable_type1_substitutionTable_load; - valid->xstatetable.subtable_setup_func = + gxvalid->xstatetable.subtable_setup_func = gxv_morx_subtable_type1_subtable_setup; - valid->xstatetable.entry_glyphoffset_fmt = + gxvalid->xstatetable.entry_glyphoffset_fmt = GXV_GLYPHOFFSET_ULONG; - valid->xstatetable.entry_validate_func = + gxvalid->xstatetable.entry_validate_func = gxv_morx_subtable_type1_entry_validate; - gxv_XStateTable_validate( p, limit, valid ); + gxv_XStateTable_validate( p, limit, gxvalid ); gxv_morx_subtable_type1_substitutionTable_validate( table + st_rec.substitutionTable, table + st_rec.substitutionTable + st_rec.substitutionTable_length, - valid ); + gxvalid ); GXV_EXIT; } diff --git a/src/gxvalid/gxvmorx2.c b/src/gxvalid/gxvmorx2.c index 9d2b0bc..e44445d 100644 --- a/src/gxvalid/gxvmorx2.c +++ b/src/gxvalid/gxvmorx2.c @@ -5,7 +5,7 @@ /* TrueTypeGX/AAT morx table validation */ /* body for type2 (Ligature Substitution) subtable. */ /* */ -/* Copyright 2005 by suzuki toshiya, Masatake YAMATO, Red Hat K.K., */ +/* Copyright 2005, 2013 by suzuki toshiya, Masatake YAMATO, Red Hat K.K., */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -58,12 +58,12 @@ static void gxv_morx_subtable_type2_opttable_load( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; GXV_morx_subtable_type2_StateOptRecData optdata = - (GXV_morx_subtable_type2_StateOptRecData)valid->xstatetable.optdata; + (GXV_morx_subtable_type2_StateOptRecData)gxvalid->xstatetable.optdata; GXV_LIMIT_CHECK( 4 + 4 + 4 ); @@ -88,14 +88,14 @@ FT_ULong* classTable_length_p, FT_ULong* stateArray_length_p, FT_ULong* entryTable_length_p, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_ULong o[6]; FT_ULong* l[6]; FT_ULong buff[7]; GXV_morx_subtable_type2_StateOptRecData optdata = - (GXV_morx_subtable_type2_StateOptRecData)valid->xstatetable.optdata; + (GXV_morx_subtable_type2_StateOptRecData)gxvalid->xstatetable.optdata; GXV_NAME_ENTER( "subtable boundaries setup" ); @@ -113,7 +113,7 @@ l[4] = &(optdata->componentTable_length); l[5] = &(optdata->ligatureTable_length); - gxv_set_length_by_ulong_offset( o, l, buff, 6, table_size, valid ); + gxv_set_length_by_ulong_offset( o, l, buff, 6, table_size, gxvalid ); GXV_TRACE(( "classTable: offset=0x%08x length=0x%08x\n", classTable, *classTable_length_p )); @@ -142,11 +142,11 @@ gxv_morx_subtable_type2_ligActionIndex_validate( FT_Bytes table, FT_UShort ligActionIndex, - GXV_Validator valid ) + GXV_Validator gxvalid ) { /* access ligActionTable */ GXV_morx_subtable_type2_StateOptRecData optdata = - (GXV_morx_subtable_type2_StateOptRecData)valid->xstatetable.optdata; + (GXV_morx_subtable_type2_StateOptRecData)gxvalid->xstatetable.optdata; FT_Bytes lat_base = table + optdata->ligActionTable; FT_Bytes p = lat_base + @@ -188,7 +188,7 @@ /* it is different from the location offset in mort */ if ( ( offset & 0x3FFF0000UL ) == 0x3FFF0000UL ) { /* negative offset */ - gid_limit = valid->face->num_glyphs - ( offset & 0x0000FFFFUL ); + gid_limit = gxvalid->face->num_glyphs - ( offset & 0x0000FFFFUL ); if ( gid_limit > 0 ) return; @@ -198,9 +198,9 @@ offset & 0xFFFFU )); GXV_SET_ERR_IF_PARANOID( FT_INVALID_OFFSET ); } - else if ( ( offset & 0x3FFF0000UL ) == 0x0000000UL ) + else if ( ( offset & 0x3FFF0000UL ) == 0x00000000UL ) { /* positive offset */ - if ( (FT_Long)offset < valid->face->num_glyphs ) + if ( (FT_Long)offset < gxvalid->face->num_glyphs ) return; GXV_TRACE(( "ligature action table includes" @@ -225,7 +225,7 @@ GXV_StateTable_GlyphOffsetCPtr glyphOffset_p, FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { #ifdef GXV_LOAD_UNUSED_VARS FT_UShort setComponent; @@ -253,16 +253,16 @@ if ( 0 < ligActionIndex ) gxv_morx_subtable_type2_ligActionIndex_validate( - table, ligActionIndex, valid ); + table, ligActionIndex, gxvalid ); } static void gxv_morx_subtable_type2_ligatureTable_validate( FT_Bytes table, - GXV_Validator valid ) + GXV_Validator gxvalid ) { GXV_morx_subtable_type2_StateOptRecData optdata = - (GXV_morx_subtable_type2_StateOptRecData)valid->xstatetable.optdata; + (GXV_morx_subtable_type2_StateOptRecData)gxvalid->xstatetable.optdata; FT_Bytes p = table + optdata->ligatureTable; FT_Bytes limit = table + optdata->ligatureTable @@ -281,7 +281,7 @@ GXV_LIMIT_CHECK( 2 ); lig_gid = FT_NEXT_USHORT( p ); - if ( lig_gid < valid->face->num_glyphs ) + if ( lig_gid < gxvalid->face->num_glyphs ) GXV_SET_ERR_IF_PARANOID( FT_INVALID_GLYPH_ID ); } } @@ -293,7 +293,7 @@ FT_LOCAL_DEF( void ) gxv_morx_subtable_type2_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; @@ -304,21 +304,23 @@ GXV_LIMIT_CHECK( GXV_MORX_SUBTABLE_TYPE2_HEADER_SIZE ); - valid->xstatetable.optdata = + gxvalid->xstatetable.optdata = &lig_rec; - valid->xstatetable.optdata_load_func = + gxvalid->xstatetable.optdata_load_func = gxv_morx_subtable_type2_opttable_load; - valid->xstatetable.subtable_setup_func = + gxvalid->xstatetable.subtable_setup_func = gxv_morx_subtable_type2_subtable_setup; - valid->xstatetable.entry_glyphoffset_fmt = + gxvalid->xstatetable.entry_glyphoffset_fmt = GXV_GLYPHOFFSET_USHORT; - valid->xstatetable.entry_validate_func = + gxvalid->xstatetable.entry_validate_func = gxv_morx_subtable_type2_entry_validate; - gxv_XStateTable_validate( p, limit, valid ); + gxv_XStateTable_validate( p, limit, gxvalid ); - p += valid->subtable_length; - gxv_morx_subtable_type2_ligatureTable_validate( table, valid ); +#if 0 + p += gxvalid->subtable_length; +#endif + gxv_morx_subtable_type2_ligatureTable_validate( table, gxvalid ); GXV_EXIT; } diff --git a/src/gxvalid/gxvmorx4.c b/src/gxvalid/gxvmorx4.c index c0d2f78..68ab678 100644 --- a/src/gxvalid/gxvmorx4.c +++ b/src/gxvalid/gxvmorx4.c @@ -41,12 +41,12 @@ FT_LOCAL_DEF( void ) gxv_morx_subtable_type4_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { GXV_NAME_ENTER( "morx chain subtable type4 " "(Non-Contextual Glyph Substitution)" ); - gxv_mort_subtable_type4_validate( table, limit, valid ); + gxv_mort_subtable_type4_validate( table, limit, gxvalid ); GXV_EXIT; } diff --git a/src/gxvalid/gxvmorx5.c b/src/gxvalid/gxvmorx5.c index d8cf700..5e095dd 100644 --- a/src/gxvalid/gxvmorx5.c +++ b/src/gxvalid/gxvmorx5.c @@ -64,12 +64,12 @@ static void gxv_morx_subtable_type5_insertionGlyphList_load( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; GXV_morx_subtable_type5_StateOptRecData optdata = - (GXV_morx_subtable_type5_StateOptRecData)valid->xstatetable.optdata; + (GXV_morx_subtable_type5_StateOptRecData)gxvalid->xstatetable.optdata; GXV_LIMIT_CHECK( 4 ); @@ -85,14 +85,14 @@ FT_ULong* classTable_length_p, FT_ULong* stateArray_length_p, FT_ULong* entryTable_length_p, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_ULong o[4]; FT_ULong* l[4]; FT_ULong buff[5]; GXV_morx_subtable_type5_StateOptRecData optdata = - (GXV_morx_subtable_type5_StateOptRecData)valid->xstatetable.optdata; + (GXV_morx_subtable_type5_StateOptRecData)gxvalid->xstatetable.optdata; o[0] = classTable; @@ -104,7 +104,7 @@ l[2] = entryTable_length_p; l[3] = &(optdata->insertionGlyphList_length); - gxv_set_length_by_ulong_offset( o, l, buff, 4, table_size, valid ); + gxv_set_length_by_ulong_offset( o, l, buff, 4, table_size, gxvalid ); } @@ -113,9 +113,9 @@ FT_UShort count, FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { - FT_Bytes p = table + table_index * 2; + FT_Bytes p = table + table_index * 2; #ifndef GXV_LOAD_TRACE_VARS @@ -143,7 +143,7 @@ GXV_StateTable_GlyphOffsetCPtr glyphOffset_p, FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { #ifdef GXV_LOAD_UNUSED_VARS FT_Bool setMark; @@ -180,20 +180,20 @@ gxv_morx_subtable_type5_InsertList_validate( currentInsertList, currentInsertCount, table, limit, - valid ); + gxvalid ); if ( markedInsertList && 0 != markedInsertCount ) gxv_morx_subtable_type5_InsertList_validate( markedInsertList, markedInsertCount, table, limit, - valid ); + gxvalid ); } FT_LOCAL_DEF( void ) gxv_morx_subtable_type5_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; @@ -205,18 +205,18 @@ GXV_LIMIT_CHECK( GXV_MORX_SUBTABLE_TYPE5_HEADER_SIZE ); - valid->xstatetable.optdata = + gxvalid->xstatetable.optdata = et; - valid->xstatetable.optdata_load_func = + gxvalid->xstatetable.optdata_load_func = gxv_morx_subtable_type5_insertionGlyphList_load; - valid->xstatetable.subtable_setup_func = + gxvalid->xstatetable.subtable_setup_func = gxv_morx_subtable_type5_subtable_setup; - valid->xstatetable.entry_glyphoffset_fmt = + gxvalid->xstatetable.entry_glyphoffset_fmt = GXV_GLYPHOFFSET_ULONG; - valid->xstatetable.entry_validate_func = + gxvalid->xstatetable.entry_validate_func = gxv_morx_subtable_type5_entry_validate; - gxv_XStateTable_validate( p, limit, valid ); + gxv_XStateTable_validate( p, limit, gxvalid ); GXV_EXIT; } diff --git a/src/gxvalid/gxvopbd.c b/src/gxvalid/gxvopbd.c index e125060..ab0cd72 100644 --- a/src/gxvalid/gxvopbd.c +++ b/src/gxvalid/gxvopbd.c @@ -68,11 +68,11 @@ static void gxv_opbd_LookupValue_validate( FT_UShort glyph, GXV_LookupValueCPtr value_p, - GXV_Validator valid ) + GXV_Validator gxvalid ) { /* offset in LookupTable is measured from the head of opbd table */ - FT_Bytes p = valid->root->base + value_p->u; - FT_Bytes limit = valid->root->limit; + FT_Bytes p = gxvalid->root->base + value_p->u; + FT_Bytes limit = gxvalid->root->limit; FT_Short delta_value; int i; @@ -90,7 +90,7 @@ if ( delta_value == -1 ) continue; - gxv_ctlPoint_validate( glyph, delta_value, valid ); + gxv_ctlPoint_validate( glyph, delta_value, gxvalid ); } else /* format 0, value is distance */ continue; @@ -134,12 +134,12 @@ gxv_opbd_LookupFmt4_transit( FT_UShort relative_gindex, GXV_LookupValueCPtr base_value_p, FT_Bytes lookuptbl_limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { GXV_LookupValueDesc value; FT_UNUSED( lookuptbl_limit ); - FT_UNUSED( valid ); + FT_UNUSED( gxvalid ); /* XXX: check range? */ value.u = (FT_UShort)( base_value_p->u + @@ -162,8 +162,8 @@ FT_Face face, FT_Validator ftvalid ) { - GXV_ValidatorRec validrec; - GXV_Validator valid = &validrec; + GXV_ValidatorRec gxvalidrec; + GXV_Validator gxvalid = &gxvalidrec; GXV_opbd_DataRec opbdrec; GXV_opbd_Data opbd = &opbdrec; FT_Bytes p = table; @@ -172,9 +172,9 @@ FT_ULong version; - valid->root = ftvalid; - valid->table_data = opbd; - valid->face = face; + gxvalid->root = ftvalid; + gxvalid->table_data = opbd; + gxvalid->face = face; FT_TRACE3(( "validating `opbd' table\n" )); GXV_INIT; @@ -196,12 +196,12 @@ if ( 0x0001 < GXV_OPBD_DATA( format ) ) FT_INVALID_FORMAT; - valid->lookupval_sign = GXV_LOOKUPVALUE_UNSIGNED; - valid->lookupval_func = gxv_opbd_LookupValue_validate; - valid->lookupfmt4_trans = gxv_opbd_LookupFmt4_transit; + gxvalid->lookupval_sign = GXV_LOOKUPVALUE_UNSIGNED; + gxvalid->lookupval_func = gxv_opbd_LookupValue_validate; + gxvalid->lookupfmt4_trans = gxv_opbd_LookupFmt4_transit; - gxv_LookupTable_validate( p, limit, valid ); - p += valid->subtable_length; + gxv_LookupTable_validate( p, limit, gxvalid ); + p += gxvalid->subtable_length; if ( p > table + GXV_OPBD_DATA( valueOffset_min ) ) { diff --git a/src/gxvalid/gxvprop.c b/src/gxvalid/gxvprop.c index 0be2133..aa5c8ee 100644 --- a/src/gxvalid/gxvprop.c +++ b/src/gxvalid/gxvprop.c @@ -75,7 +75,7 @@ static void gxv_prop_zero_advance_validate( FT_UShort gid, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Face face; FT_Error error; @@ -84,7 +84,7 @@ GXV_NAME_ENTER( "zero advance" ); - face = valid->face; + face = gxvalid->face; error = FT_Load_Glyph( face, gid, @@ -109,10 +109,10 @@ static void gxv_prop_property_validate( FT_UShort property, FT_UShort glyph, - GXV_Validator valid ) + GXV_Validator gxvalid ) { if ( glyph != 0 && ( property & GXV_PROP_FLOATER ) ) - gxv_prop_zero_advance_validate( glyph, valid ); + gxv_prop_zero_advance_validate( glyph, gxvalid ); if ( property & GXV_PROP_USE_COMPLEMENTARY_BRACKET ) { @@ -145,7 +145,7 @@ else { /* The gid for complement must be the face. */ - gxv_glyphid_validate( (FT_UShort)( glyph + complement ), valid ); + gxv_glyphid_validate( (FT_UShort)( glyph + complement ), gxvalid ); } } else @@ -187,9 +187,9 @@ static void gxv_prop_LookupValue_validate( FT_UShort glyph, GXV_LookupValueCPtr value_p, - GXV_Validator valid ) + GXV_Validator gxvalid ) { - gxv_prop_property_validate( value_p->u, glyph, valid ); + gxv_prop_property_validate( value_p->u, glyph, gxvalid ); } @@ -224,7 +224,7 @@ gxv_prop_LookupFmt4_transit( FT_UShort relative_gindex, GXV_LookupValueCPtr base_value_p, FT_Bytes lookuptbl_limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p; FT_Bytes limit; @@ -234,7 +234,7 @@ /* XXX: check range? */ offset = (FT_UShort)( base_value_p->u + relative_gindex * sizeof ( FT_UShort ) ); - p = valid->lookuptbl_head + offset; + p = gxvalid->lookuptbl_head + offset; limit = lookuptbl_limit; GXV_LIMIT_CHECK ( 2 ); @@ -259,8 +259,8 @@ { FT_Bytes p = table; FT_Bytes limit = 0; - GXV_ValidatorRec validrec; - GXV_Validator valid = &validrec; + GXV_ValidatorRec gxvalidrec; + GXV_Validator gxvalid = &gxvalidrec; GXV_prop_DataRec proprec; GXV_prop_Data prop = &proprec; @@ -270,9 +270,9 @@ FT_UShort defaultProp; - valid->root = ftvalid; - valid->table_data = prop; - valid->face = face; + gxvalid->root = ftvalid; + gxvalid->table_data = prop; + gxvalid->face = face; FT_TRACE3(( "validating `prop' table\n" )); GXV_INIT; @@ -303,7 +303,7 @@ FT_INVALID_FORMAT; } - gxv_prop_property_validate( defaultProp, 0, valid ); + gxv_prop_property_validate( defaultProp, 0, gxvalid ); if ( format == 0 ) { @@ -315,11 +315,11 @@ /* format == 1 */ GXV_PROP_DATA( version ) = version; - valid->lookupval_sign = GXV_LOOKUPVALUE_UNSIGNED; - valid->lookupval_func = gxv_prop_LookupValue_validate; - valid->lookupfmt4_trans = gxv_prop_LookupFmt4_transit; + gxvalid->lookupval_sign = GXV_LOOKUPVALUE_UNSIGNED; + gxvalid->lookupval_func = gxv_prop_LookupValue_validate; + gxvalid->lookupfmt4_trans = gxv_prop_LookupFmt4_transit; - gxv_LookupTable_validate( p, limit, valid ); + gxv_LookupTable_validate( p, limit, gxvalid ); Exit: FT_TRACE4(( "\n" )); diff --git a/src/gxvalid/gxvtrak.c b/src/gxvalid/gxvtrak.c index 11fbd7c..3ec1a56 100644 --- a/src/gxvalid/gxvtrak.c +++ b/src/gxvalid/gxvtrak.c @@ -93,9 +93,9 @@ gxv_trak_trackTable_validate( FT_Bytes table, FT_Bytes limit, FT_UShort nTracks, - GXV_Validator valid ) + GXV_Validator gxvalid ) { - FT_Bytes p = table; + FT_Bytes p = table; FT_Fixed track, t; FT_UShort nameIndex; @@ -122,7 +122,7 @@ if ( offset > GXV_TRAK_DATA( trackValueOffset_max ) ) GXV_TRAK_DATA( trackValueOffset_max ) = offset; - gxv_sfntName_validate( nameIndex, 256, 32767, valid ); + gxv_sfntName_validate( nameIndex, 256, 32767, gxvalid ); for ( j = i; j < nTracks; j ++ ) { @@ -134,7 +134,7 @@ } } - valid->subtable_length = p - table; + gxvalid->subtable_length = p - table; GXV_EXIT; } @@ -142,7 +142,7 @@ static void gxv_trak_trackData_validate( FT_Bytes table, FT_Bytes limit, - GXV_Validator valid ) + GXV_Validator gxvalid ) { FT_Bytes p = table; FT_UShort nTracks; @@ -164,31 +164,31 @@ gxv_odtect_add_range( table, p - table, "trackData header", odtect ); /* validate trackTable */ - gxv_trak_trackTable_validate( p, limit, nTracks, valid ); - gxv_odtect_add_range( p, valid->subtable_length, + gxv_trak_trackTable_validate( p, limit, nTracks, gxvalid ); + gxv_odtect_add_range( p, gxvalid->subtable_length, "trackTable", odtect ); /* sizeTable is array of FT_Fixed, don't check contents */ - p = valid->root->base + sizeTableOffset; + p = gxvalid->root->base + sizeTableOffset; GXV_LIMIT_CHECK( nSizes * 4 ); gxv_odtect_add_range( p, nSizes * 4, "sizeTable", odtect ); /* validate trackValueOffet */ - p = valid->root->base + GXV_TRAK_DATA( trackValueOffset_min ); + p = gxvalid->root->base + GXV_TRAK_DATA( trackValueOffset_min ); if ( limit - p < nTracks * nSizes * 2 ) GXV_TRACE(( "too short trackValue array\n" )); - p = valid->root->base + GXV_TRAK_DATA( trackValueOffset_max ); + p = gxvalid->root->base + GXV_TRAK_DATA( trackValueOffset_max ); GXV_LIMIT_CHECK( nSizes * 2 ); - gxv_odtect_add_range( valid->root->base + gxv_odtect_add_range( gxvalid->root->base + GXV_TRAK_DATA( trackValueOffset_min ), GXV_TRAK_DATA( trackValueOffset_max ) - GXV_TRAK_DATA( trackValueOffset_min ) + nSizes * 2, "trackValue array", odtect ); - gxv_odtect_validate( odtect, valid ); + gxv_odtect_validate( odtect, gxvalid ); GXV_EXIT; } @@ -210,8 +210,8 @@ FT_Bytes p = table; FT_Bytes limit = 0; - GXV_ValidatorRec validrec; - GXV_Validator valid = &validrec; + GXV_ValidatorRec gxvalidrec; + GXV_Validator gxvalid = &gxvalidrec; GXV_trak_DataRec trakrec; GXV_trak_Data trak = &trakrec; @@ -225,11 +225,11 @@ GXV_ODTECT( 3, odtect ); GXV_ODTECT_INIT( odtect ); - valid->root = ftvalid; - valid->table_data = trak; - valid->face = face; + gxvalid->root = ftvalid; + gxvalid->table_data = trak; + gxvalid->face = face; - limit = valid->root->limit; + limit = gxvalid->root->limit; FT_TRACE3(( "validating `trak' table\n" )); GXV_INIT; @@ -265,19 +265,19 @@ /* validate trackData */ if ( 0 < horizOffset ) { - gxv_trak_trackData_validate( table + horizOffset, limit, valid ); - gxv_odtect_add_range( table + horizOffset, valid->subtable_length, + gxv_trak_trackData_validate( table + horizOffset, limit, gxvalid ); + gxv_odtect_add_range( table + horizOffset, gxvalid->subtable_length, "horizJustData", odtect ); } if ( 0 < vertOffset ) { - gxv_trak_trackData_validate( table + vertOffset, limit, valid ); - gxv_odtect_add_range( table + vertOffset, valid->subtable_length, + gxv_trak_trackData_validate( table + vertOffset, limit, gxvalid ); + gxv_odtect_add_range( table + vertOffset, gxvalid->subtable_length, "vertJustData", odtect ); } - gxv_odtect_validate( odtect, valid ); + gxv_odtect_validate( odtect, gxvalid ); FT_TRACE4(( "\n" )); } diff --git a/src/gzip/ftgzip.c b/src/gzip/ftgzip.c index f3d2ef9..2d4200d 100644 --- a/src/gzip/ftgzip.c +++ b/src/gzip/ftgzip.c @@ -8,7 +8,7 @@ /* parse compressed PCF fonts, as found with many X11 server */ /* distributions. */ /* */ -/* Copyright 2002-2006, 2009-2012 by */ +/* Copyright 2002-2006, 2009-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -68,6 +68,15 @@ #undef SLOW #define SLOW 1 /* we can't use asm-optimized sources here! */ +#if defined( _MSC_VER ) /* Visual C++ (and Intel C++) */ + /* We disable the warning `conversion from XXX to YYY, */ + /* possible loss of data' in order to compile cleanly with */ + /* the maximum level of warnings: zlib is non-FreeType */ + /* code. */ +#pragma warning( push ) +#pragma warning( disable : 4244 ) +#endif /* _MSC_VER */ + /* Urgh. `inflate_mask' must not be declared twice -- C++ doesn't like this. We temporarily disable it and load all necessary header files. */ #define NO_INFLATE_MASK @@ -87,6 +96,10 @@ #include "inflate.c" #include "adler32.c" +#if defined( _MSC_VER ) +#pragma warning( pop ) +#endif + #endif /* !FT_CONFIG_OPTION_SYSTEM_ZLIB */ @@ -195,12 +208,12 @@ /* head[0] && head[1] are the magic numbers; */ /* head[2] is the method, and head[3] the flags */ - if ( head[0] != 0x1f || - head[1] != 0x8b || + if ( head[0] != 0x1F || + head[1] != 0x8B || head[2] != Z_DEFLATED || (head[3] & FT_GZIP_RESERVED) ) { - error = Gzip_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } @@ -262,7 +275,7 @@ FT_Stream source ) { z_stream* zstream = &zip->zstream; - FT_Error error = Gzip_Err_Ok; + FT_Error error = FT_Err_Ok; zip->stream = stream; @@ -294,7 +307,7 @@ if ( inflateInit2( zstream, -MAX_WBITS ) != Z_OK || zstream->next_in == NULL ) - error = Gzip_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); Exit: return error; @@ -365,7 +378,7 @@ size = stream->read( stream, stream->pos, zip->input, FT_GZIP_BUFFER_SIZE ); if ( size == 0 ) - return Gzip_Err_Invalid_Stream_Operation; + return FT_THROW( Invalid_Stream_Operation ); } else { @@ -374,7 +387,7 @@ size = FT_GZIP_BUFFER_SIZE; if ( size == 0 ) - return Gzip_Err_Invalid_Stream_Operation; + return FT_THROW( Invalid_Stream_Operation ); FT_MEM_COPY( zip->input, stream->base + stream->pos, size ); } @@ -383,7 +396,7 @@ zstream->next_in = zip->input; zstream->avail_in = size; - return Gzip_Err_Ok; + return FT_Err_Ok; } @@ -391,7 +404,7 @@ ft_gzip_file_fill_output( FT_GZipFile zip ) { z_stream* zstream = &zip->zstream; - FT_Error error = Gzip_Err_Ok; + FT_Error error = FT_Err_Ok; zip->cursor = zip->buffer; @@ -416,12 +429,12 @@ { zip->limit = zstream->next_out; if ( zip->limit == zip->cursor ) - error = Gzip_Err_Invalid_Stream_Operation; + error = FT_THROW( Invalid_Stream_Operation ); break; } else if ( err != Z_OK ) { - error = Gzip_Err_Invalid_Stream_Operation; + error = FT_THROW( Invalid_Stream_Operation ); break; } } @@ -435,7 +448,7 @@ ft_gzip_file_skip_output( FT_GZipFile zip, FT_ULong count ) { - FT_Error error = Gzip_Err_Ok; + FT_Error error = FT_Err_Ok; FT_ULong delta; @@ -583,15 +596,25 @@ } + /* documentation is in ftgzip.h */ + FT_EXPORT_DEF( FT_Error ) FT_Stream_OpenGzip( FT_Stream stream, FT_Stream source ) { FT_Error error; - FT_Memory memory = source->memory; + FT_Memory memory; FT_GZipFile zip = NULL; + if ( !stream || !source ) + { + error = FT_THROW( Invalid_Stream_Handle ); + goto Exit; + } + + memory = source->memory; + /* * check the header right now; this prevents allocating un-necessary * objects when we don't need them @@ -657,7 +680,7 @@ ft_gzip_file_io( zip, 0, NULL, 0 ); FT_FREE( zip_buff ); } - error = Gzip_Err_Ok; + error = FT_Err_Ok; } } @@ -671,7 +694,69 @@ return error; } -#else /* !FT_CONFIG_OPTION_USE_ZLIB */ + + /* documentation is in ftgzip.h */ + + FT_EXPORT_DEF( FT_Error ) + FT_Gzip_Uncompress( FT_Memory memory, + FT_Byte* output, + FT_ULong* output_len, + const FT_Byte* input, + FT_ULong input_len ) + { + z_stream stream; + int err; + + + /* check for `input' delayed to `inflate' */ + + if ( !memory || ! output_len || !output ) + return FT_THROW( Invalid_Argument ); + + /* this function is modeled after zlib's `uncompress' function */ + + stream.next_in = (Bytef*)input; + stream.avail_in = (uInt)input_len; + + stream.next_out = output; + stream.avail_out = (uInt)*output_len; + + stream.zalloc = (alloc_func)ft_gzip_alloc; + stream.zfree = (free_func) ft_gzip_free; + stream.opaque = memory; + + err = inflateInit2( &stream, MAX_WBITS ); + if ( err != Z_OK ) + return FT_THROW( Invalid_Argument ); + + err = inflate( &stream, Z_FINISH ); + if ( err != Z_STREAM_END ) + { + inflateEnd( &stream ); + if ( err == Z_OK ) + err = Z_BUF_ERROR; + } + else + { + *output_len = stream.total_out; + + err = inflateEnd( &stream ); + } + + if ( err == Z_MEM_ERROR ) + return FT_THROW( Out_Of_Memory ); + + if ( err == Z_BUF_ERROR ) + return FT_THROW( Array_Too_Large ); + + if ( err == Z_DATA_ERROR ) + return FT_THROW( Invalid_Table ); + + return FT_Err_Ok; + } + + +#else /* !FT_CONFIG_OPTION_USE_ZLIB */ FT_EXPORT_DEF( FT_Error ) FT_Stream_OpenGzip( FT_Stream stream, @@ -680,7 +765,24 @@ FT_UNUSED( stream ); FT_UNUSED( source ); - return Gzip_Err_Unimplemented_Feature; + return FT_THROW( Unimplemented_Feature ); + } + + + FT_EXPORT_DEF( FT_Error ) + FT_Gzip_Uncompress( FT_Memory memory, + FT_Byte* output, + FT_ULong* output_len, + const FT_Byte* input, + FT_ULong input_len ) + { + FT_UNUSED( memory ); + FT_UNUSED( output ); + FT_UNUSED( output_len ); + FT_UNUSED( input ); + FT_UNUSED( input_len ); + + return FT_THROW( Unimplemented_Feature ); } #endif /* !FT_CONFIG_OPTION_USE_ZLIB */ diff --git a/src/gzip/inftrees.c b/src/gzip/inftrees.c index ef53652..56f52b1 100644 --- a/src/gzip/inftrees.c +++ b/src/gzip/inftrees.c @@ -115,16 +115,16 @@ uIntf *v /* working area: values in order of bit length */ uInt f; /* i repeats in table every f entries */ int g; /* maximum code length */ int h; /* table level */ - register uInt i; /* counter, current code */ - register uInt j; /* counter */ - register int k; /* number of bits in current code */ + uInt i; /* counter, current code */ + uInt j; /* counter */ + int k; /* number of bits in current code */ int l; /* bits per table (returned in m) */ uInt mask; /* (1 << w) - 1, to avoid cc -O bug on HP */ - register uIntf *p; /* pointer into c[], b[], or v[] */ + uIntf *p; /* pointer into c[], b[], or v[] */ inflate_huft *q; /* points to current table */ struct inflate_huft_s r; /* table entry for structure assignment */ inflate_huft *u[BMAX]; /* table stack */ - register int w; /* bits before this table == (l * h) */ + int w; /* bits before this table == (l * h) */ uInt x[BMAX+1]; /* bit offsets, then code stack */ uIntf *xp; /* pointer into x */ int y; /* number of dummy codes added */ diff --git a/src/gzip/rules.mk b/src/gzip/rules.mk index d2a43a6..37cd991 100644 --- a/src/gzip/rules.mk +++ b/src/gzip/rules.mk @@ -3,7 +3,7 @@ # -# Copyright 2002, 2003 by +# Copyright 2002, 2003, 2013 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -27,49 +27,52 @@ else endif -# gzip support sources (i.e., C files) +# gzip support sources # -GZIP_DRV_SRC := $(GZIP_DIR)/ftgzip.c - -# gzip support headers +# All source and header files get loaded by `ftgzip.c' only if SYTEM_ZLIB is +# not defined (regardless whether we have a `single' or a `multi' build). +# However, it doesn't harm if we add everything as a dependency +# unconditionally. # -GZIP_DRV_H := +GZIP_DRV_SRCS := $(GZIP_DIR)/adler32.c \ + $(GZIP_DIR)/infblock.c \ + $(GZIP_DIR)/infblock.h \ + $(GZIP_DIR)/infcodes.c \ + $(GZIP_DIR)/infcodes.h \ + $(GZIP_DIR)/inffixed.h \ + $(GZIP_DIR)/inflate.c \ + $(GZIP_DIR)/inftrees.c \ + $(GZIP_DIR)/inftrees.h \ + $(GZIP_DIR)/infutil.c \ + $(GZIP_DIR)/infutil.h \ + $(GZIP_DIR)/zconf.h \ + $(GZIP_DIR)/zlib.h \ + $(GZIP_DIR)/zutil.c \ + $(GZIP_DIR)/zutil.h # gzip driver object(s) # -# GZIP_DRV_OBJ_M is used during `multi' builds -# GZIP_DRV_OBJ_S is used during `single' builds -# -ifeq ($(SYSTEM_ZLIB),) - GZIP_DRV_OBJ_M := $(GZIP_DRV_SRC:$(GZIP_DIR)/%.c=$(OBJ_DIR)/%.$O) -else - GZIP_DRV_OBJ_M := $(OBJ_DIR)/ftgzip.$O -endif -GZIP_DRV_OBJ_S := $(OBJ_DIR)/ftgzip.$O - -# gzip support source file for single build +# GZIP_DRV_OBJ is used during both `single' and `multi' builds # -GZIP_DRV_SRC_S := $(GZIP_DIR)/ftgzip.c +GZIP_DRV_OBJ := $(OBJ_DIR)/ftgzip.$O -# gzip support - single object +# gzip main source file # -$(GZIP_DRV_OBJ_S): $(GZIP_DRV_SRC_S) $(GZIP_DRV_SRC) $(FREETYPE_H) \ - $(GZIP_DRV_H) - $(GZIP_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $(GZIP_DRV_SRC_S)) +GZIP_DRV_SRC := $(GZIP_DIR)/ftgzip.c -# gzip support - multiple objects +# gzip support - object # -$(OBJ_DIR)/%.$O: $(GZIP_DIR)/%.c $(FREETYPE_H) $(GZIP_DRV_H) - $(GZIP_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<) +$(GZIP_DRV_OBJ): $(GZIP_DRV_SRC) $(GZIP_DRV_SRCS) $(FREETYPE_H) + $(GZIP_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $(GZIP_DRV_SRC)) # update main driver object lists # -DRV_OBJS_S += $(GZIP_DRV_OBJ_S) -DRV_OBJS_M += $(GZIP_DRV_OBJ_M) +DRV_OBJS_S += $(GZIP_DRV_OBJ) +DRV_OBJS_M += $(GZIP_DRV_OBJ) # EOF diff --git a/src/lzw/ftlzw.c b/src/lzw/ftlzw.c index 35e392b..e1b3564 100644 --- a/src/lzw/ftlzw.c +++ b/src/lzw/ftlzw.c @@ -8,7 +8,7 @@ /* be used to parse compressed PCF fonts, as found with many X11 server */ /* distributions. */ /* */ -/* Copyright 2004-2006, 2009, 2010, 2012 by */ +/* Copyright 2004-2006, 2009, 2010, 2012-2014 by */ /* Albert Chin-A-Young. */ /* */ /* Based on code in src/gzip/ftgzip.c, Copyright 2004 by */ @@ -96,9 +96,9 @@ goto Exit; /* head[0] && head[1] are the magic numbers */ - if ( head[0] != 0x1f || - head[1] != 0x9d ) - error = LZW_Err_Invalid_File_Format; + if ( head[0] != 0x1F || + head[1] != 0x9D ) + error = FT_THROW( Invalid_File_Format ); Exit: return error; @@ -111,7 +111,7 @@ FT_Stream source ) { FT_LzwState lzw = &zip->lzw; - FT_Error error = LZW_Err_Ok; + FT_Error error; zip->stream = stream; @@ -172,7 +172,7 @@ { FT_LzwState lzw = &zip->lzw; FT_ULong count; - FT_Error error = LZW_Err_Ok; + FT_Error error = FT_Err_Ok; zip->cursor = zip->buffer; @@ -182,7 +182,7 @@ zip->limit = zip->cursor + count; if ( count == 0 ) - error = LZW_Err_Invalid_Stream_Operation; + error = FT_THROW( Invalid_Stream_Operation ); return error; } @@ -193,7 +193,7 @@ ft_lzw_file_skip_output( FT_LZWFile zip, FT_ULong count ) { - FT_Error error = LZW_Err_Ok; + FT_Error error = FT_Err_Ok; /* first, we skip what we can from the output buffer */ @@ -224,7 +224,7 @@ if ( numread < delta ) { /* not enough bytes */ - error = LZW_Err_Invalid_Stream_Operation; + error = FT_THROW( Invalid_Stream_Operation ); break; } @@ -349,10 +349,18 @@ FT_Stream source ) { FT_Error error; - FT_Memory memory = source->memory; + FT_Memory memory; FT_LZWFile zip = NULL; + if ( !stream || !source ) + { + error = FT_THROW( Invalid_Stream_Handle ); + goto Exit; + } + + memory = source->memory; + /* * Check the header right now; this prevents allocation of a huge * LZWFile object (400 KByte of heap memory) if not necessary. @@ -403,7 +411,7 @@ FT_UNUSED( stream ); FT_UNUSED( source ); - return LZW_Err_Unimplemented_Feature; + return FT_THROW( Unimplemented_Feature ); } diff --git a/src/lzw/ftzopen.h b/src/lzw/ftzopen.h index f7d2936..cdc8fd7 100644 --- a/src/lzw/ftzopen.h +++ b/src/lzw/ftzopen.h @@ -41,7 +41,7 @@ #define LZW_CLEAR 256 #define LZW_FIRST 257 -#define LZW_BIT_MASK 0x1f +#define LZW_BIT_MASK 0x1F #define LZW_BLOCK_MASK 0x80 #define LZW_MASK( n ) ( ( 1U << (n) ) - 1U ) diff --git a/src/otvalid/otvbase.c b/src/otvalid/otvbase.c index d742d2d..4f9d2fa 100644 --- a/src/otvalid/otvbase.c +++ b/src/otvalid/otvbase.c @@ -32,7 +32,7 @@ static void otv_BaseCoord_validate( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt BaseCoordFormat; @@ -58,7 +58,7 @@ case 3: /* BaseCoordFormat3 */ OTV_LIMIT_CHECK( 2 ); /* DeviceTable */ - otv_Device_validate( table + FT_NEXT_USHORT( p ), valid ); + otv_Device_validate( table + FT_NEXT_USHORT( p ), otvalid ); break; default: @@ -71,7 +71,7 @@ static void otv_BaseTagList_validate( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt BaseTagCount; @@ -93,7 +93,7 @@ static void otv_BaseValues_validate( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt BaseCoordCount; @@ -112,7 +112,7 @@ /* BaseCoord */ for ( ; BaseCoordCount > 0; BaseCoordCount-- ) - otv_BaseCoord_validate( table + FT_NEXT_USHORT( p ), valid ); + otv_BaseCoord_validate( table + FT_NEXT_USHORT( p ), otvalid ); OTV_EXIT; } @@ -120,7 +120,7 @@ static void otv_MinMax_validate( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt table_size; @@ -144,11 +144,11 @@ OTV_SIZE_CHECK( MinCoord ); if ( MinCoord ) - otv_BaseCoord_validate( table + MinCoord, valid ); + otv_BaseCoord_validate( table + MinCoord, otvalid ); OTV_SIZE_CHECK( MaxCoord ); if ( MaxCoord ) - otv_BaseCoord_validate( table + MaxCoord, valid ); + otv_BaseCoord_validate( table + MaxCoord, otvalid ); OTV_LIMIT_CHECK( FeatMinMaxCount * 8 ); @@ -162,11 +162,11 @@ OTV_SIZE_CHECK( MinCoord ); if ( MinCoord ) - otv_BaseCoord_validate( table + MinCoord, valid ); + otv_BaseCoord_validate( table + MinCoord, otvalid ); OTV_SIZE_CHECK( MaxCoord ); if ( MaxCoord ) - otv_BaseCoord_validate( table + MaxCoord, valid ); + otv_BaseCoord_validate( table + MaxCoord, otvalid ); } OTV_EXIT; @@ -175,7 +175,7 @@ static void otv_BaseScript_validate( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt table_size; @@ -198,11 +198,11 @@ OTV_SIZE_CHECK( BaseValues ); if ( BaseValues ) - otv_BaseValues_validate( table + BaseValues, valid ); + otv_BaseValues_validate( table + BaseValues, otvalid ); OTV_SIZE_CHECK( DefaultMinMax ); if ( DefaultMinMax ) - otv_MinMax_validate( table + DefaultMinMax, valid ); + otv_MinMax_validate( table + DefaultMinMax, otvalid ); OTV_LIMIT_CHECK( BaseLangSysCount * 6 ); @@ -211,7 +211,7 @@ { p += 4; /* skip BaseLangSysTag */ - otv_MinMax_validate( table + FT_NEXT_USHORT( p ), valid ); + otv_MinMax_validate( table + FT_NEXT_USHORT( p ), otvalid ); } OTV_EXIT; @@ -220,7 +220,7 @@ static void otv_BaseScriptList_validate( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt BaseScriptCount; @@ -241,7 +241,7 @@ p += 4; /* skip BaseScriptTag */ /* BaseScript */ - otv_BaseScript_validate( table + FT_NEXT_USHORT( p ), valid ); + otv_BaseScript_validate( table + FT_NEXT_USHORT( p ), otvalid ); } OTV_EXIT; @@ -250,7 +250,7 @@ static void otv_Axis_validate( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt table_size; @@ -267,10 +267,10 @@ OTV_SIZE_CHECK( BaseTagList ); if ( BaseTagList ) - otv_BaseTagList_validate( table + BaseTagList, valid ); + otv_BaseTagList_validate( table + BaseTagList, otvalid ); /* BaseScriptList */ - otv_BaseScriptList_validate( table + FT_NEXT_USHORT( p ), valid ); + otv_BaseScriptList_validate( table + FT_NEXT_USHORT( p ), otvalid ); OTV_EXIT; } @@ -280,16 +280,16 @@ otv_BASE_validate( FT_Bytes table, FT_Validator ftvalid ) { - OTV_ValidatorRec validrec; - OTV_Validator valid = &validrec; - FT_Bytes p = table; + OTV_ValidatorRec otvalidrec; + OTV_Validator otvalid = &otvalidrec; + FT_Bytes p = table; FT_UInt table_size; OTV_OPTIONAL_TABLE( HorizAxis ); OTV_OPTIONAL_TABLE( VertAxis ); - valid->root = ftvalid; + otvalid->root = ftvalid; FT_TRACE3(( "validating BASE table\n" )); OTV_INIT; @@ -304,12 +304,12 @@ OTV_OPTIONAL_OFFSET( HorizAxis ); OTV_SIZE_CHECK( HorizAxis ); if ( HorizAxis ) - otv_Axis_validate( table + HorizAxis, valid ); + otv_Axis_validate( table + HorizAxis, otvalid ); OTV_OPTIONAL_OFFSET( VertAxis ); OTV_SIZE_CHECK( VertAxis ); if ( VertAxis ) - otv_Axis_validate( table + VertAxis, valid ); + otv_Axis_validate( table + VertAxis, otvalid ); FT_TRACE4(( "\n" )); } diff --git a/src/otvalid/otvcommn.c b/src/otvalid/otvcommn.c index a4f885b..3c3de63 100644 --- a/src/otvalid/otvcommn.c +++ b/src/otvalid/otvcommn.c @@ -39,7 +39,7 @@ FT_LOCAL_DEF( void ) otv_Coverage_validate( FT_Bytes table, - OTV_Validator valid, + OTV_Validator otvalid, FT_Int expected_count ) { FT_Bytes p = table; @@ -74,7 +74,7 @@ gid = FT_NEXT_USHORT( p ); - if ( gid >= valid->glyph_count ) + if ( gid >= otvalid->glyph_count ) FT_INVALID_GLYPH_ID; } @@ -104,7 +104,7 @@ if ( Start > End || StartCoverageIndex != total ) FT_INVALID_DATA; - if ( End >= valid->glyph_count ) + if ( End >= otvalid->glyph_count ) FT_INVALID_GLYPH_ID; if ( n > 0 && Start <= last ) @@ -219,7 +219,7 @@ FT_LOCAL_DEF( void ) otv_ClassDef_validate( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt ClassFormat; @@ -249,7 +249,7 @@ OTV_LIMIT_CHECK( GlyphCount * 2 ); /* ClassValueArray */ - if ( StartGlyph + GlyphCount - 1 >= valid->glyph_count ) + if ( StartGlyph + GlyphCount - 1 >= otvalid->glyph_count ) FT_INVALID_GLYPH_ID; } break; @@ -276,7 +276,7 @@ if ( Start > End || ( n > 0 && Start <= last ) ) FT_INVALID_DATA; - if ( End >= valid->glyph_count ) + if ( End >= otvalid->glyph_count ) FT_INVALID_GLYPH_ID; last = End; @@ -305,7 +305,7 @@ FT_LOCAL_DEF( void ) otv_Device_validate( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt StartSize, EndSize, DeltaFormat, count; @@ -339,12 +339,12 @@ /*************************************************************************/ /*************************************************************************/ - /* uses valid->type_count */ - /* uses valid->type_funcs */ + /* uses otvalid->type_count */ + /* uses otvalid->type_funcs */ FT_LOCAL_DEF( void ) otv_Lookup_validate( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt LookupType, SubTableCount; @@ -360,10 +360,10 @@ OTV_TRACE(( " (type %d)\n", LookupType )); - if ( LookupType == 0 || LookupType > valid->type_count ) + if ( LookupType == 0 || LookupType > otvalid->type_count ) FT_INVALID_DATA; - validate = valid->type_funcs[LookupType - 1]; + validate = otvalid->type_funcs[LookupType - 1]; OTV_TRACE(( " (SubTableCount = %d)\n", SubTableCount )); @@ -371,7 +371,7 @@ /* SubTable */ for ( ; SubTableCount > 0; SubTableCount-- ) - validate( table + FT_NEXT_USHORT( p ), valid ); + validate( table + FT_NEXT_USHORT( p ), otvalid ); OTV_EXIT; } @@ -381,7 +381,7 @@ FT_LOCAL_DEF( void ) otv_LookupList_validate( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt LookupCount; @@ -396,11 +396,11 @@ OTV_LIMIT_CHECK( LookupCount * 2 ); - valid->lookup_count = LookupCount; + otvalid->lookup_count = LookupCount; /* Lookup */ for ( ; LookupCount > 0; LookupCount-- ) - otv_Lookup_validate( table + FT_NEXT_USHORT( p ), valid ); + otv_Lookup_validate( table + FT_NEXT_USHORT( p ), otvalid ); OTV_EXIT; } @@ -421,11 +421,11 @@ /*************************************************************************/ /*************************************************************************/ - /* uses valid->lookup_count */ + /* uses otvalid->lookup_count */ FT_LOCAL_DEF( void ) otv_Feature_validate( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt LookupCount; @@ -443,7 +443,7 @@ /* LookupListIndex */ for ( ; LookupCount > 0; LookupCount-- ) - if ( FT_NEXT_USHORT( p ) >= valid->lookup_count ) + if ( FT_NEXT_USHORT( p ) >= otvalid->lookup_count ) FT_INVALID_DATA; OTV_EXIT; @@ -457,12 +457,12 @@ } - /* sets valid->lookup_count */ + /* sets otvalid->lookup_count */ FT_LOCAL_DEF( void ) otv_FeatureList_validate( FT_Bytes table, FT_Bytes lookups, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt FeatureCount; @@ -477,7 +477,7 @@ OTV_LIMIT_CHECK( FeatureCount * 2 ); - valid->lookup_count = otv_LookupList_get_count( lookups ); + otvalid->lookup_count = otv_LookupList_get_count( lookups ); /* FeatureRecord */ for ( ; FeatureCount > 0; FeatureCount-- ) @@ -485,7 +485,7 @@ p += 4; /* skip FeatureTag */ /* Feature */ - otv_Feature_validate( table + FT_NEXT_USHORT( p ), valid ); + otv_Feature_validate( table + FT_NEXT_USHORT( p ), otvalid ); } OTV_EXIT; @@ -501,11 +501,11 @@ /*************************************************************************/ - /* uses valid->extra1 (number of features) */ + /* uses otvalid->extra1 (number of features) */ FT_LOCAL_DEF( void ) otv_LangSys_validate( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt ReqFeatureIndex; @@ -522,14 +522,14 @@ OTV_TRACE(( " (ReqFeatureIndex = %d)\n", ReqFeatureIndex )); OTV_TRACE(( " (FeatureCount = %d)\n", FeatureCount )); - if ( ReqFeatureIndex != 0xFFFFU && ReqFeatureIndex >= valid->extra1 ) + if ( ReqFeatureIndex != 0xFFFFU && ReqFeatureIndex >= otvalid->extra1 ) FT_INVALID_DATA; OTV_LIMIT_CHECK( FeatureCount * 2 ); /* FeatureIndex */ for ( ; FeatureCount > 0; FeatureCount-- ) - if ( FT_NEXT_USHORT( p ) >= valid->extra1 ) + if ( FT_NEXT_USHORT( p ) >= otvalid->extra1 ) FT_INVALID_DATA; OTV_EXIT; @@ -546,7 +546,7 @@ FT_LOCAL_DEF( void ) otv_Script_validate( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_UInt DefaultLangSys, LangSysCount; FT_Bytes p = table; @@ -561,7 +561,7 @@ OTV_TRACE(( " (LangSysCount = %d)\n", LangSysCount )); if ( DefaultLangSys != 0 ) - otv_LangSys_validate( table + DefaultLangSys, valid ); + otv_LangSys_validate( table + DefaultLangSys, otvalid ); OTV_LIMIT_CHECK( LangSysCount * 6 ); @@ -571,19 +571,19 @@ p += 4; /* skip LangSysTag */ /* LangSys */ - otv_LangSys_validate( table + FT_NEXT_USHORT( p ), valid ); + otv_LangSys_validate( table + FT_NEXT_USHORT( p ), otvalid ); } OTV_EXIT; } - /* sets valid->extra1 (number of features) */ + /* sets otvalid->extra1 (number of features) */ FT_LOCAL_DEF( void ) otv_ScriptList_validate( FT_Bytes table, FT_Bytes features, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_UInt ScriptCount; FT_Bytes p = table; @@ -598,14 +598,14 @@ OTV_LIMIT_CHECK( ScriptCount * 6 ); - valid->extra1 = otv_Feature_get_count( features ); + otvalid->extra1 = otv_Feature_get_count( features ); /* ScriptRecord */ for ( ; ScriptCount > 0; ScriptCount-- ) { p += 4; /* skip ScriptTag */ - otv_Script_validate( table + FT_NEXT_USHORT( p ), valid ); /* Script */ + otv_Script_validate( table + FT_NEXT_USHORT( p ), otvalid ); /* Script */ } OTV_EXIT; @@ -640,7 +640,7 @@ FT_LOCAL_DEF( void ) otv_x_Ox( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt Count; @@ -656,13 +656,13 @@ OTV_LIMIT_CHECK( Count * 2 ); - valid->nesting_level++; - func = valid->func[valid->nesting_level]; + otvalid->nesting_level++; + func = otvalid->func[otvalid->nesting_level]; for ( ; Count > 0; Count-- ) - func( table + FT_NEXT_USHORT( p ), valid ); + func( table + FT_NEXT_USHORT( p ), otvalid ); - valid->nesting_level--; + otvalid->nesting_level--; OTV_EXIT; } @@ -670,7 +670,7 @@ FT_LOCAL_DEF( void ) otv_u_C_x_Ox( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt Count, Coverage; @@ -687,27 +687,27 @@ OTV_TRACE(( " (Count = %d)\n", Count )); - otv_Coverage_validate( table + Coverage, valid, Count ); + otv_Coverage_validate( table + Coverage, otvalid, Count ); OTV_LIMIT_CHECK( Count * 2 ); - valid->nesting_level++; - func = valid->func[valid->nesting_level]; + otvalid->nesting_level++; + func = otvalid->func[otvalid->nesting_level]; for ( ; Count > 0; Count-- ) - func( table + FT_NEXT_USHORT( p ), valid ); + func( table + FT_NEXT_USHORT( p ), otvalid ); - valid->nesting_level--; + otvalid->nesting_level--; OTV_EXIT; } - /* uses valid->extra1 (if > 0: array value limit) */ + /* uses otvalid->extra1 (if > 0: array value limit) */ FT_LOCAL_DEF( void ) otv_x_ux( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt Count; @@ -722,10 +722,10 @@ OTV_LIMIT_CHECK( Count * 2 ); - if ( valid->extra1 ) + if ( otvalid->extra1 ) { for ( ; Count > 0; Count-- ) - if ( FT_NEXT_USHORT( p ) >= valid->extra1 ) + if ( FT_NEXT_USHORT( p ) >= otvalid->extra1 ) FT_INVALID_DATA; } @@ -736,11 +736,11 @@ /* `ux' in the function's name is not really correct since only x-1 */ /* elements are tested */ - /* uses valid->extra1 (array value limit) */ + /* uses otvalid->extra1 (array value limit) */ FT_LOCAL_DEF( void ) otv_x_y_ux_sy( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt Count1, Count2; @@ -766,7 +766,7 @@ if ( FT_NEXT_USHORT( p ) >= Count1 ) FT_INVALID_DATA; - if ( FT_NEXT_USHORT( p ) >= valid->extra1 ) + if ( FT_NEXT_USHORT( p ) >= otvalid->extra1 ) FT_INVALID_DATA; } @@ -777,11 +777,11 @@ /* `uy' in the function's name is not really correct since only y-1 */ /* elements are tested */ - /* uses valid->extra1 (array value limit) */ + /* uses otvalid->extra1 (array value limit) */ FT_LOCAL_DEF( void ) otv_x_ux_y_uy_z_uz_p_sp( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt BacktrackCount, InputCount, LookaheadCount; @@ -825,7 +825,7 @@ if ( FT_NEXT_USHORT( p ) >= InputCount ) FT_INVALID_DATA; - if ( FT_NEXT_USHORT( p ) >= valid->extra1 ) + if ( FT_NEXT_USHORT( p ) >= otvalid->extra1 ) FT_INVALID_DATA; } @@ -833,11 +833,11 @@ } - /* sets valid->extra1 (valid->lookup_count) */ + /* sets otvalid->extra1 (valid->lookup_count) */ FT_LOCAL_DEF( void ) otv_u_O_O_x_Onx( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt Coverage, ClassDef, ClassSetCount; @@ -855,14 +855,14 @@ OTV_TRACE(( " (ClassSetCount = %d)\n", ClassSetCount )); - otv_Coverage_validate( table + Coverage, valid, -1 ); - otv_ClassDef_validate( table + ClassDef, valid ); + otv_Coverage_validate( table + Coverage, otvalid, -1 ); + otv_ClassDef_validate( table + ClassDef, otvalid ); OTV_LIMIT_CHECK( ClassSetCount * 2 ); - valid->nesting_level++; - func = valid->func[valid->nesting_level]; - valid->extra1 = valid->lookup_count; + otvalid->nesting_level++; + func = otvalid->func[otvalid->nesting_level]; + otvalid->extra1 = otvalid->lookup_count; for ( ; ClassSetCount > 0; ClassSetCount-- ) { @@ -870,20 +870,20 @@ if ( offset ) - func( table + offset, valid ); + func( table + offset, otvalid ); } - valid->nesting_level--; + otvalid->nesting_level--; OTV_EXIT; } - /* uses valid->lookup_count */ + /* uses otvalid->lookup_count */ FT_LOCAL_DEF( void ) otv_u_x_y_Ox_sy( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt GlyphCount, Count, count1; @@ -903,14 +903,14 @@ OTV_LIMIT_CHECK( GlyphCount * 2 + Count * 4 ); for ( count1 = GlyphCount; count1 > 0; count1-- ) - otv_Coverage_validate( table + FT_NEXT_USHORT( p ), valid, -1 ); + otv_Coverage_validate( table + FT_NEXT_USHORT( p ), otvalid, -1 ); for ( ; Count > 0; Count-- ) { if ( FT_NEXT_USHORT( p ) >= GlyphCount ) FT_INVALID_DATA; - if ( FT_NEXT_USHORT( p ) >= valid->lookup_count ) + if ( FT_NEXT_USHORT( p ) >= otvalid->lookup_count ) FT_INVALID_DATA; } @@ -918,11 +918,11 @@ } - /* sets valid->extra1 (valid->lookup_count) */ + /* sets otvalid->extra1 (valid->lookup_count) */ FT_LOCAL_DEF( void ) otv_u_O_O_O_O_x_Onx( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt Coverage; @@ -944,17 +944,17 @@ OTV_TRACE(( " (ChainClassSetCount = %d)\n", ChainClassSetCount )); - otv_Coverage_validate( table + Coverage, valid, -1 ); + otv_Coverage_validate( table + Coverage, otvalid, -1 ); - otv_ClassDef_validate( table + BacktrackClassDef, valid ); - otv_ClassDef_validate( table + InputClassDef, valid ); - otv_ClassDef_validate( table + LookaheadClassDef, valid ); + otv_ClassDef_validate( table + BacktrackClassDef, otvalid ); + otv_ClassDef_validate( table + InputClassDef, otvalid ); + otv_ClassDef_validate( table + LookaheadClassDef, otvalid ); OTV_LIMIT_CHECK( ChainClassSetCount * 2 ); - valid->nesting_level++; - func = valid->func[valid->nesting_level]; - valid->extra1 = valid->lookup_count; + otvalid->nesting_level++; + func = otvalid->func[otvalid->nesting_level]; + otvalid->extra1 = otvalid->lookup_count; for ( ; ChainClassSetCount > 0; ChainClassSetCount-- ) { @@ -962,20 +962,20 @@ if ( offset ) - func( table + offset, valid ); + func( table + offset, otvalid ); } - valid->nesting_level--; + otvalid->nesting_level--; OTV_EXIT; } - /* uses valid->lookup_count */ + /* uses otvalid->lookup_count */ FT_LOCAL_DEF( void ) otv_u_x_Ox_y_Oy_z_Oz_p_sp( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt BacktrackGlyphCount, InputGlyphCount, LookaheadGlyphCount; @@ -994,7 +994,7 @@ OTV_LIMIT_CHECK( BacktrackGlyphCount * 2 + 2 ); for ( ; BacktrackGlyphCount > 0; BacktrackGlyphCount-- ) - otv_Coverage_validate( table + FT_NEXT_USHORT( p ), valid, -1 ); + otv_Coverage_validate( table + FT_NEXT_USHORT( p ), otvalid, -1 ); InputGlyphCount = FT_NEXT_USHORT( p ); @@ -1003,7 +1003,7 @@ OTV_LIMIT_CHECK( InputGlyphCount * 2 + 2 ); for ( count1 = InputGlyphCount; count1 > 0; count1-- ) - otv_Coverage_validate( table + FT_NEXT_USHORT( p ), valid, -1 ); + otv_Coverage_validate( table + FT_NEXT_USHORT( p ), otvalid, -1 ); LookaheadGlyphCount = FT_NEXT_USHORT( p ); @@ -1012,7 +1012,7 @@ OTV_LIMIT_CHECK( LookaheadGlyphCount * 2 + 2 ); for ( ; LookaheadGlyphCount > 0; LookaheadGlyphCount-- ) - otv_Coverage_validate( table + FT_NEXT_USHORT( p ), valid, -1 ); + otv_Coverage_validate( table + FT_NEXT_USHORT( p ), otvalid, -1 ); count2 = FT_NEXT_USHORT( p ); @@ -1025,7 +1025,7 @@ if ( FT_NEXT_USHORT( p ) >= InputGlyphCount ) FT_INVALID_DATA; - if ( FT_NEXT_USHORT( p ) >= valid->lookup_count ) + if ( FT_NEXT_USHORT( p ) >= otvalid->lookup_count ) FT_INVALID_DATA; } diff --git a/src/otvalid/otvcommn.h b/src/otvalid/otvcommn.h index 898887f..5c93ba7 100644 --- a/src/otvalid/otvcommn.h +++ b/src/otvalid/otvcommn.h @@ -4,7 +4,7 @@ /* */ /* OpenType common tables validation (specification). */ /* */ -/* Copyright 2004, 2005, 2007, 2009 by */ +/* Copyright 2004, 2005, 2007, 2009, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -39,7 +39,7 @@ FT_BEGIN_HEADER typedef struct OTV_ValidatorRec_* OTV_Validator; typedef void (*OTV_Validate_Func)( FT_Bytes table, - OTV_Validator valid ); + OTV_Validator otvalid ); typedef struct OTV_ValidatorRec_ { @@ -67,8 +67,8 @@ FT_BEGIN_HEADER #undef FT_INVALID_ -#define FT_INVALID_( _prefix, _error ) \ - ft_validator_error( valid->root, _prefix ## _error ) +#define FT_INVALID_( _error ) \ + ft_validator_error( otvalid->root, FT_THROW( _error ) ) #define OTV_OPTIONAL_TABLE( _table ) FT_UShort _table; \ FT_Bytes _table ## _p @@ -81,7 +81,7 @@ FT_BEGIN_HEADER #define OTV_LIMIT_CHECK( _count ) \ FT_BEGIN_STMNT \ - if ( p + (_count) > valid->root->limit ) \ + if ( p + (_count) > otvalid->root->limit ) \ FT_INVALID_TOO_SHORT; \ FT_END_STMNT @@ -89,7 +89,7 @@ FT_BEGIN_HEADER FT_BEGIN_STMNT \ if ( _size > 0 && _size < table_size ) \ { \ - if ( valid->root->level == FT_VALIDATE_PARANOID ) \ + if ( otvalid->root->level == FT_VALIDATE_PARANOID ) \ FT_INVALID_OFFSET; \ else \ { \ @@ -117,79 +117,79 @@ FT_BEGIN_HEADER #ifdef FT_DEBUG_LEVEL_TRACE -#define OTV_NEST1( x ) \ - FT_BEGIN_STMNT \ - valid->nesting_level = 0; \ - valid->func[0] = OTV_FUNC( x ); \ - valid->debug_function_name[0] = OTV_NAME( x ); \ +#define OTV_NEST1( x ) \ + FT_BEGIN_STMNT \ + otvalid->nesting_level = 0; \ + otvalid->func[0] = OTV_FUNC( x ); \ + otvalid->debug_function_name[0] = OTV_NAME( x ); \ FT_END_STMNT -#define OTV_NEST2( x, y ) \ - FT_BEGIN_STMNT \ - valid->nesting_level = 0; \ - valid->func[0] = OTV_FUNC( x ); \ - valid->func[1] = OTV_FUNC( y ); \ - valid->debug_function_name[0] = OTV_NAME( x ); \ - valid->debug_function_name[1] = OTV_NAME( y ); \ +#define OTV_NEST2( x, y ) \ + FT_BEGIN_STMNT \ + otvalid->nesting_level = 0; \ + otvalid->func[0] = OTV_FUNC( x ); \ + otvalid->func[1] = OTV_FUNC( y ); \ + otvalid->debug_function_name[0] = OTV_NAME( x ); \ + otvalid->debug_function_name[1] = OTV_NAME( y ); \ FT_END_STMNT -#define OTV_NEST3( x, y, z ) \ - FT_BEGIN_STMNT \ - valid->nesting_level = 0; \ - valid->func[0] = OTV_FUNC( x ); \ - valid->func[1] = OTV_FUNC( y ); \ - valid->func[2] = OTV_FUNC( z ); \ - valid->debug_function_name[0] = OTV_NAME( x ); \ - valid->debug_function_name[1] = OTV_NAME( y ); \ - valid->debug_function_name[2] = OTV_NAME( z ); \ +#define OTV_NEST3( x, y, z ) \ + FT_BEGIN_STMNT \ + otvalid->nesting_level = 0; \ + otvalid->func[0] = OTV_FUNC( x ); \ + otvalid->func[1] = OTV_FUNC( y ); \ + otvalid->func[2] = OTV_FUNC( z ); \ + otvalid->debug_function_name[0] = OTV_NAME( x ); \ + otvalid->debug_function_name[1] = OTV_NAME( y ); \ + otvalid->debug_function_name[2] = OTV_NAME( z ); \ FT_END_STMNT -#define OTV_INIT valid->debug_indent = 0 +#define OTV_INIT otvalid->debug_indent = 0 -#define OTV_ENTER \ - FT_BEGIN_STMNT \ - valid->debug_indent += 2; \ - FT_TRACE4(( "%*.s", valid->debug_indent, 0 )); \ - FT_TRACE4(( "%s table\n", \ - valid->debug_function_name[valid->nesting_level] )); \ +#define OTV_ENTER \ + FT_BEGIN_STMNT \ + otvalid->debug_indent += 2; \ + FT_TRACE4(( "%*.s", otvalid->debug_indent, 0 )); \ + FT_TRACE4(( "%s table\n", \ + otvalid->debug_function_name[otvalid->nesting_level] )); \ FT_END_STMNT -#define OTV_NAME_ENTER( name ) \ - FT_BEGIN_STMNT \ - valid->debug_indent += 2; \ - FT_TRACE4(( "%*.s", valid->debug_indent, 0 )); \ - FT_TRACE4(( "%s table\n", name )); \ +#define OTV_NAME_ENTER( name ) \ + FT_BEGIN_STMNT \ + otvalid->debug_indent += 2; \ + FT_TRACE4(( "%*.s", otvalid->debug_indent, 0 )); \ + FT_TRACE4(( "%s table\n", name )); \ FT_END_STMNT -#define OTV_EXIT valid->debug_indent -= 2 +#define OTV_EXIT otvalid->debug_indent -= 2 -#define OTV_TRACE( s ) \ - FT_BEGIN_STMNT \ - FT_TRACE4(( "%*.s", valid->debug_indent, 0 )); \ - FT_TRACE4( s ); \ +#define OTV_TRACE( s ) \ + FT_BEGIN_STMNT \ + FT_TRACE4(( "%*.s", otvalid->debug_indent, 0 )); \ + FT_TRACE4( s ); \ FT_END_STMNT #else /* !FT_DEBUG_LEVEL_TRACE */ -#define OTV_NEST1( x ) \ - FT_BEGIN_STMNT \ - valid->nesting_level = 0; \ - valid->func[0] = OTV_FUNC( x ); \ +#define OTV_NEST1( x ) \ + FT_BEGIN_STMNT \ + otvalid->nesting_level = 0; \ + otvalid->func[0] = OTV_FUNC( x ); \ FT_END_STMNT -#define OTV_NEST2( x, y ) \ - FT_BEGIN_STMNT \ - valid->nesting_level = 0; \ - valid->func[0] = OTV_FUNC( x ); \ - valid->func[1] = OTV_FUNC( y ); \ +#define OTV_NEST2( x, y ) \ + FT_BEGIN_STMNT \ + otvalid->nesting_level = 0; \ + otvalid->func[0] = OTV_FUNC( x ); \ + otvalid->func[1] = OTV_FUNC( y ); \ FT_END_STMNT -#define OTV_NEST3( x, y, z ) \ - FT_BEGIN_STMNT \ - valid->nesting_level = 0; \ - valid->func[0] = OTV_FUNC( x ); \ - valid->func[1] = OTV_FUNC( y ); \ - valid->func[2] = OTV_FUNC( z ); \ +#define OTV_NEST3( x, y, z ) \ + FT_BEGIN_STMNT \ + otvalid->nesting_level = 0; \ + otvalid->func[0] = OTV_FUNC( x ); \ + otvalid->func[1] = OTV_FUNC( y ); \ + otvalid->func[2] = OTV_FUNC( z ); \ FT_END_STMNT #define OTV_INIT do { } while ( 0 ) @@ -202,7 +202,7 @@ FT_BEGIN_HEADER #endif /* !FT_DEBUG_LEVEL_TRACE */ -#define OTV_RUN valid->func[0] +#define OTV_RUN otvalid->func[0] /*************************************************************************/ @@ -215,7 +215,7 @@ FT_BEGIN_HEADER FT_LOCAL( void ) otv_Coverage_validate( FT_Bytes table, - OTV_Validator valid, + OTV_Validator otvalid, FT_Int expected_count ); /* return first covered glyph */ @@ -241,7 +241,7 @@ FT_BEGIN_HEADER FT_LOCAL( void ) otv_ClassDef_validate( FT_Bytes table, - OTV_Validator valid ); + OTV_Validator otvalid ); /*************************************************************************/ @@ -254,7 +254,7 @@ FT_BEGIN_HEADER FT_LOCAL( void ) otv_Device_validate( FT_Bytes table, - OTV_Validator valid ); + OTV_Validator otvalid ); /*************************************************************************/ @@ -267,11 +267,11 @@ FT_BEGIN_HEADER FT_LOCAL( void ) otv_Lookup_validate( FT_Bytes table, - OTV_Validator valid ); + OTV_Validator otvalid ); FT_LOCAL( void ) otv_LookupList_validate( FT_Bytes table, - OTV_Validator valid ); + OTV_Validator otvalid ); /*************************************************************************/ @@ -284,13 +284,13 @@ FT_BEGIN_HEADER FT_LOCAL( void ) otv_Feature_validate( FT_Bytes table, - OTV_Validator valid ); + OTV_Validator otvalid ); /* lookups must already be validated */ FT_LOCAL( void ) otv_FeatureList_validate( FT_Bytes table, FT_Bytes lookups, - OTV_Validator valid ); + OTV_Validator otvalid ); /*************************************************************************/ @@ -303,7 +303,7 @@ FT_BEGIN_HEADER FT_LOCAL( void ) otv_LangSys_validate( FT_Bytes table, - OTV_Validator valid ); + OTV_Validator otvalid ); /*************************************************************************/ @@ -316,13 +316,13 @@ FT_BEGIN_HEADER FT_LOCAL( void ) otv_Script_validate( FT_Bytes table, - OTV_Validator valid ); + OTV_Validator otvalid ); /* features must already be validated */ FT_LOCAL( void ) otv_ScriptList_validate( FT_Bytes table, FT_Bytes features, - OTV_Validator valid ); + OTV_Validator otvalid ); /*************************************************************************/ @@ -349,7 +349,7 @@ FT_BEGIN_HEADER FT_LOCAL( void ) otv_x_Ox ( FT_Bytes table, - OTV_Validator valid ); + OTV_Validator otvalid ); #define AlternateSubstFormat1Func otv_u_C_x_Ox #define ChainContextPosFormat1Func otv_u_C_x_Ox @@ -361,7 +361,7 @@ FT_BEGIN_HEADER FT_LOCAL( void ) otv_u_C_x_Ox( FT_Bytes table, - OTV_Validator valid ); + OTV_Validator otvalid ); #define AlternateSetFunc otv_x_ux #define AttachPointFunc otv_x_ux @@ -372,7 +372,7 @@ FT_BEGIN_HEADER FT_LOCAL( void ) otv_x_ux( FT_Bytes table, - OTV_Validator valid ); + OTV_Validator otvalid ); #define PosClassRuleFunc otv_x_y_ux_sy #define PosRuleFunc otv_x_y_ux_sy @@ -381,7 +381,7 @@ FT_BEGIN_HEADER FT_LOCAL( void ) otv_x_y_ux_sy( FT_Bytes table, - OTV_Validator valid ); + OTV_Validator otvalid ); #define ChainPosClassRuleFunc otv_x_ux_y_uy_z_uz_p_sp #define ChainPosRuleFunc otv_x_ux_y_uy_z_uz_p_sp @@ -390,35 +390,35 @@ FT_BEGIN_HEADER FT_LOCAL( void ) otv_x_ux_y_uy_z_uz_p_sp( FT_Bytes table, - OTV_Validator valid ); + OTV_Validator otvalid ); #define ContextPosFormat2Func otv_u_O_O_x_Onx #define ContextSubstFormat2Func otv_u_O_O_x_Onx FT_LOCAL( void ) otv_u_O_O_x_Onx( FT_Bytes table, - OTV_Validator valid ); + OTV_Validator otvalid ); #define ContextPosFormat3Func otv_u_x_y_Ox_sy #define ContextSubstFormat3Func otv_u_x_y_Ox_sy FT_LOCAL( void ) otv_u_x_y_Ox_sy( FT_Bytes table, - OTV_Validator valid ); + OTV_Validator otvalid ); #define ChainContextPosFormat2Func otv_u_O_O_O_O_x_Onx #define ChainContextSubstFormat2Func otv_u_O_O_O_O_x_Onx FT_LOCAL( void ) otv_u_O_O_O_O_x_Onx( FT_Bytes table, - OTV_Validator valid ); + OTV_Validator otvalid ); #define ChainContextPosFormat3Func otv_u_x_Ox_y_Oy_z_Oz_p_sp #define ChainContextSubstFormat3Func otv_u_x_Ox_y_Oy_z_Oz_p_sp FT_LOCAL( void ) otv_u_x_Ox_y_Oy_z_Oz_p_sp( FT_Bytes table, - OTV_Validator valid ); + OTV_Validator otvalid ); FT_LOCAL( FT_UInt ) diff --git a/src/otvalid/otverror.h b/src/otvalid/otverror.h index 522f4a2..b6f00c9 100644 --- a/src/otvalid/otverror.h +++ b/src/otvalid/otverror.h @@ -4,7 +4,7 @@ /* */ /* OpenType validation module error codes (specification only). */ /* */ -/* Copyright 2004, 2005, 2012 by */ +/* Copyright 2004, 2005, 2012, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -34,8 +34,6 @@ #define FT_ERR_PREFIX OTV_Err_ #define FT_ERR_BASE FT_Mod_Err_OTvalid -#define FT_KEEP_ERR_PREFIX - #include FT_ERRORS_H #endif /* __OTVERROR_H__ */ diff --git a/src/otvalid/otvgdef.c b/src/otvalid/otvgdef.c index 3633ad0..e60ef36 100644 --- a/src/otvalid/otvgdef.c +++ b/src/otvalid/otvgdef.c @@ -45,7 +45,7 @@ static void otv_O_x_Ox( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_Bytes Coverage; @@ -61,20 +61,20 @@ OTV_TRACE(( " (GlyphCount = %d)\n", GlyphCount )); - otv_Coverage_validate( Coverage, valid, GlyphCount ); + otv_Coverage_validate( Coverage, otvalid, GlyphCount ); if ( GlyphCount != otv_Coverage_get_count( Coverage ) ) FT_INVALID_DATA; OTV_LIMIT_CHECK( GlyphCount * 2 ); - valid->nesting_level++; - func = valid->func[valid->nesting_level]; - valid->extra1 = 0; + otvalid->nesting_level++; + func = otvalid->func[otvalid->nesting_level]; + otvalid->extra1 = 0; for ( ; GlyphCount > 0; GlyphCount-- ) - func( table + FT_NEXT_USHORT( p ), valid ); + func( table + FT_NEXT_USHORT( p ), otvalid ); - valid->nesting_level--; + otvalid->nesting_level--; OTV_EXIT; } @@ -92,7 +92,7 @@ static void otv_CaretValue_validate( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt CaretValueFormat; @@ -122,7 +122,7 @@ OTV_LIMIT_CHECK( 2 ); /* DeviceTable */ - otv_Device_validate( table + FT_NEXT_USHORT( p ), valid ); + otv_Device_validate( table + FT_NEXT_USHORT( p ), otvalid ); break; default: @@ -141,7 +141,7 @@ /*************************************************************************/ /*************************************************************************/ - /* sets valid->glyph_count */ + /* sets otvalid->glyph_count */ FT_LOCAL_DEF( void ) otv_GDEF_validate( FT_Bytes table, @@ -150,8 +150,8 @@ FT_UInt glyph_count, FT_Validator ftvalid ) { - OTV_ValidatorRec validrec; - OTV_Validator valid = &validrec; + OTV_ValidatorRec otvalidrec; + OTV_Validator otvalid = &otvalidrec; FT_Bytes p = table; FT_UInt table_size; FT_Bool need_MarkAttachClassDef; @@ -162,7 +162,7 @@ OTV_OPTIONAL_TABLE( MarkAttachClassDef ); - valid->root = ftvalid; + otvalid->root = ftvalid; FT_TRACE3(( "validating GDEF table\n" )); OTV_INIT; @@ -186,19 +186,19 @@ else table_size = 10; /* OpenType < 1.2 */ - valid->glyph_count = glyph_count; + otvalid->glyph_count = glyph_count; OTV_OPTIONAL_OFFSET( GlyphClassDef ); OTV_SIZE_CHECK( GlyphClassDef ); if ( GlyphClassDef ) - otv_ClassDef_validate( table + GlyphClassDef, valid ); + otv_ClassDef_validate( table + GlyphClassDef, otvalid ); OTV_OPTIONAL_OFFSET( AttachListOffset ); OTV_SIZE_CHECK( AttachListOffset ); if ( AttachListOffset ) { OTV_NEST2( AttachList, AttachPoint ); - OTV_RUN( table + AttachListOffset, valid ); + OTV_RUN( table + AttachListOffset, otvalid ); } OTV_OPTIONAL_OFFSET( LigCaretListOffset ); @@ -206,7 +206,7 @@ if ( LigCaretListOffset ) { OTV_NEST3( LigCaretList, LigGlyph, CaretValue ); - OTV_RUN( table + LigCaretListOffset, valid ); + OTV_RUN( table + LigCaretListOffset, otvalid ); } if ( need_MarkAttachClassDef ) @@ -214,7 +214,7 @@ OTV_OPTIONAL_OFFSET( MarkAttachClassDef ); OTV_SIZE_CHECK( MarkAttachClassDef ); if ( MarkAttachClassDef ) - otv_ClassDef_validate( table + MarkAttachClassDef, valid ); + otv_ClassDef_validate( table + MarkAttachClassDef, otvalid ); } FT_TRACE4(( "\n" )); diff --git a/src/otvalid/otvgpos.c b/src/otvalid/otvgpos.c index 49b4618..1a9dbaa 100644 --- a/src/otvalid/otvgpos.c +++ b/src/otvalid/otvgpos.c @@ -57,7 +57,7 @@ static void otv_x_sxy( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt Count, count1, table_size; @@ -71,26 +71,26 @@ OTV_TRACE(( " (Count = %d)\n", Count )); - OTV_LIMIT_CHECK( Count * valid->extra1 * 2 ); + OTV_LIMIT_CHECK( Count * otvalid->extra1 * 2 ); - table_size = Count * valid->extra1 * 2 + 2; + table_size = Count * otvalid->extra1 * 2 + 2; for ( ; Count > 0; Count-- ) - for ( count1 = valid->extra1; count1 > 0; count1-- ) + for ( count1 = otvalid->extra1; count1 > 0; count1-- ) { OTV_OPTIONAL_TABLE( anchor_offset ); OTV_OPTIONAL_OFFSET( anchor_offset ); - if ( valid->extra2 ) + if ( otvalid->extra2 ) { OTV_SIZE_CHECK( anchor_offset ); if ( anchor_offset ) - otv_Anchor_validate( table + anchor_offset, valid ); + otv_Anchor_validate( table + anchor_offset, otvalid ); } else - otv_Anchor_validate( table + anchor_offset, valid ); + otv_Anchor_validate( table + anchor_offset, otvalid ); } OTV_EXIT; @@ -101,11 +101,11 @@ #define MarkLigPosFormat1Func otv_u_O_O_u_O_O #define MarkMarkPosFormat1Func otv_u_O_O_u_O_O - /* sets valid->extra1 (class count) */ + /* sets otvalid->extra1 (class count) */ static void otv_u_O_O_u_O_O( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt Coverage1, Coverage2, ClassCount; @@ -124,18 +124,18 @@ Array1 = FT_NEXT_USHORT( p ); Array2 = FT_NEXT_USHORT( p ); - otv_Coverage_validate( table + Coverage1, valid, -1 ); - otv_Coverage_validate( table + Coverage2, valid, -1 ); + otv_Coverage_validate( table + Coverage1, otvalid, -1 ); + otv_Coverage_validate( table + Coverage2, otvalid, -1 ); - otv_MarkArray_validate( table + Array1, valid ); + otv_MarkArray_validate( table + Array1, otvalid ); - valid->nesting_level++; - func = valid->func[valid->nesting_level]; - valid->extra1 = ClassCount; + otvalid->nesting_level++; + func = otvalid->func[otvalid->nesting_level]; + otvalid->extra1 = ClassCount; - func( table + Array2, valid ); + func( table + Array2, otvalid ); - valid->nesting_level--; + otvalid->nesting_level--; OTV_EXIT; } @@ -163,12 +163,12 @@ } - /* uses valid->extra3 (pointer to base table) */ + /* uses otvalid->extra3 (pointer to base table) */ static void otv_ValueRecord_validate( FT_Bytes table, FT_UInt format, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt count; @@ -222,11 +222,11 @@ /* ValueRecord is part of an array -- getting the correct table */ /* size is probably not worth the trouble */ - table_size = p - valid->extra3; + table_size = p - otvalid->extra3; OTV_SIZE_CHECK( device ); if ( device ) - otv_Device_validate( valid->extra3 + device, valid ); + otv_Device_validate( otvalid->extra3 + device, otvalid ); } format >>= 1; } @@ -245,7 +245,7 @@ static void otv_Anchor_validate( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt AnchorFormat; @@ -285,11 +285,11 @@ OTV_SIZE_CHECK( XDeviceTable ); if ( XDeviceTable ) - otv_Device_validate( table + XDeviceTable, valid ); + otv_Device_validate( table + XDeviceTable, otvalid ); OTV_SIZE_CHECK( YDeviceTable ); if ( YDeviceTable ) - otv_Device_validate( table + YDeviceTable, valid ); + otv_Device_validate( table + YDeviceTable, otvalid ); } break; @@ -311,7 +311,7 @@ static void otv_MarkArray_validate( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt MarkCount; @@ -331,7 +331,7 @@ { p += 2; /* skip Class */ /* MarkAnchor */ - otv_Anchor_validate( table + FT_NEXT_USHORT( p ), valid ); + otv_Anchor_validate( table + FT_NEXT_USHORT( p ), otvalid ); } OTV_EXIT; @@ -346,11 +346,11 @@ /*************************************************************************/ /*************************************************************************/ - /* sets valid->extra3 (pointer to base table) */ + /* sets otvalid->extra3 (pointer to base table) */ static void otv_SinglePos_validate( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt PosFormat; @@ -363,7 +363,7 @@ OTV_TRACE(( " (format %d)\n", PosFormat )); - valid->extra3 = table; + otvalid->extra3 = table; switch ( PosFormat ) { @@ -376,8 +376,8 @@ Coverage = FT_NEXT_USHORT( p ); ValueFormat = FT_NEXT_USHORT( p ); - otv_Coverage_validate( table + Coverage, valid, -1 ); - otv_ValueRecord_validate( p, ValueFormat, valid ); /* Value */ + otv_Coverage_validate( table + Coverage, otvalid, -1 ); + otv_ValueRecord_validate( p, ValueFormat, otvalid ); /* Value */ } break; @@ -395,14 +395,14 @@ len_value = otv_value_length( ValueFormat ); - otv_Coverage_validate( table + Coverage, valid, ValueCount ); + otv_Coverage_validate( table + Coverage, otvalid, ValueCount ); OTV_LIMIT_CHECK( ValueCount * len_value ); /* Value */ for ( ; ValueCount > 0; ValueCount-- ) { - otv_ValueRecord_validate( p, ValueFormat, valid ); + otv_ValueRecord_validate( p, ValueFormat, otvalid ); p += len_value; } } @@ -428,7 +428,7 @@ otv_PairSet_validate( FT_Bytes table, FT_UInt format1, FT_UInt format2, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt value_len1, value_len2, PairValueCount; @@ -452,11 +452,11 @@ p += 2; /* skip SecondGlyph */ if ( format1 ) - otv_ValueRecord_validate( p, format1, valid ); /* Value1 */ + otv_ValueRecord_validate( p, format1, otvalid ); /* Value1 */ p += value_len1; if ( format2 ) - otv_ValueRecord_validate( p, format2, valid ); /* Value2 */ + otv_ValueRecord_validate( p, format2, otvalid ); /* Value2 */ p += value_len2; } @@ -464,11 +464,11 @@ } - /* sets valid->extra3 (pointer to base table) */ + /* sets otvalid->extra3 (pointer to base table) */ static void otv_PairPos_validate( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt PosFormat; @@ -481,7 +481,7 @@ OTV_TRACE(( " (format %d)\n", PosFormat )); - valid->extra3 = table; + otvalid->extra3 = table; switch ( PosFormat ) { @@ -498,14 +498,14 @@ OTV_TRACE(( " (PairSetCount = %d)\n", PairSetCount )); - otv_Coverage_validate( table + Coverage, valid, -1 ); + otv_Coverage_validate( table + Coverage, otvalid, -1 ); OTV_LIMIT_CHECK( PairSetCount * 2 ); /* PairSetOffset */ for ( ; PairSetCount > 0; PairSetCount-- ) otv_PairSet_validate( table + FT_NEXT_USHORT( p ), - ValueFormat1, ValueFormat2, valid ); + ValueFormat1, ValueFormat2, otvalid ); } break; @@ -530,9 +530,9 @@ len_value1 = otv_value_length( ValueFormat1 ); len_value2 = otv_value_length( ValueFormat2 ); - otv_Coverage_validate( table + Coverage, valid, -1 ); - otv_ClassDef_validate( table + ClassDef1, valid ); - otv_ClassDef_validate( table + ClassDef2, valid ); + otv_Coverage_validate( table + Coverage, otvalid, -1 ); + otv_ClassDef_validate( table + ClassDef1, otvalid ); + otv_ClassDef_validate( table + ClassDef2, otvalid ); OTV_LIMIT_CHECK( ClassCount1 * ClassCount2 * ( len_value1 + len_value2 ) ); @@ -545,12 +545,12 @@ { if ( ValueFormat1 ) /* Value1 */ - otv_ValueRecord_validate( p, ValueFormat1, valid ); + otv_ValueRecord_validate( p, ValueFormat1, otvalid ); p += len_value1; if ( ValueFormat2 ) /* Value2 */ - otv_ValueRecord_validate( p, ValueFormat2, valid ); + otv_ValueRecord_validate( p, ValueFormat2, otvalid ); p += len_value2; } } @@ -575,7 +575,7 @@ static void otv_CursivePos_validate( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt PosFormat; @@ -605,7 +605,7 @@ OTV_TRACE(( " (EntryExitCount = %d)\n", EntryExitCount )); - otv_Coverage_validate( table + Coverage, valid, EntryExitCount ); + otv_Coverage_validate( table + Coverage, otvalid, EntryExitCount ); OTV_LIMIT_CHECK( EntryExitCount * 4 ); @@ -619,11 +619,11 @@ OTV_SIZE_CHECK( EntryAnchor ); if ( EntryAnchor ) - otv_Anchor_validate( table + EntryAnchor, valid ); + otv_Anchor_validate( table + EntryAnchor, otvalid ); OTV_SIZE_CHECK( ExitAnchor ); if ( ExitAnchor ) - otv_Anchor_validate( table + ExitAnchor, valid ); + otv_Anchor_validate( table + ExitAnchor, otvalid ); } } break; @@ -647,11 +647,11 @@ /* UNDOCUMENTED (in OpenType 1.5): */ /* BaseRecord tables can contain NULL pointers. */ - /* sets valid->extra2 (1) */ + /* sets otvalid->extra2 (1) */ static void otv_MarkBasePos_validate( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt PosFormat; @@ -667,9 +667,9 @@ switch ( PosFormat ) { case 1: - valid->extra2 = 1; + otvalid->extra2 = 1; OTV_NEST2( MarkBasePosFormat1, BaseArray ); - OTV_RUN( table, valid ); + OTV_RUN( table, otvalid ); break; default: @@ -688,11 +688,11 @@ /*************************************************************************/ /*************************************************************************/ - /* sets valid->extra2 (1) */ + /* sets otvalid->extra2 (1) */ static void otv_MarkLigPos_validate( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt PosFormat; @@ -708,9 +708,9 @@ switch ( PosFormat ) { case 1: - valid->extra2 = 1; + otvalid->extra2 = 1; OTV_NEST3( MarkLigPosFormat1, LigatureArray, LigatureAttach ); - OTV_RUN( table, valid ); + OTV_RUN( table, otvalid ); break; default: @@ -729,11 +729,11 @@ /*************************************************************************/ /*************************************************************************/ - /* sets valid->extra2 (0) */ + /* sets otvalid->extra2 (0) */ static void otv_MarkMarkPos_validate( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt PosFormat; @@ -749,9 +749,9 @@ switch ( PosFormat ) { case 1: - valid->extra2 = 0; + otvalid->extra2 = 0; OTV_NEST2( MarkMarkPosFormat1, Mark2Array ); - OTV_RUN( table, valid ); + OTV_RUN( table, otvalid ); break; default: @@ -770,11 +770,11 @@ /*************************************************************************/ /*************************************************************************/ - /* sets valid->extra1 (lookup count) */ + /* sets otvalid->extra1 (lookup count) */ static void otv_ContextPos_validate( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt PosFormat; @@ -794,9 +794,9 @@ /* context rules since even invalid glyph indices/classes return */ /* meaningful results */ - valid->extra1 = valid->lookup_count; + otvalid->extra1 = otvalid->lookup_count; OTV_NEST3( ContextPosFormat1, PosRuleSet, PosRule ); - OTV_RUN( table, valid ); + OTV_RUN( table, otvalid ); break; case 2: @@ -805,12 +805,12 @@ /* meaningful results */ OTV_NEST3( ContextPosFormat2, PosClassSet, PosClassRule ); - OTV_RUN( table, valid ); + OTV_RUN( table, otvalid ); break; case 3: OTV_NEST1( ContextPosFormat3 ); - OTV_RUN( table, valid ); + OTV_RUN( table, otvalid ); break; default: @@ -829,11 +829,11 @@ /*************************************************************************/ /*************************************************************************/ - /* sets valid->extra1 (lookup count) */ + /* sets otvalid->extra1 (lookup count) */ static void otv_ChainContextPos_validate( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt PosFormat; @@ -853,10 +853,10 @@ /* context rules since even invalid glyph indices/classes return */ /* meaningful results */ - valid->extra1 = valid->lookup_count; + otvalid->extra1 = otvalid->lookup_count; OTV_NEST3( ChainContextPosFormat1, ChainPosRuleSet, ChainPosRule ); - OTV_RUN( table, valid ); + OTV_RUN( table, otvalid ); break; case 2: @@ -866,12 +866,12 @@ OTV_NEST3( ChainContextPosFormat2, ChainPosClassSet, ChainPosClassRule ); - OTV_RUN( table, valid ); + OTV_RUN( table, otvalid ); break; case 3: OTV_NEST1( ChainContextPosFormat3 ); - OTV_RUN( table, valid ); + OTV_RUN( table, otvalid ); break; default: @@ -890,11 +890,11 @@ /*************************************************************************/ /*************************************************************************/ - /* uses valid->type_funcs */ + /* uses otvalid->type_funcs */ static void otv_ExtensionPos_validate( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt PosFormat; @@ -923,8 +923,8 @@ if ( ExtensionLookupType == 0 || ExtensionLookupType >= 9 ) FT_INVALID_DATA; - validate = valid->type_funcs[ExtensionLookupType - 1]; - validate( table + ExtensionOffset, valid ); + validate = otvalid->type_funcs[ExtensionLookupType - 1]; + validate( table + ExtensionOffset, otvalid ); } break; @@ -950,17 +950,17 @@ }; - /* sets valid->type_count */ - /* sets valid->type_funcs */ + /* sets otvalid->type_count */ + /* sets otvalid->type_funcs */ FT_LOCAL_DEF( void ) otv_GPOS_subtable_validate( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { - valid->type_count = 9; - valid->type_funcs = (OTV_Validate_Func*)otv_gpos_validate_funcs; + otvalid->type_count = 9; + otvalid->type_funcs = (OTV_Validate_Func*)otv_gpos_validate_funcs; - otv_Lookup_validate( table, valid ); + otv_Lookup_validate( table, otvalid ); } @@ -972,7 +972,7 @@ /*************************************************************************/ /*************************************************************************/ - /* sets valid->glyph_count */ + /* sets otvalid->glyph_count */ FT_LOCAL_DEF( void ) otv_GPOS_validate( FT_Bytes table, @@ -980,12 +980,12 @@ FT_Validator ftvalid ) { OTV_ValidatorRec validrec; - OTV_Validator valid = &validrec; + OTV_Validator otvalid = &validrec; FT_Bytes p = table; FT_UInt ScriptList, FeatureList, LookupList; - valid->root = ftvalid; + otvalid->root = ftvalid; FT_TRACE3(( "validating GPOS table\n" )); OTV_INIT; @@ -999,16 +999,16 @@ FeatureList = FT_NEXT_USHORT( p ); LookupList = FT_NEXT_USHORT( p ); - valid->type_count = 9; - valid->type_funcs = (OTV_Validate_Func*)otv_gpos_validate_funcs; - valid->glyph_count = glyph_count; + otvalid->type_count = 9; + otvalid->type_funcs = (OTV_Validate_Func*)otv_gpos_validate_funcs; + otvalid->glyph_count = glyph_count; otv_LookupList_validate( table + LookupList, - valid ); + otvalid ); otv_FeatureList_validate( table + FeatureList, table + LookupList, - valid ); + otvalid ); otv_ScriptList_validate( table + ScriptList, table + FeatureList, - valid ); + otvalid ); FT_TRACE4(( "\n" )); } diff --git a/src/otvalid/otvgsub.c b/src/otvalid/otvgsub.c index ed499d1..024b8ca 100644 --- a/src/otvalid/otvgsub.c +++ b/src/otvalid/otvgsub.c @@ -38,11 +38,11 @@ /*************************************************************************/ /*************************************************************************/ - /* uses valid->glyph_count */ + /* uses otvalid->glyph_count */ static void otv_SingleSubst_validate( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt SubstFormat; @@ -68,14 +68,14 @@ Coverage = table + FT_NEXT_USHORT( p ); DeltaGlyphID = FT_NEXT_SHORT( p ); - otv_Coverage_validate( Coverage, valid, -1 ); + otv_Coverage_validate( Coverage, otvalid, -1 ); idx = otv_Coverage_get_first( Coverage ) + DeltaGlyphID; if ( idx < 0 ) FT_INVALID_DATA; idx = otv_Coverage_get_last( Coverage ) + DeltaGlyphID; - if ( (FT_UInt)idx >= valid->glyph_count ) + if ( (FT_UInt)idx >= otvalid->glyph_count ) FT_INVALID_DATA; } break; @@ -91,13 +91,13 @@ OTV_TRACE(( " (GlyphCount = %d)\n", GlyphCount )); - otv_Coverage_validate( table + Coverage, valid, GlyphCount ); + otv_Coverage_validate( table + Coverage, otvalid, GlyphCount ); OTV_LIMIT_CHECK( GlyphCount * 2 ); /* Substitute */ for ( ; GlyphCount > 0; GlyphCount-- ) - if ( FT_NEXT_USHORT( p ) >= valid->glyph_count ) + if ( FT_NEXT_USHORT( p ) >= otvalid->glyph_count ) FT_INVALID_GLYPH_ID; } break; @@ -118,11 +118,11 @@ /*************************************************************************/ /*************************************************************************/ - /* sets valid->extra1 (glyph count) */ + /* sets otvalid->extra1 (glyph count) */ static void otv_MultipleSubst_validate( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt SubstFormat; @@ -138,9 +138,9 @@ switch ( SubstFormat ) { case 1: - valid->extra1 = valid->glyph_count; + otvalid->extra1 = otvalid->glyph_count; OTV_NEST2( MultipleSubstFormat1, Sequence ); - OTV_RUN( table, valid ); + OTV_RUN( table, otvalid ); break; default: @@ -159,11 +159,11 @@ /*************************************************************************/ /*************************************************************************/ - /* sets valid->extra1 (glyph count) */ + /* sets otvalid->extra1 (glyph count) */ static void otv_AlternateSubst_validate( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt SubstFormat; @@ -179,9 +179,9 @@ switch ( SubstFormat ) { case 1: - valid->extra1 = valid->glyph_count; + otvalid->extra1 = otvalid->glyph_count; OTV_NEST2( AlternateSubstFormat1, AlternateSet ); - OTV_RUN( table, valid ); + OTV_RUN( table, otvalid ); break; default: @@ -202,11 +202,11 @@ #define LigatureFunc otv_Ligature_validate - /* uses valid->glyph_count */ + /* uses otvalid->glyph_count */ static void otv_Ligature_validate( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt LigatureGlyph, CompCount; @@ -216,7 +216,7 @@ OTV_LIMIT_CHECK( 4 ); LigatureGlyph = FT_NEXT_USHORT( p ); - if ( LigatureGlyph >= valid->glyph_count ) + if ( LigatureGlyph >= otvalid->glyph_count ) FT_INVALID_DATA; CompCount = FT_NEXT_USHORT( p ); @@ -238,7 +238,7 @@ static void otv_LigatureSubst_validate( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt SubstFormat; @@ -255,7 +255,7 @@ { case 1: OTV_NEST3( LigatureSubstFormat1, LigatureSet, Ligature ); - OTV_RUN( table, valid ); + OTV_RUN( table, otvalid ); break; default: @@ -274,11 +274,11 @@ /*************************************************************************/ /*************************************************************************/ - /* sets valid->extra1 (lookup count) */ + /* sets otvalid->extra1 (lookup count) */ static void otv_ContextSubst_validate( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt SubstFormat; @@ -298,9 +298,9 @@ /* context rules since even invalid glyph indices/classes return */ /* meaningful results */ - valid->extra1 = valid->lookup_count; + otvalid->extra1 = otvalid->lookup_count; OTV_NEST3( ContextSubstFormat1, SubRuleSet, SubRule ); - OTV_RUN( table, valid ); + OTV_RUN( table, otvalid ); break; case 2: @@ -309,12 +309,12 @@ /* meaningful results */ OTV_NEST3( ContextSubstFormat2, SubClassSet, SubClassRule ); - OTV_RUN( table, valid ); + OTV_RUN( table, otvalid ); break; case 3: OTV_NEST1( ContextSubstFormat3 ); - OTV_RUN( table, valid ); + OTV_RUN( table, otvalid ); break; default: @@ -333,11 +333,11 @@ /*************************************************************************/ /*************************************************************************/ - /* sets valid->extra1 (lookup count) */ + /* sets otvalid->extra1 (lookup count) */ static void otv_ChainContextSubst_validate( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt SubstFormat; @@ -357,10 +357,10 @@ /* context rules since even invalid glyph indices/classes return */ /* meaningful results */ - valid->extra1 = valid->lookup_count; + otvalid->extra1 = otvalid->lookup_count; OTV_NEST3( ChainContextSubstFormat1, ChainSubRuleSet, ChainSubRule ); - OTV_RUN( table, valid ); + OTV_RUN( table, otvalid ); break; case 2: @@ -370,12 +370,12 @@ OTV_NEST3( ChainContextSubstFormat2, ChainSubClassSet, ChainSubClassRule ); - OTV_RUN( table, valid ); + OTV_RUN( table, otvalid ); break; case 3: OTV_NEST1( ChainContextSubstFormat3 ); - OTV_RUN( table, valid ); + OTV_RUN( table, otvalid ); break; default: @@ -394,11 +394,11 @@ /*************************************************************************/ /*************************************************************************/ - /* uses valid->type_funcs */ + /* uses otvalid->type_funcs */ static void otv_ExtensionSubst_validate( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt SubstFormat; @@ -429,8 +429,8 @@ ExtensionLookupType > 8 ) FT_INVALID_DATA; - validate = valid->type_funcs[ExtensionLookupType - 1]; - validate( table + ExtensionOffset, valid ); + validate = otvalid->type_funcs[ExtensionLookupType - 1]; + validate( table + ExtensionOffset, otvalid ); } break; @@ -450,11 +450,11 @@ /*************************************************************************/ /*************************************************************************/ - /* uses valid->glyph_count */ + /* uses otvalid->glyph_count */ static void otv_ReverseChainSingleSubst_validate( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table, Coverage; FT_UInt SubstFormat; @@ -477,12 +477,12 @@ OTV_TRACE(( " (BacktrackGlyphCount = %d)\n", BacktrackGlyphCount )); - otv_Coverage_validate( Coverage, valid, -1 ); + otv_Coverage_validate( Coverage, otvalid, -1 ); OTV_LIMIT_CHECK( BacktrackGlyphCount * 2 + 2 ); for ( ; BacktrackGlyphCount > 0; BacktrackGlyphCount-- ) - otv_Coverage_validate( table + FT_NEXT_USHORT( p ), valid, -1 ); + otv_Coverage_validate( table + FT_NEXT_USHORT( p ), otvalid, -1 ); LookaheadGlyphCount = FT_NEXT_USHORT( p ); @@ -491,7 +491,7 @@ OTV_LIMIT_CHECK( LookaheadGlyphCount * 2 + 2 ); for ( ; LookaheadGlyphCount > 0; LookaheadGlyphCount-- ) - otv_Coverage_validate( table + FT_NEXT_USHORT( p ), valid, -1 ); + otv_Coverage_validate( table + FT_NEXT_USHORT( p ), otvalid, -1 ); GlyphCount = FT_NEXT_USHORT( p ); @@ -504,7 +504,7 @@ /* Substitute */ for ( ; GlyphCount > 0; GlyphCount-- ) - if ( FT_NEXT_USHORT( p ) >= valid->glyph_count ) + if ( FT_NEXT_USHORT( p ) >= otvalid->glyph_count ) FT_INVALID_DATA; break; @@ -538,22 +538,22 @@ /*************************************************************************/ /*************************************************************************/ - /* sets valid->type_count */ - /* sets valid->type_funcs */ - /* sets valid->glyph_count */ + /* sets otvalid->type_count */ + /* sets otvalid->type_funcs */ + /* sets otvalid->glyph_count */ FT_LOCAL_DEF( void ) otv_GSUB_validate( FT_Bytes table, FT_UInt glyph_count, FT_Validator ftvalid ) { - OTV_ValidatorRec validrec; - OTV_Validator valid = &validrec; - FT_Bytes p = table; + OTV_ValidatorRec otvalidrec; + OTV_Validator otvalid = &otvalidrec; + FT_Bytes p = table; FT_UInt ScriptList, FeatureList, LookupList; - valid->root = ftvalid; + otvalid->root = ftvalid; FT_TRACE3(( "validating GSUB table\n" )); OTV_INIT; @@ -567,16 +567,16 @@ FeatureList = FT_NEXT_USHORT( p ); LookupList = FT_NEXT_USHORT( p ); - valid->type_count = 8; - valid->type_funcs = (OTV_Validate_Func*)otv_gsub_validate_funcs; - valid->glyph_count = glyph_count; + otvalid->type_count = 8; + otvalid->type_funcs = (OTV_Validate_Func*)otv_gsub_validate_funcs; + otvalid->glyph_count = glyph_count; otv_LookupList_validate( table + LookupList, - valid ); + otvalid ); otv_FeatureList_validate( table + FeatureList, table + LookupList, - valid ); + otvalid ); otv_ScriptList_validate( table + ScriptList, table + FeatureList, - valid ); + otvalid ); FT_TRACE4(( "\n" )); } diff --git a/src/otvalid/otvjstf.c b/src/otvalid/otvjstf.c index a616a23..f273be8 100644 --- a/src/otvalid/otvjstf.c +++ b/src/otvalid/otvjstf.c @@ -34,13 +34,13 @@ #define JstfPriorityFunc otv_JstfPriority_validate #define JstfLookupFunc otv_GPOS_subtable_validate - /* uses valid->extra1 (GSUB lookup count) */ - /* uses valid->extra2 (GPOS lookup count) */ - /* sets valid->extra1 (counter) */ + /* uses otvalid->extra1 (GSUB lookup count) */ + /* uses otvalid->extra2 (GPOS lookup count) */ + /* sets otvalid->extra1 (counter) */ static void otv_JstfPriority_validate( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt table_size; @@ -63,34 +63,34 @@ OTV_LIMIT_CHECK( 20 ); - gsub_lookup_count = valid->extra1; - gpos_lookup_count = valid->extra2; + gsub_lookup_count = otvalid->extra1; + gpos_lookup_count = otvalid->extra2; table_size = 20; - valid->extra1 = gsub_lookup_count; + otvalid->extra1 = gsub_lookup_count; OTV_OPTIONAL_OFFSET( ShrinkageEnableGSUB ); OTV_SIZE_CHECK( ShrinkageEnableGSUB ); if ( ShrinkageEnableGSUB ) - otv_x_ux( table + ShrinkageEnableGSUB, valid ); + otv_x_ux( table + ShrinkageEnableGSUB, otvalid ); OTV_OPTIONAL_OFFSET( ShrinkageDisableGSUB ); OTV_SIZE_CHECK( ShrinkageDisableGSUB ); if ( ShrinkageDisableGSUB ) - otv_x_ux( table + ShrinkageDisableGSUB, valid ); + otv_x_ux( table + ShrinkageDisableGSUB, otvalid ); - valid->extra1 = gpos_lookup_count; + otvalid->extra1 = gpos_lookup_count; OTV_OPTIONAL_OFFSET( ShrinkageEnableGPOS ); OTV_SIZE_CHECK( ShrinkageEnableGPOS ); if ( ShrinkageEnableGPOS ) - otv_x_ux( table + ShrinkageEnableGPOS, valid ); + otv_x_ux( table + ShrinkageEnableGPOS, otvalid ); OTV_OPTIONAL_OFFSET( ShrinkageDisableGPOS ); OTV_SIZE_CHECK( ShrinkageDisableGPOS ); if ( ShrinkageDisableGPOS ) - otv_x_ux( table + ShrinkageDisableGPOS, valid ); + otv_x_ux( table + ShrinkageDisableGPOS, otvalid ); OTV_OPTIONAL_OFFSET( ShrinkageJstfMax ); OTV_SIZE_CHECK( ShrinkageJstfMax ); @@ -98,32 +98,32 @@ { /* XXX: check lookup types? */ OTV_NEST2( JstfMax, JstfLookup ); - OTV_RUN( table + ShrinkageJstfMax, valid ); + OTV_RUN( table + ShrinkageJstfMax, otvalid ); } - valid->extra1 = gsub_lookup_count; + otvalid->extra1 = gsub_lookup_count; OTV_OPTIONAL_OFFSET( ExtensionEnableGSUB ); OTV_SIZE_CHECK( ExtensionEnableGSUB ); if ( ExtensionEnableGSUB ) - otv_x_ux( table + ExtensionEnableGSUB, valid ); + otv_x_ux( table + ExtensionEnableGSUB, otvalid ); OTV_OPTIONAL_OFFSET( ExtensionDisableGSUB ); OTV_SIZE_CHECK( ExtensionDisableGSUB ); if ( ExtensionDisableGSUB ) - otv_x_ux( table + ExtensionDisableGSUB, valid ); + otv_x_ux( table + ExtensionDisableGSUB, otvalid ); - valid->extra1 = gpos_lookup_count; + otvalid->extra1 = gpos_lookup_count; OTV_OPTIONAL_OFFSET( ExtensionEnableGPOS ); OTV_SIZE_CHECK( ExtensionEnableGPOS ); if ( ExtensionEnableGPOS ) - otv_x_ux( table + ExtensionEnableGPOS, valid ); + otv_x_ux( table + ExtensionEnableGPOS, otvalid ); OTV_OPTIONAL_OFFSET( ExtensionDisableGPOS ); OTV_SIZE_CHECK( ExtensionDisableGPOS ); if ( ExtensionDisableGPOS ) - otv_x_ux( table + ExtensionDisableGPOS, valid ); + otv_x_ux( table + ExtensionDisableGPOS, otvalid ); OTV_OPTIONAL_OFFSET( ExtensionJstfMax ); OTV_SIZE_CHECK( ExtensionJstfMax ); @@ -131,22 +131,22 @@ { /* XXX: check lookup types? */ OTV_NEST2( JstfMax, JstfLookup ); - OTV_RUN( table + ExtensionJstfMax, valid ); + OTV_RUN( table + ExtensionJstfMax, otvalid ); } - valid->extra1 = gsub_lookup_count; - valid->extra2 = gpos_lookup_count; + otvalid->extra1 = gsub_lookup_count; + otvalid->extra2 = gpos_lookup_count; OTV_EXIT; } - /* sets valid->extra (glyph count) */ - /* sets valid->func1 (otv_JstfPriority_validate) */ + /* sets otvalid->extra (glyph count) */ + /* sets otvalid->func1 (otv_JstfPriority_validate) */ static void otv_JstfScript_validate( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt table_size; @@ -170,16 +170,16 @@ OTV_SIZE_CHECK( ExtGlyph ); if ( ExtGlyph ) { - valid->extra1 = valid->glyph_count; + otvalid->extra1 = otvalid->glyph_count; OTV_NEST1( ExtenderGlyph ); - OTV_RUN( table + ExtGlyph, valid ); + OTV_RUN( table + ExtGlyph, otvalid ); } OTV_SIZE_CHECK( DefJstfLangSys ); if ( DefJstfLangSys ) { OTV_NEST2( JstfLangSys, JstfPriority ); - OTV_RUN( table + DefJstfLangSys, valid ); + OTV_RUN( table + DefJstfLangSys, otvalid ); } OTV_LIMIT_CHECK( 6 * JstfLangSysCount ); @@ -190,16 +190,16 @@ { p += 4; /* skip JstfLangSysTag */ - OTV_RUN( table + FT_NEXT_USHORT( p ), valid ); + OTV_RUN( table + FT_NEXT_USHORT( p ), otvalid ); } OTV_EXIT; } - /* sets valid->extra1 (GSUB lookup count) */ - /* sets valid->extra2 (GPOS lookup count) */ - /* sets valid->glyph_count */ + /* sets otvalid->extra1 (GSUB lookup count) */ + /* sets otvalid->extra2 (GPOS lookup count) */ + /* sets otvalid->glyph_count */ FT_LOCAL_DEF( void ) otv_JSTF_validate( FT_Bytes table, @@ -208,13 +208,14 @@ FT_UInt glyph_count, FT_Validator ftvalid ) { - OTV_ValidatorRec validrec; - OTV_Validator valid = &validrec; + OTV_ValidatorRec otvalidrec; + OTV_Validator otvalid = &otvalidrec; FT_Bytes p = table; FT_UInt JstfScriptCount; - valid->root = ftvalid; + otvalid->root = ftvalid; + FT_TRACE3(( "validating JSTF table\n" )); OTV_INIT; @@ -231,16 +232,16 @@ OTV_LIMIT_CHECK( JstfScriptCount * 6 ); if ( gsub ) - valid->extra1 = otv_GSUBGPOS_get_Lookup_count( gsub ); + otvalid->extra1 = otv_GSUBGPOS_get_Lookup_count( gsub ); else - valid->extra1 = 0; + otvalid->extra1 = 0; if ( gpos ) - valid->extra2 = otv_GSUBGPOS_get_Lookup_count( gpos ); + otvalid->extra2 = otv_GSUBGPOS_get_Lookup_count( gpos ); else - valid->extra2 = 0; + otvalid->extra2 = 0; - valid->glyph_count = glyph_count; + otvalid->glyph_count = glyph_count; /* JstfScriptRecord */ for ( ; JstfScriptCount > 0; JstfScriptCount-- ) @@ -248,7 +249,7 @@ p += 4; /* skip JstfScriptTag */ /* JstfScript */ - otv_JstfScript_validate( table + FT_NEXT_USHORT( p ), valid ); + otv_JstfScript_validate( table + FT_NEXT_USHORT( p ), otvalid ); } FT_TRACE4(( "\n" )); diff --git a/src/otvalid/otvmath.c b/src/otvalid/otvmath.c index 96f841f..d1791f8 100644 --- a/src/otvalid/otvmath.c +++ b/src/otvalid/otvmath.c @@ -44,7 +44,7 @@ static void otv_MathConstants_validate( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt i; @@ -66,7 +66,7 @@ OTV_OPTIONAL_OFFSET( DeviceTableOffset ); OTV_SIZE_CHECK( DeviceTableOffset ); if ( DeviceTableOffset ) - otv_Device_validate( table + DeviceTableOffset, valid ); + otv_Device_validate( table + DeviceTableOffset, otvalid ); } OTV_EXIT; @@ -84,7 +84,7 @@ static void otv_MathItalicsCorrectionInfo_validate( FT_Bytes table, - OTV_Validator valid, + OTV_Validator otvalid, FT_Int isItalic ) { FT_Bytes p = table; @@ -108,7 +108,7 @@ table_size = 4 + 4 * cnt; OTV_SIZE_CHECK( Coverage ); - otv_Coverage_validate( table + Coverage, valid, cnt ); + otv_Coverage_validate( table + Coverage, otvalid, cnt ); for ( i = 0; i < cnt; ++i ) { @@ -116,7 +116,7 @@ OTV_OPTIONAL_OFFSET( DeviceTableOffset ); OTV_SIZE_CHECK( DeviceTableOffset ); if ( DeviceTableOffset ) - otv_Device_validate( table + DeviceTableOffset, valid ); + otv_Device_validate( table + DeviceTableOffset, otvalid ); } OTV_EXIT; @@ -133,7 +133,7 @@ static void otv_MathKern_validate( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt i, cnt, table_size; @@ -157,7 +157,7 @@ OTV_OPTIONAL_OFFSET( DeviceTableOffset ); OTV_SIZE_CHECK( DeviceTableOffset ); if ( DeviceTableOffset ) - otv_Device_validate( table + DeviceTableOffset, valid ); + otv_Device_validate( table + DeviceTableOffset, otvalid ); } /* One more Kerning value */ @@ -167,7 +167,7 @@ OTV_OPTIONAL_OFFSET( DeviceTableOffset ); OTV_SIZE_CHECK( DeviceTableOffset ); if ( DeviceTableOffset ) - otv_Device_validate( table + DeviceTableOffset, valid ); + otv_Device_validate( table + DeviceTableOffset, otvalid ); } OTV_EXIT; @@ -176,7 +176,7 @@ static void otv_MathKernInfo_validate( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt i, j, cnt, table_size; @@ -196,7 +196,7 @@ table_size = 4 + 8 * cnt; OTV_SIZE_CHECK( Coverage ); - otv_Coverage_validate( table + Coverage, valid, cnt ); + otv_Coverage_validate( table + Coverage, otvalid, cnt ); for ( i = 0; i < cnt; ++i ) { @@ -205,7 +205,7 @@ OTV_OPTIONAL_OFFSET( MKRecordOffset ); OTV_SIZE_CHECK( MKRecordOffset ); if ( MKRecordOffset ) - otv_MathKern_validate( table + MKRecordOffset, valid ); + otv_MathKern_validate( table + MKRecordOffset, otvalid ); } } @@ -223,7 +223,7 @@ static void otv_MathGlyphInfo_validate( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt MathItalicsCorrectionInfo, MathTopAccentAttachment; @@ -241,22 +241,22 @@ if ( MathItalicsCorrectionInfo ) otv_MathItalicsCorrectionInfo_validate( - table + MathItalicsCorrectionInfo, valid, TRUE ); + table + MathItalicsCorrectionInfo, otvalid, TRUE ); /* Italic correction and Top Accent Attachment have the same format */ if ( MathTopAccentAttachment ) otv_MathItalicsCorrectionInfo_validate( - table + MathTopAccentAttachment, valid, FALSE ); + table + MathTopAccentAttachment, otvalid, FALSE ); if ( ExtendedShapeCoverage ) { OTV_NAME_ENTER( "ExtendedShapeCoverage" ); - otv_Coverage_validate( table + ExtendedShapeCoverage, valid, -1 ); + otv_Coverage_validate( table + ExtendedShapeCoverage, otvalid, -1 ); OTV_EXIT; } if ( MathKernInfo ) - otv_MathKernInfo_validate( table + MathKernInfo, valid ); + otv_MathKernInfo_validate( table + MathKernInfo, otvalid ); OTV_EXIT; } @@ -272,7 +272,7 @@ static void otv_GlyphAssembly_validate( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt pcnt, table_size; @@ -294,7 +294,7 @@ OTV_SIZE_CHECK( DeviceTableOffset ); if ( DeviceTableOffset ) - otv_Device_validate( table + DeviceTableOffset, valid ); + otv_Device_validate( table + DeviceTableOffset, otvalid ); for ( i = 0; i < pcnt; ++i ) { @@ -302,7 +302,7 @@ gid = FT_NEXT_USHORT( p ); - if ( gid >= valid->glyph_count ) + if ( gid >= otvalid->glyph_count ) FT_INVALID_GLYPH_ID; p += 2*4; /* skip the Start, End, Full, and Flags fields */ } @@ -313,7 +313,7 @@ static void otv_MathGlyphConstruction_validate( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt vcnt, table_size; @@ -338,14 +338,14 @@ gid = FT_NEXT_USHORT( p ); - if ( gid >= valid->glyph_count ) + if ( gid >= otvalid->glyph_count ) FT_INVALID_GLYPH_ID; p += 2; /* skip the size */ } OTV_SIZE_CHECK( GlyphAssembly ); if ( GlyphAssembly ) - otv_GlyphAssembly_validate( table+GlyphAssembly, valid ); + otv_GlyphAssembly_validate( table+GlyphAssembly, otvalid ); /* OTV_EXIT; */ } @@ -353,7 +353,7 @@ static void otv_MathVariants_validate( FT_Bytes table, - OTV_Validator valid ) + OTV_Validator otvalid ) { FT_Bytes p = table; FT_UInt vcnt, hcnt, i, table_size; @@ -378,24 +378,24 @@ OTV_SIZE_CHECK( VCoverage ); if ( VCoverage ) - otv_Coverage_validate( table + VCoverage, valid, vcnt ); + otv_Coverage_validate( table + VCoverage, otvalid, vcnt ); OTV_SIZE_CHECK( HCoverage ); if ( HCoverage ) - otv_Coverage_validate( table + HCoverage, valid, hcnt ); + otv_Coverage_validate( table + HCoverage, otvalid, hcnt ); for ( i = 0; i < vcnt; ++i ) { OTV_OPTIONAL_OFFSET( Offset ); OTV_SIZE_CHECK( Offset ); - otv_MathGlyphConstruction_validate( table + Offset, valid ); + otv_MathGlyphConstruction_validate( table + Offset, otvalid ); } for ( i = 0; i < hcnt; ++i ) { OTV_OPTIONAL_OFFSET( Offset ); OTV_SIZE_CHECK( Offset ); - otv_MathGlyphConstruction_validate( table + Offset, valid ); + otv_MathGlyphConstruction_validate( table + Offset, otvalid ); } OTV_EXIT; @@ -410,20 +410,20 @@ /*************************************************************************/ /*************************************************************************/ - /* sets valid->glyph_count */ + /* sets otvalid->glyph_count */ FT_LOCAL_DEF( void ) otv_MATH_validate( FT_Bytes table, FT_UInt glyph_count, FT_Validator ftvalid ) { - OTV_ValidatorRec validrec; - OTV_Validator valid = &validrec; - FT_Bytes p = table; + OTV_ValidatorRec otvalidrec; + OTV_Validator otvalid = &otvalidrec; + FT_Bytes p = table; FT_UInt MathConstants, MathGlyphInfo, MathVariants; - valid->root = ftvalid; + otvalid->root = ftvalid; FT_TRACE3(( "validating MATH table\n" )); OTV_INIT; @@ -437,14 +437,14 @@ MathGlyphInfo = FT_NEXT_USHORT( p ); MathVariants = FT_NEXT_USHORT( p ); - valid->glyph_count = glyph_count; + otvalid->glyph_count = glyph_count; otv_MathConstants_validate( table + MathConstants, - valid ); + otvalid ); otv_MathGlyphInfo_validate( table + MathGlyphInfo, - valid ); + otvalid ); otv_MathVariants_validate ( table + MathVariants, - valid ); + otvalid ); FT_TRACE4(( "\n" )); } diff --git a/src/otvalid/otvmod.c b/src/otvalid/otvmod.c index acf213f..37c6e86 100644 --- a/src/otvalid/otvmod.c +++ b/src/otvalid/otvmod.c @@ -4,7 +4,7 @@ /* */ /* FreeType's OpenType validation module implementation (body). */ /* */ -/* Copyright 2004, 2005, 2006, 2007, 2008 by */ +/* Copyright 2004-2008, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -49,8 +49,8 @@ error = FT_Load_Sfnt_Table( face, tag, 0, NULL, table_len ); - if ( error == OTV_Err_Table_Missing ) - return OTV_Err_Ok; + if ( FT_ERR_EQ( error, Table_Missing ) ) + return FT_Err_Ok; if ( error ) goto Exit; @@ -73,7 +73,7 @@ FT_Bytes *ot_gsub, FT_Bytes *ot_jstf ) { - FT_Error error = OTV_Err_Ok; + FT_Error error = FT_Err_Ok; FT_Byte* volatile base; FT_Byte* volatile gdef; FT_Byte* volatile gpos; diff --git a/src/pcf/README b/src/pcf/README index 8858d68..10eff15 100644 --- a/src/pcf/README +++ b/src/pcf/README @@ -33,7 +33,7 @@ Encodings Use `FT_Get_BDF_Charset_ID' to access the encoding and registry. -The driver always exports `ft_encoding_none' as face->charmap.encoding. +The driver always exports `ft_encoding_none' as face->charmap.encoding. FT_Get_Char_Index() behavior is unmodified, that is, it converts the ULong value given as argument into the corresponding glyph number. diff --git a/src/pcf/pcfdrivr.c b/src/pcf/pcfdrivr.c index ba54488..96f6912 100644 --- a/src/pcf/pcfdrivr.c +++ b/src/pcf/pcfdrivr.c @@ -2,7 +2,7 @@ FreeType font driver for pcf files - Copyright (C) 2000-2004, 2006-2011 by + Copyright (C) 2000-2004, 2006-2011, 2013, 2014 by Francesco Zappa Nardelli Permission is hereby granted, free of charge, to any person obtaining a copy @@ -83,7 +83,7 @@ THE SOFTWARE. cmap->num_encodings = (FT_UInt)face->nencodings; cmap->encodings = face->encodings; - return PCF_Err_Ok; + return FT_Err_Ok; } @@ -189,7 +189,7 @@ THE SOFTWARE. } - FT_CALLBACK_TABLE_DEF + static const FT_CMap_ClassRec pcf_cmap_class = { sizeof ( PCF_CMapRec ), @@ -218,25 +218,24 @@ THE SOFTWARE. FT_FREE( face->metrics ); /* free properties */ + if ( face->properties ) { - PCF_Property prop; - FT_Int i; + FT_Int i; - if ( face->properties ) + for ( i = 0; i < face->nprops; i++ ) { - for ( i = 0; i < face->nprops; i++ ) + PCF_Property prop = &face->properties[i]; + + + if ( prop ) { - prop = &face->properties[i]; - - if ( prop ) - { - FT_FREE( prop->name ); - if ( prop->isString ) - FT_FREE( prop->value.atom ); - } + FT_FREE( prop->name ); + if ( prop->isString ) + FT_FREE( prop->value.atom ); } } + FT_FREE( face->properties ); } @@ -264,11 +263,10 @@ THE SOFTWARE. FT_Parameter* params ) { PCF_Face face = (PCF_Face)pcfface; - FT_Error error = PCF_Err_Ok; + FT_Error error; FT_UNUSED( num_params ); FT_UNUSED( params ); - FT_UNUSED( face_index ); FT_TRACE2(( "PCF driver\n" )); @@ -289,7 +287,7 @@ THE SOFTWARE. /* this didn't work, try gzip support! */ error2 = FT_Stream_OpenGzip( &face->comp_stream, stream ); - if ( FT_ERROR_BASE( error2 ) == FT_Err_Unimplemented_Feature ) + if ( FT_ERR_EQ( error2, Unimplemented_Feature ) ) goto Fail; error = error2; @@ -304,7 +302,7 @@ THE SOFTWARE. /* this didn't work, try LZW support! */ error3 = FT_Stream_OpenLZW( &face->comp_stream, stream ); - if ( FT_ERROR_BASE( error3 ) == FT_Err_Unimplemented_Feature ) + if ( FT_ERR_EQ( error3, Unimplemented_Feature ) ) goto Fail; error = error3; @@ -319,7 +317,7 @@ THE SOFTWARE. /* this didn't work, try Bzip2 support! */ error4 = FT_Stream_OpenBzip2( &face->comp_stream, stream ); - if ( FT_ERROR_BASE( error4 ) == FT_Err_Unimplemented_Feature ) + if ( FT_ERR_EQ( error4, Unimplemented_Feature ) ) goto Fail; error = error4; @@ -347,6 +345,18 @@ THE SOFTWARE. #endif } + /* PCF could not have multiple face in single font file. + * XXX: non-zero face_index is already invalid argument, but + * Type1, Type42 driver has a convention to return + * an invalid argument error when the font could be + * opened by the specified driver. + */ + if ( face_index > 0 ) { + FT_ERROR(( "PCF_Face_Init: invalid face index\n" )); + PCF_Face_Done( pcfface ); + return FT_THROW( Invalid_Argument ); + } + /* set up charmap */ { FT_String *charset_registry = face->charset_registry; @@ -406,7 +416,7 @@ THE SOFTWARE. Fail: FT_TRACE2(( " not a PCF file\n" )); PCF_Face_Done( pcfface ); - error = PCF_Err_Unknown_File_Format; /* error */ + error = FT_THROW( Unknown_File_Format ); /* error */ goto Exit; } @@ -424,7 +434,7 @@ THE SOFTWARE. size->metrics.descender = -accel->fontDescent << 6; size->metrics.max_advance = accel->maxbounds.characterWidth << 6; - return PCF_Err_Ok; + return FT_Err_Ok; } @@ -434,7 +444,7 @@ THE SOFTWARE. { PCF_Face face = (PCF_Face)size->face; FT_Bitmap_Size* bsize = size->face->available_sizes; - FT_Error error = PCF_Err_Invalid_Pixel_Size; + FT_Error error = FT_ERR( Invalid_Pixel_Size ); FT_Long height; @@ -445,17 +455,17 @@ THE SOFTWARE. { case FT_SIZE_REQUEST_TYPE_NOMINAL: if ( height == ( ( bsize->y_ppem + 32 ) >> 6 ) ) - error = PCF_Err_Ok; + error = FT_Err_Ok; break; case FT_SIZE_REQUEST_TYPE_REAL_DIM: if ( height == ( face->accel.fontAscent + face->accel.fontDescent ) ) - error = PCF_Err_Ok; + error = FT_Err_Ok; break; default: - error = PCF_Err_Unimplemented_Feature; + error = FT_THROW( Unimplemented_Feature ); break; } @@ -474,7 +484,7 @@ THE SOFTWARE. { PCF_Face face = (PCF_Face)FT_SIZE_FACE( size ); FT_Stream stream; - FT_Error error = PCF_Err_Ok; + FT_Error error = FT_Err_Ok; FT_Bitmap* bitmap = &slot->bitmap; PCF_Metric metric; FT_Offset bytes; @@ -482,11 +492,17 @@ THE SOFTWARE. FT_UNUSED( load_flags ); - FT_TRACE4(( "load_glyph %d ---", glyph_index )); + FT_TRACE1(( "PCF_Glyph_Load: glyph index %d\n", glyph_index )); - if ( !face || glyph_index >= (FT_UInt)face->root.num_glyphs ) + if ( !face ) { - error = PCF_Err_Invalid_Argument; + error = FT_THROW( Invalid_Face_Handle ); + goto Exit; + } + + if ( glyph_index >= (FT_UInt)face->root.num_glyphs ) + { + error = FT_THROW( Invalid_Argument ); goto Exit; } @@ -526,13 +542,13 @@ THE SOFTWARE. break; default: - return PCF_Err_Invalid_File_Format; + return FT_THROW( Invalid_File_Format ); } /* XXX: to do: are there cases that need repadding the bitmap? */ bytes = bitmap->pitch * bitmap->rows; - error = ft_glyphslot_alloc_bitmap( slot, bytes ); + error = ft_glyphslot_alloc_bitmap( slot, (FT_ULong)bytes ); if ( error ) goto Exit; @@ -576,8 +592,6 @@ THE SOFTWARE. ( face->accel.fontAscent + face->accel.fontDescent ) << 6 ); - FT_TRACE4(( " --- ok\n" )); - Exit: return error; } @@ -622,7 +636,7 @@ THE SOFTWARE. return 0; } - return PCF_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); } @@ -699,10 +713,6 @@ THE SOFTWARE. 0, /* FT_Slot_InitFunc */ 0, /* FT_Slot_DoneFunc */ -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS - ft_stub_set_char_sizes, - ft_stub_set_pixel_sizes, -#endif PCF_Glyph_Load, 0, /* FT_Face_GetKerningFunc */ diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c index d9914c0..a29a9e3 100644 --- a/src/pcf/pcfread.c +++ b/src/pcf/pcfread.c @@ -2,7 +2,7 @@ FreeType font driver for pcf fonts - Copyright 2000-2010, 2012 by + Copyright 2000-2010, 2012-2014 by Francesco Zappa Nardelli Permission is hereby granted, free of charge, to any person obtaining a copy @@ -78,7 +78,7 @@ THE SOFTWARE. FT_FRAME_START( 16 ), FT_FRAME_ULONG_LE( type ), FT_FRAME_ULONG_LE( format ), - FT_FRAME_ULONG_LE( size ), + FT_FRAME_ULONG_LE( size ), /* rounded up to a multiple of 4 */ FT_FRAME_ULONG_LE( offset ), FT_FRAME_END }; @@ -92,21 +92,23 @@ THE SOFTWARE. PCF_Toc toc = &face->toc; PCF_Table tables; - FT_Memory memory = FT_FACE(face)->memory; + FT_Memory memory = FT_FACE( face )->memory; FT_UInt n; + FT_ULong size; - if ( FT_STREAM_SEEK ( 0 ) || - FT_STREAM_READ_FIELDS ( pcf_toc_header, toc ) ) - return PCF_Err_Cannot_Open_Resource; + + if ( FT_STREAM_SEEK( 0 ) || + FT_STREAM_READ_FIELDS( pcf_toc_header, toc ) ) + return FT_THROW( Cannot_Open_Resource ); if ( toc->version != PCF_FILE_VERSION || toc->count > FT_ARRAY_MAX( face->toc.tables ) || toc->count == 0 ) - return PCF_Err_Invalid_File_Format; + return FT_THROW( Invalid_File_Format ); if ( FT_NEW_ARRAY( face->toc.tables, toc->count ) ) - return PCF_Err_Out_Of_Memory; + return FT_THROW( Out_Of_Memory ); tables = face->toc.tables; for ( n = 0; n < toc->count; n++ ) @@ -144,13 +146,62 @@ THE SOFTWARE. if ( ( tables[i].size > tables[i + 1].offset ) || ( tables[i].offset > tables[i + 1].offset - tables[i].size ) ) - return PCF_Err_Invalid_Offset; + { + error = FT_THROW( Invalid_Offset ); + goto Exit; + } } if ( !have_change ) break; } + /* + * We now check whether the `size' and `offset' values are reasonable: + * `offset' + `size' must not exceed the stream size. + * + * Note, however, that X11's `pcfWriteFont' routine (used by the + * `bdftopcf' program to create PDF font files) has two special + * features. + * + * - It always assigns the accelerator table a size of 100 bytes in the + * TOC, regardless of its real size, which can vary between 34 and 72 + * bytes. + * + * - Due to the way the routine is designed, it ships out the last font + * table with its real size, ignoring the TOC's size value. Since + * the TOC size values are always rounded up to a multiple of 4, the + * difference can be up to three bytes for all tables except the + * accelerator table, for which the difference can be as large as 66 + * bytes. + * + */ + + tables = face->toc.tables; + size = stream->size; + + for ( n = 0; n < toc->count - 1; n++ ) + { + /* we need two checks to avoid overflow */ + if ( ( tables->size > size ) || + ( tables->offset > size - tables->size ) ) + { + error = FT_THROW( Invalid_Table ); + goto Exit; + } + tables++; + } + + /* only check `tables->offset' for last table element ... */ + if ( ( tables->offset > size ) ) + { + error = FT_THROW( Invalid_Table ); + goto Exit; + } + /* ... and adjust `tables->size' to the real value if necessary */ + if ( tables->size > size - tables->offset ) + tables->size = size - tables->offset; + #ifdef FT_DEBUG_LEVEL_TRACE { @@ -181,7 +232,7 @@ THE SOFTWARE. #endif - return PCF_Err_Ok; + return FT_Err_Ok; Exit: FT_FREE( face->toc.tables ); @@ -248,7 +299,7 @@ THE SOFTWARE. FT_ULong format, PCF_Metric metric ) { - FT_Error error = PCF_Err_Ok; + FT_Error error = FT_Err_Ok; if ( PCF_FORMAT_MATCH( format, PCF_DEFAULT_FORMAT ) ) @@ -294,7 +345,7 @@ THE SOFTWARE. FT_ULong *aformat, FT_ULong *asize ) { - FT_Error error = PCF_Err_Invalid_File_Format; + FT_Error error = FT_ERR( Invalid_File_Format ); FT_ULong i; @@ -303,20 +354,20 @@ THE SOFTWARE. { if ( stream->pos > tables[i].offset ) { - error = PCF_Err_Invalid_Stream_Skip; + error = FT_THROW( Invalid_Stream_Skip ); goto Fail; } if ( FT_STREAM_SKIP( tables[i].offset - stream->pos ) ) { - error = PCF_Err_Invalid_Stream_Skip; + error = FT_THROW( Invalid_Stream_Skip ); goto Fail; } *asize = tables[i].size; *aformat = tables[i].format; - return PCF_Err_Ok; + return FT_Err_Ok; } Fail: @@ -402,7 +453,7 @@ THE SOFTWARE. FT_ULong nprops, i; FT_ULong format, size; FT_Error error; - FT_Memory memory = FT_FACE(face)->memory; + FT_Memory memory = FT_FACE( face )->memory; FT_ULong string_size; FT_String* strings = 0; @@ -441,7 +492,7 @@ THE SOFTWARE. /* rough estimate */ if ( nprops > size / PCF_PROPERTY_SIZE ) { - error = PCF_Err_Invalid_Table; + error = FT_THROW( Invalid_Table ); goto Bail; } @@ -474,7 +525,7 @@ THE SOFTWARE. i = 4 - ( nprops & 3 ); if ( FT_STREAM_SKIP( i ) ) { - error = PCF_Err_Invalid_Stream_Skip; + error = FT_THROW( Invalid_Stream_Skip ); goto Bail; } } @@ -491,7 +542,7 @@ THE SOFTWARE. /* rough estimate */ if ( string_size > size - nprops * PCF_PROPERTY_SIZE ) { - error = PCF_Err_Invalid_Table; + error = FT_THROW( Invalid_Table ); goto Bail; } @@ -516,7 +567,7 @@ THE SOFTWARE. if ( ( name_offset < 0 ) || ( (FT_ULong)name_offset > string_size ) ) { - error = PCF_Err_Invalid_Offset; + error = FT_THROW( Invalid_Offset ); goto Bail; } @@ -535,7 +586,7 @@ THE SOFTWARE. if ( ( value_offset < 0 ) || ( (FT_ULong)value_offset > string_size ) ) { - error = PCF_Err_Invalid_Offset; + error = FT_THROW( Invalid_Offset ); goto Bail; } @@ -552,7 +603,7 @@ THE SOFTWARE. } } - error = PCF_Err_Ok; + error = FT_Err_Ok; Bail: FT_FREE( props ); @@ -566,10 +617,10 @@ THE SOFTWARE. pcf_get_metrics( FT_Stream stream, PCF_Face face ) { - FT_Error error = PCF_Err_Ok; - FT_Memory memory = FT_FACE(face)->memory; + FT_Error error; + FT_Memory memory = FT_FACE( face )->memory; FT_ULong format, size; - PCF_Metric metrics = 0; + PCF_Metric metrics = 0; FT_ULong nmetrics, i; @@ -587,7 +638,7 @@ THE SOFTWARE. if ( !PCF_FORMAT_MATCH( format, PCF_DEFAULT_FORMAT ) && !PCF_FORMAT_MATCH( format, PCF_COMPRESSED_METRICS ) ) - return PCF_Err_Invalid_File_Format; + return FT_THROW( Invalid_File_Format ); if ( PCF_FORMAT_MATCH( format, PCF_DEFAULT_FORMAT ) ) { @@ -604,12 +655,12 @@ THE SOFTWARE. (void)FT_READ_USHORT_LE( nmetrics ); } if ( error ) - return PCF_Err_Invalid_File_Format; + return FT_THROW( Invalid_File_Format ); face->nmetrics = nmetrics; if ( !nmetrics ) - return PCF_Err_Invalid_Table; + return FT_THROW( Invalid_Table ); FT_TRACE4(( "pcf_get_metrics:\n" )); @@ -619,36 +670,52 @@ THE SOFTWARE. if ( PCF_FORMAT_MATCH( format, PCF_DEFAULT_FORMAT ) ) { if ( nmetrics > size / PCF_METRIC_SIZE ) - return PCF_Err_Invalid_Table; + return FT_THROW( Invalid_Table ); } else { if ( nmetrics > size / PCF_COMPRESSED_METRIC_SIZE ) - return PCF_Err_Invalid_Table; + return FT_THROW( Invalid_Table ); } if ( FT_NEW_ARRAY( face->metrics, nmetrics ) ) - return PCF_Err_Out_Of_Memory; + return FT_THROW( Out_Of_Memory ); metrics = face->metrics; - for ( i = 0; i < nmetrics; i++ ) + for ( i = 0; i < nmetrics; i++, metrics++ ) { - error = pcf_get_metric( stream, format, metrics + i ); + error = pcf_get_metric( stream, format, metrics ); - metrics[i].bits = 0; + metrics->bits = 0; FT_TRACE5(( " idx %d: width=%d, " "lsb=%d, rsb=%d, ascent=%d, descent=%d, swidth=%d\n", i, - ( metrics + i )->characterWidth, - ( metrics + i )->leftSideBearing, - ( metrics + i )->rightSideBearing, - ( metrics + i )->ascent, - ( metrics + i )->descent, - ( metrics + i )->attributes )); + metrics->characterWidth, + metrics->leftSideBearing, + metrics->rightSideBearing, + metrics->ascent, + metrics->descent, + metrics->attributes )); if ( error ) break; + + /* sanity checks -- those values are used in `PCF_Glyph_Load' to */ + /* compute a glyph's bitmap dimensions, thus setting them to zero in */ + /* case of an error disables this particular glyph only */ + if ( metrics->rightSideBearing < metrics->leftSideBearing || + metrics->ascent + metrics->descent < 0 ) + { + metrics->characterWidth = 0; + metrics->leftSideBearing = 0; + metrics->rightSideBearing = 0; + metrics->ascent = 0; + metrics->descent = 0; + + FT_TRACE0(( "pcf_get_metrics:" + " invalid metrics for glyph %d\n", i )); + } } if ( error ) @@ -663,8 +730,8 @@ THE SOFTWARE. pcf_get_bitmaps( FT_Stream stream, PCF_Face face ) { - FT_Error error = PCF_Err_Ok; - FT_Memory memory = FT_FACE(face)->memory; + FT_Error error; + FT_Memory memory = FT_FACE( face )->memory; FT_Long* offsets = NULL; FT_Long bitmapSizes[GLYPHPADOPTIONS]; FT_ULong format, size; @@ -693,15 +760,15 @@ THE SOFTWARE. FT_Stream_ExitFrame( stream ); if ( !PCF_FORMAT_MATCH( format, PCF_DEFAULT_FORMAT ) ) - return PCF_Err_Invalid_File_Format; + return FT_THROW( Invalid_File_Format ); FT_TRACE4(( "pcf_get_bitmaps:\n" )); FT_TRACE4(( " number of bitmaps: %d\n", nbitmaps )); - /* XXX: PCF_Face->nmetrics is singed FT_Long, see pcf.h */ - if ( face->nmetrics < 0 || nbitmaps != ( FT_ULong )face->nmetrics ) - return PCF_Err_Invalid_File_Format; + /* XXX: PCF_Face->nmetrics is signed FT_Long, see pcf.h */ + if ( face->nmetrics < 0 || nbitmaps != (FT_ULong)face->nmetrics ) + return FT_THROW( Invalid_File_Format ); if ( FT_NEW_ARRAY( offsets, nbitmaps ) ) return error; @@ -765,14 +832,14 @@ THE SOFTWARE. pcf_get_encodings( FT_Stream stream, PCF_Face face ) { - FT_Error error = PCF_Err_Ok; - FT_Memory memory = FT_FACE(face)->memory; + FT_Error error; + FT_Memory memory = FT_FACE( face )->memory; FT_ULong format, size; int firstCol, lastCol; int firstRow, lastRow; int nencoding, encodingOffset; - int i, j; - PCF_Encoding tmpEncoding = NULL, encoding = 0; + int i, j, k; + PCF_Encoding encoding = NULL; error = pcf_seek_to_table_type( stream, @@ -810,7 +877,16 @@ THE SOFTWARE. FT_Stream_ExitFrame( stream ); if ( !PCF_FORMAT_MATCH( format, PCF_DEFAULT_FORMAT ) ) - return PCF_Err_Invalid_File_Format; + return FT_THROW( Invalid_File_Format ); + + /* sanity checks */ + if ( firstCol < 0 || + firstCol > lastCol || + lastCol > 0xFF || + firstRow < 0 || + firstRow > lastRow || + lastRow > 0xFF ) + return FT_THROW( Invalid_Table ); FT_TRACE4(( "pdf_get_encodings:\n" )); @@ -819,56 +895,47 @@ THE SOFTWARE. nencoding = ( lastCol - firstCol + 1 ) * ( lastRow - firstRow + 1 ); - if ( FT_NEW_ARRAY( tmpEncoding, nencoding ) ) - return PCF_Err_Out_Of_Memory; + if ( FT_NEW_ARRAY( encoding, nencoding ) ) + return FT_THROW( Out_Of_Memory ); error = FT_Stream_EnterFrame( stream, 2 * nencoding ); if ( error ) goto Bail; - for ( i = 0, j = 0 ; i < nencoding; i++ ) + k = 0; + for ( i = firstRow; i <= lastRow; i++ ) { - if ( PCF_BYTE_ORDER( format ) == MSBFirst ) - encodingOffset = FT_GET_SHORT(); - else - encodingOffset = FT_GET_SHORT_LE(); - - if ( encodingOffset != -1 ) + for ( j = firstCol; j <= lastCol; j++ ) { - tmpEncoding[j].enc = ( ( ( i / ( lastCol - firstCol + 1 ) ) + - firstRow ) * 256 ) + - ( ( i % ( lastCol - firstCol + 1 ) ) + - firstCol ); + if ( PCF_BYTE_ORDER( format ) == MSBFirst ) + encodingOffset = FT_GET_SHORT(); + else + encodingOffset = FT_GET_SHORT_LE(); - tmpEncoding[j].glyph = (FT_Short)encodingOffset; + if ( encodingOffset != -1 ) + { + encoding[k].enc = i * 256 + j; + encoding[k].glyph = (FT_Short)encodingOffset; - FT_TRACE5(( " code %d (0x%04X): idx %d\n", - tmpEncoding[j].enc, tmpEncoding[j].enc, - tmpEncoding[j].glyph )); + FT_TRACE5(( " code %d (0x%04X): idx %d\n", + encoding[k].enc, encoding[k].enc, encoding[k].glyph )); - j++; + k++; + } } } FT_Stream_ExitFrame( stream ); - if ( FT_NEW_ARRAY( encoding, j ) ) + if ( FT_RENEW_ARRAY( encoding, nencoding, k ) ) goto Bail; - for ( i = 0; i < j; i++ ) - { - encoding[i].enc = tmpEncoding[i].enc; - encoding[i].glyph = tmpEncoding[i].glyph; - } - - face->nencodings = j; + face->nencodings = k; face->encodings = encoding; - FT_FREE( tmpEncoding ); return error; Bail: FT_FREE( encoding ); - FT_FREE( tmpEncoding ); return error; } @@ -923,7 +990,7 @@ THE SOFTWARE. FT_ULong type ) { FT_ULong format, size; - FT_Error error = PCF_Err_Ok; + FT_Error error; PCF_Accel accel = &face->accel; @@ -994,7 +1061,7 @@ THE SOFTWARE. static FT_Error pcf_interpret_style( PCF_Face pcf ) { - FT_Error error = PCF_Err_Ok; + FT_Error error = FT_Err_Ok; FT_Face face = FT_FACE( pcf ); FT_Memory memory = face->memory; @@ -1023,20 +1090,20 @@ THE SOFTWARE. ( *(prop->value.atom) == 'B' || *(prop->value.atom) == 'b' ) ) { face->style_flags |= FT_STYLE_FLAG_BOLD; - strings[1] = (char *)"Bold"; + strings[1] = (char*)"Bold"; } prop = pcf_find_property( pcf, "SETWIDTH_NAME" ); if ( prop && prop->isString && *(prop->value.atom) && !( *(prop->value.atom) == 'N' || *(prop->value.atom) == 'n' ) ) - strings[3] = (char *)(prop->value.atom); + strings[3] = (char*)( prop->value.atom ); prop = pcf_find_property( pcf, "ADD_STYLE_NAME" ); if ( prop && prop->isString && *(prop->value.atom) && !( *(prop->value.atom) == 'N' || *(prop->value.atom) == 'n' ) ) - strings[0] = (char *)(prop->value.atom); + strings[0] = (char*)( prop->value.atom ); for ( len = 0, nn = 0; nn < 4; nn++ ) { @@ -1050,7 +1117,7 @@ THE SOFTWARE. if ( len == 0 ) { - strings[0] = (char *)"Regular"; + strings[0] = (char*)"Regular"; lengths[0] = ft_strlen( strings[0] ); len = lengths[0] + 1; } @@ -1088,7 +1155,7 @@ THE SOFTWARE. for ( mm = 0; mm < len; mm++ ) - if (s[mm] == ' ') + if ( s[mm] == ' ' ) s[mm] = '-'; } @@ -1105,8 +1172,8 @@ THE SOFTWARE. pcf_load_font( FT_Stream stream, PCF_Face face ) { - FT_Error error = PCF_Err_Ok; - FT_Memory memory = FT_FACE(face)->memory; + FT_Error error; + FT_Memory memory = FT_FACE( face )->memory; FT_Bool hasBDFAccelerators; @@ -1162,9 +1229,10 @@ THE SOFTWARE. root->num_faces = 1; root->face_index = 0; - root->face_flags = FT_FACE_FLAG_FIXED_SIZES | - FT_FACE_FLAG_HORIZONTAL | - FT_FACE_FLAG_FAST_GLYPHS; + + root->face_flags |= FT_FACE_FLAG_FIXED_SIZES | + FT_FACE_FLAG_HORIZONTAL | + FT_FACE_FLAG_FAST_GLYPHS; if ( face->accel.constantWidth ) root->face_flags |= FT_FACE_FLAG_FIXED_WIDTH; @@ -1268,7 +1336,7 @@ THE SOFTWARE. { /* This is done to respect the behaviour of the original */ /* PCF font driver. */ - error = PCF_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); } return error; diff --git a/src/pcf/pcfutil.c b/src/pcf/pcfutil.c index b91274f..0451ee8 100644 --- a/src/pcf/pcfutil.c +++ b/src/pcf/pcfutil.c @@ -66,11 +66,11 @@ in this Software without prior written authorization from The Open Group. TwoByteSwap( unsigned char* buf, size_t nbytes ) { - unsigned char c; - - for ( ; nbytes >= 2; nbytes -= 2, buf += 2 ) { + unsigned char c; + + c = buf[0]; buf[0] = buf[1]; buf[1] = c; @@ -85,11 +85,11 @@ in this Software without prior written authorization from The Open Group. FourByteSwap( unsigned char* buf, size_t nbytes ) { - unsigned char c; - - for ( ; nbytes >= 4; nbytes -= 4, buf += 4 ) { + unsigned char c; + + c = buf[0]; buf[0] = buf[3]; buf[3] = c; diff --git a/src/pfr/pfrcmap.c b/src/pfr/pfrcmap.c index 9c8f9ed..90ba010 100644 --- a/src/pfr/pfrcmap.c +++ b/src/pfr/pfrcmap.c @@ -4,7 +4,7 @@ /* */ /* FreeType PFR cmap handling (body). */ /* */ -/* Copyright 2002, 2007, 2009 by */ +/* Copyright 2002, 2007, 2009, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -16,6 +16,8 @@ /***************************************************************************/ +#include <ft2build.h> +#include FT_INTERNAL_DEBUG_H #include "pfrcmap.h" #include "pfrobjs.h" @@ -23,11 +25,14 @@ FT_CALLBACK_DEF( FT_Error ) - pfr_cmap_init( PFR_CMap cmap ) + pfr_cmap_init( PFR_CMap cmap, + FT_Pointer pointer ) { - FT_Error error = PFR_Err_Ok; + FT_Error error = FT_Err_Ok; PFR_Face face = (PFR_Face)FT_CMAP_FACE( cmap ); + FT_UNUSED( pointer ); + cmap->num_chars = face->phy_font.num_chars; cmap->chars = face->phy_font.chars; @@ -42,7 +47,7 @@ { if ( cmap->chars[n - 1].char_code >= cmap->chars[n].char_code ) { - error = PFR_Err_Invalid_Table; + error = FT_THROW( Invalid_Table ); goto Exit; } } @@ -65,14 +70,16 @@ pfr_cmap_char_index( PFR_CMap cmap, FT_UInt32 char_code ) { - FT_UInt min = 0; - FT_UInt max = cmap->num_chars; - FT_UInt mid; - PFR_Char gchar; + FT_UInt min = 0; + FT_UInt max = cmap->num_chars; while ( min < max ) { + PFR_Char gchar; + FT_UInt mid; + + mid = min + ( max - min ) / 2; gchar = cmap->chars + mid; diff --git a/src/pfr/pfrdrivr.c b/src/pfr/pfrdrivr.c index c59d8ae..db66281 100644 --- a/src/pfr/pfrdrivr.c +++ b/src/pfr/pfrdrivr.c @@ -4,7 +4,7 @@ /* */ /* FreeType PFR driver interface (body). */ /* */ -/* Copyright 2002-2004, 2006, 2008, 2010, 2011 by */ +/* Copyright 2002-2004, 2006, 2008, 2010, 2011, 2013, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -37,7 +37,7 @@ PFR_PhyFont phys = &face->phy_font; - pfr_face_get_kerning( pfrface, left, right, avector ); + (void)pfr_face_get_kerning( pfrface, left, right, avector ); /* convert from metrics to outline units when necessary */ if ( phys->outline_resolution != phys->metrics_resolution ) @@ -51,7 +51,7 @@ phys->metrics_resolution ); } - return PFR_Err_Ok; + return FT_Err_Ok; } @@ -66,7 +66,7 @@ FT_Pos *anadvance ) { PFR_Face face = (PFR_Face)pfrface; - FT_Error error = PFR_Err_Invalid_Argument; + FT_Error error = FT_ERR( Invalid_Argument ); *anadvance = 0; @@ -84,7 +84,7 @@ if ( gindex < phys->num_chars ) { *anadvance = phys->chars[gindex].advance; - error = PFR_Err_Ok; + error = FT_Err_Ok; } } @@ -130,11 +130,11 @@ if ( ametrics_y_scale ) *ametrics_y_scale = y_scale; - return PFR_Err_Ok; + return FT_Err_Ok; } - FT_CALLBACK_TABLE_DEF + static const FT_Service_PfrMetricsRec pfr_metrics_service_rec = { pfr_get_metrics, @@ -197,10 +197,6 @@ pfr_slot_init, pfr_slot_done, -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS - ft_stub_set_char_sizes, - ft_stub_set_pixel_sizes, -#endif pfr_slot_load, pfr_get_kerning, diff --git a/src/pfr/pfrgload.c b/src/pfr/pfrgload.c index 6f65b01..2ce0937 100644 --- a/src/pfr/pfrgload.c +++ b/src/pfr/pfrgload.c @@ -4,7 +4,7 @@ /* */ /* FreeType PFR glyph loader (body). */ /* */ -/* Copyright 2002, 2003, 2005, 2007, 2010 by */ +/* Copyright 2002, 2003, 2005, 2007, 2010, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -135,7 +135,7 @@ /* check that we have begun a new path */ if ( !glyph->path_begun ) { - error = PFR_Err_Invalid_Table; + error = FT_THROW( Invalid_Table ); FT_ERROR(( "pfr_glyph_line_to: invalid glyph data\n" )); goto Exit; } @@ -171,7 +171,7 @@ /* check that we have begun a new path */ if ( !glyph->path_begun ) { - error = PFR_Err_Invalid_Table; + error = FT_THROW( Invalid_Table ); FT_ERROR(( "pfr_glyph_line_to: invalid glyph data\n" )); goto Exit; } @@ -248,7 +248,7 @@ FT_Byte* p, FT_Byte* limit ) { - FT_Error error = PFR_Err_Ok; + FT_Error error = FT_Err_Ok; FT_Memory memory = glyph->loader->memory; FT_UInt flags, x_count, y_count, i, count, mask; FT_Int x; @@ -546,7 +546,7 @@ Failure: Too_Short: - error = PFR_Err_Invalid_Table; + error = FT_THROW( Invalid_Table ); FT_ERROR(( "pfr_glyph_load_simple: invalid glyph data\n" )); goto Exit; } @@ -558,7 +558,7 @@ FT_Byte* p, FT_Byte* limit ) { - FT_Error error = PFR_Err_Ok; + FT_Error error = FT_Err_Ok; FT_GlyphLoader loader = glyph->loader; FT_Memory memory = loader->memory; PFR_SubGlyph subglyph; @@ -602,7 +602,7 @@ /* to avoid endless recursion */ if ( new_max > 64 ) { - error = PFR_Err_Invalid_Table; + error = FT_THROW( Invalid_Table ); FT_ERROR(( "pfr_glyph_load_compound:" " too many compound glyphs components\n" )); goto Exit; @@ -709,7 +709,7 @@ Failure: Too_Short: - error = PFR_Err_Invalid_Table; + error = FT_THROW( Invalid_Table ); FT_ERROR(( "pfr_glyph_load_compound: invalid glyph data\n" )); goto Exit; } @@ -763,7 +763,7 @@ PFR_SubGlyph subglyph; - FT_TRACE4(( "subglyph %d:\n", n )); + FT_TRACE4(( " subglyph %d:\n", n )); subglyph = glyph->subs + old_count + n; old_points = base->n_points; diff --git a/src/pfr/pfrload.c b/src/pfr/pfrload.c index 325322e..f68d016 100644 --- a/src/pfr/pfrload.c +++ b/src/pfr/pfrload.c @@ -4,7 +4,7 @@ /* */ /* FreeType PFR loader (body). */ /* */ -/* Copyright 2002, 2003, 2004, 2005, 2007, 2009, 2010 by */ +/* Copyright 2002-2005, 2007, 2009, 2010, 2013, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -49,7 +49,7 @@ PFR_ExtraItem item_list, FT_Pointer item_data ) { - FT_Error error = PFR_Err_Ok; + FT_Error error = FT_Err_Ok; FT_Byte* p = *pp; FT_UInt num_items, item_type, item_size; @@ -91,7 +91,7 @@ Too_Short: FT_ERROR(( "pfr_extra_items_parse: invalid extra items table\n" )); - error = PFR_Err_Invalid_Table; + error = FT_THROW( Invalid_Table ); goto Exit; } @@ -179,7 +179,7 @@ if ( header->signature != 0x50465230L || /* "PFR0" */ header->version > 4 || header->header_size < 58 || - header->signature2 != 0x0d0a ) /* CR/LF */ + header->signature2 != 0x0D0A ) /* CR/LF */ { result = 0; } @@ -236,7 +236,7 @@ goto Exit; if ( idx >= num_log_fonts ) - return PFR_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); if ( FT_STREAM_SKIP( idx * 5 ) || FT_READ_USHORT( size ) || @@ -329,7 +329,7 @@ Too_Short: FT_ERROR(( "pfr_log_font_load: invalid logical font table\n" )); - error = PFR_Err_Invalid_Table; + error = FT_THROW( Invalid_Table ); goto Fail; } @@ -353,7 +353,7 @@ PFR_Strike strike; FT_UInt flags0; FT_UInt n, count, size1; - FT_Error error = PFR_Err_Ok; + FT_Error error = FT_Err_Ok; PFR_CHECK( 5 ); @@ -427,7 +427,7 @@ return error; Too_Short: - error = PFR_Err_Invalid_Table; + error = FT_THROW( Invalid_Table ); FT_ERROR(( "pfr_extra_item_load_bitmap_info:" " invalid bitmap info table\n" )); goto Exit; @@ -449,7 +449,7 @@ FT_Byte* limit, PFR_PhyFont phy_font ) { - FT_Error error = PFR_Err_Ok; + FT_Error error = FT_Err_Ok; FT_Memory memory = phy_font->memory; FT_PtrDist len = limit - p; @@ -477,7 +477,7 @@ { FT_UInt count, num_vert, num_horz; FT_Int* snaps = NULL; - FT_Error error = PFR_Err_Ok; + FT_Error error = FT_Err_Ok; FT_Memory memory = phy_font->memory; @@ -506,7 +506,7 @@ return error; Too_Short: - error = PFR_Err_Invalid_Table; + error = FT_THROW( Invalid_Table ); FT_ERROR(( "pfr_exta_item_load_stem_snaps:" " invalid stem snaps table\n" )); goto Exit; @@ -521,7 +521,7 @@ PFR_PhyFont phy_font ) { PFR_KernItem item = NULL; - FT_Error error = PFR_Err_Ok; + FT_Error error = FT_Err_Ok; FT_Memory memory = phy_font->memory; @@ -604,7 +604,7 @@ Too_Short: FT_FREE( item ); - error = PFR_Err_Invalid_Table; + error = FT_THROW( Invalid_Table ); FT_ERROR(( "pfr_extra_item_load_kerning_pairs:" " invalid kerning pairs table\n" )); goto Exit; @@ -631,7 +631,7 @@ FT_Memory memory, FT_String* *astring ) { - FT_Error error = PFR_Err_Ok; + FT_Error error = FT_Err_Ok; FT_String* result = NULL; FT_UInt n, ok; @@ -813,7 +813,6 @@ phy_font->ascent = PFR_NEXT_SHORT( q ); phy_font->descent = PFR_NEXT_SHORT( q ); phy_font->leading = PFR_NEXT_SHORT( q ); - q += 16; break; case 3: @@ -932,7 +931,7 @@ return error; Too_Short: - error = PFR_Err_Invalid_Table; + error = FT_THROW( Invalid_Table ); FT_ERROR(( "pfr_phy_font_load: invalid physical font table\n" )); goto Fail; } diff --git a/src/pfr/pfrobjs.c b/src/pfr/pfrobjs.c index c65cf29..0c89242 100644 --- a/src/pfr/pfrobjs.c +++ b/src/pfr/pfrobjs.c @@ -4,7 +4,7 @@ /* */ /* FreeType PFR object methods (body). */ /* */ -/* Copyright 2002-2008, 2010-2011 by */ +/* Copyright 2002-2008, 2010-2011, 2013, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -23,6 +23,7 @@ #include "pfrsbit.h" #include FT_OUTLINE_H #include FT_INTERNAL_DEBUG_H +#include FT_INTERNAL_CALC_H #include FT_TRUETYPE_IDS_H #include "pfrerror.h" @@ -87,7 +88,7 @@ if ( !pfr_header_check( &face->header ) ) { FT_TRACE2(( " not a PFR font\n" )); - error = PFR_Err_Unknown_File_Format; + error = FT_THROW( Unknown_File_Format ); goto Exit; } @@ -111,7 +112,7 @@ if ( face_index >= pfrface->num_faces ) { FT_ERROR(( "pfr_face_init: invalid face index\n" )); - error = PFR_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Exit; } @@ -137,7 +138,8 @@ pfrface->face_index = face_index; pfrface->num_glyphs = phy_font->num_chars + 1; - pfrface->face_flags = FT_FACE_FLAG_SCALABLE; + + pfrface->face_flags |= FT_FACE_FLAG_SCALABLE; /* if all characters point to the same gps_offset 0, we */ /* assume that the font only contains bitmaps */ @@ -156,7 +158,7 @@ else { FT_ERROR(( "pfr_face_init: font doesn't contain glyphs\n" )); - error = PFR_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } } @@ -324,12 +326,14 @@ FT_ULong gps_offset; + FT_TRACE1(( "pfr_slot_load: glyph index %d\n", gindex )); + if ( gindex > 0 ) gindex--; if ( !face || gindex >= face->phy_font.num_chars ) { - error = PFR_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Exit; } @@ -343,7 +347,7 @@ if ( load_flags & FT_LOAD_SBITS_ONLY ) { - error = PFR_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Exit; } @@ -468,7 +472,7 @@ FT_Vector* kerning ) { PFR_Face face = (PFR_Face)pfrface; - FT_Error error = PFR_Err_Ok; + FT_Error error = FT_Err_Ok; PFR_PhyFont phy_font = &face->phy_font; FT_UInt32 code1, code2, pair; @@ -512,7 +516,7 @@ { FT_UInt count = item->pair_count; FT_UInt size = item->pair_size; - FT_UInt power = (FT_UInt)ft_highpow2( (FT_UInt32)count ); + FT_UInt power = 1 << FT_MSB( count ); FT_UInt probe = power * size; FT_UInt extra = count - power; FT_Byte* base = stream->cursor; diff --git a/src/pfr/pfrsbit.c b/src/pfr/pfrsbit.c index 52bc2c8..979bf78 100644 --- a/src/pfr/pfrsbit.c +++ b/src/pfr/pfrsbit.c @@ -4,7 +4,7 @@ /* */ /* FreeType PFR bitmap loader (body). */ /* */ -/* Copyright 2002, 2003, 2006, 2009, 2010 by */ +/* Copyright 2002, 2003, 2006, 2009, 2010, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -59,7 +59,7 @@ if ( !decreasing ) { - writer->line += writer->pitch * ( target->rows-1 ); + writer->line += writer->pitch * ( target->rows - 1 ); writer->pitch = -writer->pitch; } } @@ -353,7 +353,7 @@ FT_Long *aadvance, FT_UInt *aformat ) { - FT_Error error = PFR_Err_Ok; + FT_Error error = FT_Err_Ok; FT_Byte flags; FT_Char b; FT_Byte* p = *pdata; @@ -471,7 +471,7 @@ return error; Too_Short: - error = PFR_Err_Invalid_Table; + error = FT_THROW( Invalid_Table ); FT_ERROR(( "pfr_load_bitmap_metrics: invalid glyph data\n" )); goto Exit; } @@ -484,7 +484,7 @@ FT_Bool decreasing, FT_Bitmap* target ) { - FT_Error error = PFR_Err_Ok; + FT_Error error = FT_Err_Ok; PFR_BitWriterRec writer; @@ -508,7 +508,7 @@ default: FT_ERROR(( "pfr_read_bitmap_data: invalid image type\n" )); - error = PFR_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); } } @@ -560,7 +560,7 @@ } /* couldn't find it */ - return PFR_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); } Found_Strike: @@ -593,7 +593,7 @@ if ( gps_size == 0 ) { /* Could not find a bitmap program string for this glyph */ - error = PFR_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Exit; } } @@ -636,12 +636,14 @@ * which causes a size truncation, because truncated * size properties makes bitmap glyph broken. */ - if ( xpos > FT_INT_MAX || ( ypos + ysize ) > FT_INT_MAX ) + if ( xpos > FT_INT_MAX || xpos < FT_INT_MIN || + ysize > FT_INT_MAX || ypos + ysize > FT_INT_MAX || + ypos + (FT_Long)ysize < FT_INT_MIN ) { FT_TRACE1(( "pfr_slot_load_bitmap:" )); FT_TRACE1(( "huge bitmap glyph %dx%d over FT_GlyphSlot\n", xpos, ypos )); - error = PFR_Err_Invalid_Pixel_Size; + error = FT_THROW( Invalid_Pixel_Size ); } if ( !error ) diff --git a/src/psaux/afmparse.c b/src/psaux/afmparse.c index 5f3f9e6..6a40e11 100644 --- a/src/psaux/afmparse.c +++ b/src/psaux/afmparse.c @@ -4,7 +4,7 @@ /* */ /* AFM parser (body). */ /* */ -/* Copyright 2006-2010, 2012 by */ +/* Copyright 2006-2010, 2012, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -17,6 +17,7 @@ #include <ft2build.h> #include FT_FREETYPE_H +#include FT_INTERNAL_DEBUG_H #include FT_INTERNAL_POSTSCRIPT_AUX_H #include "afmparse.h" @@ -119,7 +120,6 @@ afm_stream_read_one( AFM_Stream stream ) { char* str; - int ch; afm_stream_skip_spaces( stream ); @@ -130,7 +130,9 @@ while ( 1 ) { - ch = AFM_GETC(); + int ch = AFM_GETC(); + + if ( AFM_IS_SPACE( ch ) ) break; else if ( AFM_IS_NEWLINE( ch ) ) @@ -159,7 +161,6 @@ afm_stream_read_string( AFM_Stream stream ) { char* str; - int ch; afm_stream_skip_spaces( stream ); @@ -171,7 +172,9 @@ /* scan to eol */ while ( 1 ) { - ch = AFM_GETC(); + int ch = AFM_GETC(); + + if ( AFM_IS_NEWLINE( ch ) ) { stream->status = AFM_STREAM_STATUS_EOL; @@ -545,7 +548,7 @@ parser->FontInfo = NULL; parser->get_index = NULL; - return PSaux_Err_Ok; + return FT_Err_Ok; } @@ -572,10 +575,10 @@ { *aint = val.u.i; - return PSaux_Err_Ok; + return FT_Err_Ok; } else - return PSaux_Err_Syntax_Error; + return FT_THROW( Syntax_Error ); } @@ -637,7 +640,7 @@ case AFM_TOKEN_ENDKERNDATA: case AFM_TOKEN_ENDFONTMETRICS: fi->NumTrackKern = n + 1; - return PSaux_Err_Ok; + return FT_Err_Ok; case AFM_TOKEN_UNKNOWN: break; @@ -648,7 +651,7 @@ } Fail: - return PSaux_Err_Syntax_Error; + return FT_THROW( Syntax_Error ); } @@ -753,7 +756,7 @@ ft_qsort( fi->KernPairs, fi->NumKernPair, sizeof ( AFM_KernPairRec ), afm_compare_kern_pairs ); - return PSaux_Err_Ok; + return FT_Err_Ok; case AFM_TOKEN_UNKNOWN: break; @@ -764,7 +767,7 @@ } Fail: - return PSaux_Err_Syntax_Error; + return FT_THROW( Syntax_Error ); } @@ -795,7 +798,7 @@ case AFM_TOKEN_ENDKERNDATA: case AFM_TOKEN_ENDFONTMETRICS: - return PSaux_Err_Ok; + return FT_Err_Ok; case AFM_TOKEN_UNKNOWN: break; @@ -806,7 +809,7 @@ } Fail: - return PSaux_Err_Syntax_Error; + return FT_THROW( Syntax_Error ); } @@ -832,11 +835,11 @@ if ( token == end_section || token == AFM_TOKEN_ENDFONTMETRICS ) - return PSaux_Err_Ok; + return FT_Err_Ok; } Fail: - return PSaux_Err_Syntax_Error; + return FT_THROW( Syntax_Error ); } @@ -845,19 +848,19 @@ { FT_Memory memory = parser->memory; AFM_FontInfo fi = parser->FontInfo; - FT_Error error = PSaux_Err_Syntax_Error; + FT_Error error = FT_ERR( Syntax_Error ); char* key; FT_Offset len; FT_Int metrics_sets = 0; if ( !fi ) - return PSaux_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); key = afm_parser_next_key( parser, 1, &len ); if ( !key || len != 16 || ft_strncmp( key, "StartFontMetrics", 16 ) != 0 ) - return PSaux_Err_Unknown_File_Format; + return FT_THROW( Unknown_File_Format ); while ( ( key = afm_parser_next_key( parser, 1, &len ) ) != 0 ) { @@ -872,7 +875,7 @@ if ( metrics_sets != 0 && metrics_sets != 2 ) { - error = PSaux_Err_Unimplemented_Feature; + error = FT_THROW( Unimplemented_Feature ); goto Fail; } @@ -938,7 +941,7 @@ /* fall through since we only support kern data */ case AFM_TOKEN_ENDFONTMETRICS: - return PSaux_Err_Ok; + return FT_Err_Ok; default: break; diff --git a/src/psaux/psconv.c b/src/psaux/psconv.c index 9ea7fb9..22e8cf2 100644 --- a/src/psaux/psconv.c +++ b/src/psaux/psconv.c @@ -4,7 +4,7 @@ /* */ /* Some convenience conversions (body). */ /* */ -/* Copyright 2006, 2008, 2009, 2012 by */ +/* Copyright 2006, 2008, 2009, 2012-2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -18,11 +18,22 @@ #include <ft2build.h> #include FT_INTERNAL_POSTSCRIPT_AUX_H +#include FT_INTERNAL_DEBUG_H #include "psconv.h" #include "psauxerr.h" + /*************************************************************************/ + /* */ + /* The macro FT_COMPONENT is used in trace mode. It is an implicit */ + /* parameter of the FT_TRACE() and FT_ERROR() macros, used to print/log */ + /* messages during execution. */ + /* */ +#undef FT_COMPONENT +#define FT_COMPONENT trace_psconv + + /* The following array is used by various functions to quickly convert */ /* digits (both decimal and non-decimal) into numbers. */ @@ -69,18 +80,29 @@ #endif /* 'A' == 193 */ - FT_LOCAL_DEF( FT_Int ) + FT_LOCAL_DEF( FT_Long ) PS_Conv_Strtol( FT_Byte** cursor, FT_Byte* limit, - FT_Int base ) + FT_Long base ) { FT_Byte* p = *cursor; - FT_Int num = 0; - FT_Bool sign = 0; + FT_Long num = 0; + FT_Bool sign = 0; + FT_Bool have_overflow = 0; + + FT_Long num_limit; + FT_Char c_limit; + + + if ( p >= limit ) + goto Bad; - if ( p >= limit || base < 2 || base > 36 ) + if ( base < 2 || base > 36 ) + { + FT_TRACE4(( "!!!INVALID BASE:!!!" )); return 0; + } if ( *p == '-' || *p == '+' ) { @@ -88,9 +110,12 @@ p++; if ( p == limit ) - return 0; + goto Bad; } + num_limit = 0x7FFFFFFFL / base; + c_limit = (FT_Char)( 0x7FFFFFFFL % base ); + for ( ; p < limit; p++ ) { FT_Char c; @@ -99,59 +124,89 @@ if ( IS_PS_SPACE( *p ) || *p OP 0x80 ) break; - c = ft_char_table[*p & 0x7f]; + c = ft_char_table[*p & 0x7F]; if ( c < 0 || c >= base ) break; - num = num * base + c; + if ( num > num_limit || ( num == num_limit && c > c_limit ) ) + have_overflow = 1; + else + num = num * base + c; + } + + *cursor = p; + + if ( have_overflow ) + { + num = 0x7FFFFFFFL; + FT_TRACE4(( "!!!OVERFLOW:!!!" )); } if ( sign ) num = -num; - *cursor = p; - return num; + + Bad: + FT_TRACE4(( "!!!END OF DATA:!!!" )); + return 0; } - FT_LOCAL_DEF( FT_Int ) + FT_LOCAL_DEF( FT_Long ) PS_Conv_ToInt( FT_Byte** cursor, FT_Byte* limit ) { - FT_Byte* p; - FT_Int num; + FT_Byte* p = *cursor; + FT_Byte* curp; + + FT_Long num; - num = PS_Conv_Strtol( cursor, limit, 10 ); - p = *cursor; + curp = p; + num = PS_Conv_Strtol( &p, limit, 10 ); + + if ( p == curp ) + return 0; if ( p < limit && *p == '#' ) { - *cursor = p + 1; + p++; + + curp = p; + num = PS_Conv_Strtol( &p, limit, num ); - return PS_Conv_Strtol( cursor, limit, num ); + if ( p == curp ) + return 0; } - else - return num; + + *cursor = p; + + return num; } FT_LOCAL_DEF( FT_Fixed ) PS_Conv_ToFixed( FT_Byte** cursor, FT_Byte* limit, - FT_Int power_ten ) + FT_Long power_ten ) { FT_Byte* p = *cursor; - FT_Fixed integral; - FT_Long decimal = 0, divider = 1; - FT_Bool sign = 0; + FT_Byte* curp; + + FT_Fixed integral = 0; + FT_Long decimal = 0; + FT_Long divider = 1; + + FT_Bool sign = 0; + FT_Bool have_overflow = 0; + FT_Bool have_underflow = 0; if ( p >= limit ) - return 0; + goto Bad; if ( *p == '-' || *p == '+' ) { @@ -159,13 +214,23 @@ p++; if ( p == limit ) - return 0; + goto Bad; } + /* read the integer part */ if ( *p != '.' ) - integral = PS_Conv_ToInt( &p, limit ) << 16; - else - integral = 0; + { + curp = p; + integral = PS_Conv_ToInt( &p, limit ); + + if ( p == curp ) + return 0; + + if ( integral > 0x7FFF ) + have_overflow = 1; + else + integral = (FT_Fixed)( (FT_UInt32)integral << 16 ); + } /* read the decimal part */ if ( p < limit && *p == '.' ) @@ -180,23 +245,20 @@ if ( IS_PS_SPACE( *p ) || *p OP 0x80 ) break; - c = ft_char_table[*p & 0x7f]; + c = ft_char_table[*p & 0x7F]; if ( c < 0 || c >= 10 ) break; - if ( !integral && power_ten > 0 ) + /* only add digit if we don't overflow */ + if ( divider < 0xCCCCCCCL && decimal < 0xCCCCCCCL ) { - power_ten--; decimal = decimal * 10 + c; - } - else - { - if ( divider < 10000000L ) - { - decimal = decimal * 10 + c; + + if ( !integral && power_ten > 0 ) + power_ten--; + else divider *= 10; - } } } } @@ -204,33 +266,94 @@ /* read exponent, if any */ if ( p + 1 < limit && ( *p == 'e' || *p == 'E' ) ) { + FT_Long exponent; + + p++; - power_ten += PS_Conv_ToInt( &p, limit ); + + curp = p; + exponent = PS_Conv_ToInt( &p, limit ); + + if ( curp == p ) + return 0; + + /* arbitrarily limit exponent */ + if ( exponent > 1000 ) + have_overflow = 1; + else if ( exponent < -1000 ) + have_underflow = 1; + else + power_ten += exponent; } + *cursor = p; + + if ( !integral && !decimal ) + return 0; + + if ( have_overflow ) + goto Overflow; + if ( have_underflow ) + goto Underflow; + while ( power_ten > 0 ) { + if ( integral >= 0xCCCCCCCL ) + goto Overflow; integral *= 10; - decimal *= 10; + + if ( decimal >= 0xCCCCCCCL ) + { + if ( divider == 1 ) + goto Overflow; + divider /= 10; + } + else + decimal *= 10; + power_ten--; } while ( power_ten < 0 ) { integral /= 10; - divider *= 10; + if ( divider < 0xCCCCCCCL ) + divider *= 10; + else + decimal /= 10; + + if ( !integral && !decimal ) + goto Underflow; + power_ten++; } if ( decimal ) - integral += FT_DivFix( decimal, divider ); + { + decimal = FT_DivFix( decimal, divider ); + /* it's not necessary to check this addition for overflow */ + /* due to the structure of the real number representation */ + integral += decimal; + } + Exit: if ( sign ) integral = -integral; - *cursor = p; - return integral; + + Bad: + FT_TRACE4(( "!!!END OF DATA:!!!" )); + return 0; + + Overflow: + integral = 0x7FFFFFFFL; + FT_TRACE4(( "!!!OVERFLOW:!!!" )); + goto Exit; + + Underflow: + FT_TRACE4(( "!!!UNDERFLOW:!!!" )); + return 0; } @@ -398,7 +521,7 @@ if ( *p OP 0x80 ) break; - c = ft_char_table[*p & 0x7f]; + c = ft_char_table[*p & 0x7F]; if ( (unsigned)c >= 16 ) break; diff --git a/src/psaux/psconv.h b/src/psaux/psconv.h index 84854ba..d91c762 100644 --- a/src/psaux/psconv.h +++ b/src/psaux/psconv.h @@ -4,7 +4,7 @@ /* */ /* Some convenience conversions (specification). */ /* */ -/* Copyright 2006 by */ +/* Copyright 2006, 2012 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -26,20 +26,20 @@ FT_BEGIN_HEADER - FT_LOCAL( FT_Int ) + FT_LOCAL( FT_Long ) PS_Conv_Strtol( FT_Byte** cursor, FT_Byte* limit, - FT_Int base ); + FT_Long base ); - FT_LOCAL( FT_Int ) + FT_LOCAL( FT_Long ) PS_Conv_ToInt( FT_Byte** cursor, FT_Byte* limit ); FT_LOCAL( FT_Fixed ) PS_Conv_ToFixed( FT_Byte** cursor, FT_Byte* limit, - FT_Int power_ten ); + FT_Long power_ten ); #if 0 FT_LOCAL( FT_UInt ) diff --git a/src/psaux/psobjs.c b/src/psaux/psobjs.c index 06df6e6..7ec3b4c 100644 --- a/src/psaux/psobjs.c +++ b/src/psaux/psobjs.c @@ -4,7 +4,7 @@ /* */ /* Auxiliary functions for PostScript fonts (body). */ /* */ -/* Copyright 1996-2012 by */ +/* Copyright 1996-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -113,8 +113,8 @@ static FT_Error - reallocate_t1_table( PS_Table table, - FT_Long new_size ) + reallocate_t1_table( PS_Table table, + FT_Offset new_size ) { FT_Memory memory = table->memory; FT_Byte* old_base = table->block; @@ -138,7 +138,7 @@ table->capacity = new_size; - return PSaux_Err_Ok; + return FT_Err_Ok; } @@ -173,13 +173,13 @@ if ( idx < 0 || idx >= table->max_elems ) { FT_ERROR(( "ps_table_add: invalid index\n" )); - return PSaux_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); } if ( length < 0 ) { FT_ERROR(( "ps_table_add: invalid length\n" )); - return PSaux_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); } /* grow the base block if needed */ @@ -216,7 +216,7 @@ FT_MEM_COPY( table->block + table->cursor, object, length ); table->cursor += length; - return PSaux_Err_Ok; + return FT_Err_Ok; } @@ -341,7 +341,7 @@ { FT_Byte* cur = *acur; FT_Int embed = 0; - FT_Error error = PSaux_Err_Invalid_File_Format; + FT_Error error = FT_ERR( Invalid_File_Format ); unsigned int i; @@ -397,7 +397,7 @@ embed--; if ( embed == 0 ) { - error = PSaux_Err_Ok; + error = FT_Err_Ok; break; } } @@ -416,7 +416,7 @@ FT_Byte* limit ) { FT_Byte* cur = *acur; - FT_Error err = PSaux_Err_Ok; + FT_Error err = FT_Err_Ok; while ( ++cur < limit ) @@ -433,7 +433,7 @@ if ( cur < limit && *cur != '>' ) { FT_ERROR(( "skip_string: missing closing delimiter `>'\n" )); - err = PSaux_Err_Invalid_File_Format; + err = FT_THROW( Invalid_File_Format ); } else cur++; @@ -456,12 +456,12 @@ { FT_Byte* cur; FT_Int embed = 0; - FT_Error error = PSaux_Err_Ok; + FT_Error error = FT_Err_Ok; FT_ASSERT( **acur == '{' ); - for ( cur = *acur; cur < limit && error == PSaux_Err_Ok; ++cur ) + for ( cur = *acur; cur < limit && error == FT_Err_Ok; ++cur ) { switch ( *cur ) { @@ -494,7 +494,7 @@ end: if ( embed != 0 ) - error = PSaux_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); *acur = cur; @@ -519,7 +519,7 @@ FT_Byte* cur = parser->cursor; FT_Byte* limit = parser->limit; - FT_Error error = PSaux_Err_Ok; + FT_Error error = FT_Err_Ok; skip_spaces( &cur, limit ); /* this also skips comments */ @@ -567,7 +567,7 @@ { FT_ERROR(( "ps_parser_skip_PS_token:" " unexpected closing delimiter `>'\n" )); - error = PSaux_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } cur++; @@ -597,7 +597,7 @@ " but invalid at this point\n", *cur )); - error = PSaux_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); } parser->error = error; @@ -644,7 +644,7 @@ token->type = T1_TOKEN_TYPE_STRING; token->start = cur; - if ( skip_literal_string( &cur, limit ) == PSaux_Err_Ok ) + if ( skip_literal_string( &cur, limit ) == FT_Err_Ok ) token->limit = cur; break; @@ -653,7 +653,7 @@ token->type = T1_TOKEN_TYPE_ARRAY; token->start = cur; - if ( skip_procedure( &cur, limit ) == PSaux_Err_Ok ) + if ( skip_procedure( &cur, limit ) == FT_Err_Ok ) token->limit = cur; break; @@ -847,6 +847,8 @@ /* first character must be a delimiter or a part of a number */ /* NB: `values' can be NULL if we just want to skip the */ /* array; in this case we ignore `max_values' */ + /* */ + /* return number of successfully parsed values */ static FT_Int ps_tofixedarray( FT_Byte* *acur, @@ -1027,12 +1029,13 @@ FT_UInt max_objects, FT_ULong* pflags ) { - T1_TokenRec token; - FT_Byte* cur; - FT_Byte* limit; - FT_UInt count; - FT_UInt idx; - FT_Error error; + T1_TokenRec token; + FT_Byte* cur; + FT_Byte* limit; + FT_UInt count; + FT_UInt idx; + FT_Error error; + T1_FieldType type; /* this also skips leading whitespace */ @@ -1045,8 +1048,10 @@ cur = token.start; limit = token.limit; + type = field->type; + /* we must detect arrays in /FontBBox */ - if ( field->type == T1_FIELD_TYPE_BBOX ) + if ( type == T1_FIELD_TYPE_BBOX ) { T1_TokenRec token2; FT_Byte* old_cur = parser->cursor; @@ -1062,17 +1067,21 @@ parser->limit = old_limit; if ( token2.type == T1_TOKEN_TYPE_ARRAY ) + { + type = T1_FIELD_TYPE_MM_BBOX; goto FieldArray; + } } else if ( token.type == T1_TOKEN_TYPE_ARRAY ) { + count = max_objects; + FieldArray: /* if this is an array and we have no blend, an error occurs */ if ( max_objects == 0 ) goto Fail; - count = max_objects; - idx = 1; + idx = 1; /* don't include delimiters */ cur++; @@ -1088,7 +1097,7 @@ skip_spaces( &cur, limit ); - switch ( field->type ) + switch ( type ) { case T1_FIELD_TYPE_BOOL: val = ps_tobool( &cur, limit ); @@ -1160,7 +1169,7 @@ " " " but found token of type %d instead\n", token.type )); - error = PSaux_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } @@ -1193,11 +1202,11 @@ result = ps_tofixedarray( &cur, limit, 4, temp, 0 ); - if ( result < 0 ) + if ( result < 4 ) { FT_ERROR(( "ps_parser_load_field:" " expected four integers in bounding box\n" )); - error = PSaux_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } @@ -1208,6 +1217,54 @@ } break; + case T1_FIELD_TYPE_MM_BBOX: + { + FT_Memory memory = parser->memory; + FT_Fixed* temp; + FT_Int result; + FT_UInt i; + + + if ( FT_NEW_ARRAY( temp, max_objects * 4 ) ) + goto Exit; + + for ( i = 0; i < 4; i++ ) + { + result = ps_tofixedarray( &cur, limit, max_objects, + temp + i * max_objects, 0 ); + if ( result < 0 || (FT_UInt)result < max_objects ) + { + FT_ERROR(( "ps_parser_load_field:" + " expected %d integers in the %s subarray\n" + " " + " of /FontBBox in the /Blend dictionary\n", + max_objects, + i == 0 ? "first" + : ( i == 1 ? "second" + : ( i == 2 ? "third" + : "fourth" ) ) )); + error = FT_THROW( Invalid_File_Format ); + goto Exit; + } + + skip_spaces( &cur, limit ); + } + + for ( i = 0; i < max_objects; i++ ) + { + FT_BBox* bbox = (FT_BBox*)objects[i]; + + + bbox->xMin = FT_RoundFix( temp[i ] ); + bbox->yMin = FT_RoundFix( temp[i + max_objects] ); + bbox->xMax = FT_RoundFix( temp[i + 2 * max_objects] ); + bbox->yMax = FT_RoundFix( temp[i + 3 * max_objects] ); + } + + FT_FREE( temp ); + } + break; + default: /* an error occurred */ goto Fail; @@ -1221,13 +1278,13 @@ FT_UNUSED( pflags ); #endif - error = PSaux_Err_Ok; + error = FT_Err_Ok; Exit: return error; Fail: - error = PSaux_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } @@ -1245,7 +1302,7 @@ T1_TokenRec elements[T1_MAX_TABLE_ELEMENTS]; T1_Token token; FT_Int num_elements; - FT_Error error = PSaux_Err_Ok; + FT_Error error = FT_Err_Ok; FT_Byte* old_cursor; FT_Byte* old_limit; T1_FieldRec fieldrec = *(T1_Field)field; @@ -1260,7 +1317,7 @@ T1_MAX_TABLE_ELEMENTS, &num_elements ); if ( num_elements < 0 ) { - error = PSaux_Err_Ignore; + error = FT_ERR( Ignore ); goto Exit; } if ( (FT_UInt)num_elements > field->array_max ) @@ -1281,7 +1338,15 @@ { parser->cursor = token->start; parser->limit = token->limit; - ps_parser_load_field( parser, &fieldrec, objects, max_objects, 0 ); + + error = ps_parser_load_field( parser, + &fieldrec, + objects, + max_objects, + 0 ); + if ( error ) + break; + fieldrec.offset += fieldrec.size; } @@ -1317,7 +1382,7 @@ FT_Long* pnum_bytes, FT_Bool delimiters ) { - FT_Error error = PSaux_Err_Ok; + FT_Error error = FT_Err_Ok; FT_Byte* cur; @@ -1332,7 +1397,7 @@ if ( *cur != '<' ) { FT_ERROR(( "ps_parser_to_bytes: Missing starting delimiter `<'\n" )); - error = PSaux_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } @@ -1349,7 +1414,7 @@ if ( cur < parser->limit && *cur != '>' ) { FT_ERROR(( "ps_parser_to_bytes: Missing closing delimiter `>'\n" )); - error = PSaux_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } @@ -1419,7 +1484,7 @@ FT_Byte* limit, FT_Memory memory ) { - parser->error = PSaux_Err_Ok; + parser->error = FT_Err_Ok; parser->base = base; parser->limit = limit; parser->cursor = base; @@ -1592,13 +1657,13 @@ if ( !outline ) { FT_ERROR(( "t1_builder_add_contour: no outline to add points to\n" )); - return PSaux_Err_Invalid_File_Format; + return FT_THROW( Invalid_File_Format ); } if ( !builder->load_points ) { outline->n_contours++; - return PSaux_Err_Ok; + return FT_Err_Ok; } error = FT_GLYPHLOADER_CHECK_POINTS( builder->loader, 0, 1 ); @@ -1621,13 +1686,13 @@ FT_Pos x, FT_Pos y ) { - FT_Error error = PSaux_Err_Invalid_File_Format; + FT_Error error = FT_ERR( Invalid_File_Format ); /* test whether we are building a new contour */ if ( builder->parse_state == T1_Parse_Have_Path ) - error = PSaux_Err_Ok; + error = FT_Err_Ok; else { builder->parse_state = T1_Parse_Have_Path; diff --git a/src/psaux/t1cmap.c b/src/psaux/t1cmap.c index 9e5bd34..fb1353a 100644 --- a/src/psaux/t1cmap.c +++ b/src/psaux/t1cmap.c @@ -120,8 +120,12 @@ FT_CALLBACK_DEF( FT_Error ) - t1_cmap_standard_init( T1_CMapStd cmap ) + t1_cmap_standard_init( T1_CMapStd cmap, + FT_Pointer pointer ) { + FT_UNUSED( pointer ); + + t1_cmap_std_init( cmap, 0 ); return 0; } @@ -142,8 +146,12 @@ FT_CALLBACK_DEF( FT_Error ) - t1_cmap_expert_init( T1_CMapStd cmap ) + t1_cmap_expert_init( T1_CMapStd cmap, + FT_Pointer pointer ) { + FT_UNUSED( pointer ); + + t1_cmap_std_init( cmap, 1 ); return 0; } @@ -172,11 +180,14 @@ FT_CALLBACK_DEF( FT_Error ) - t1_cmap_custom_init( T1_CMapCustom cmap ) + t1_cmap_custom_init( T1_CMapCustom cmap, + FT_Pointer pointer ) { T1_Face face = (T1_Face)FT_CMAP_FACE( cmap ); T1_Encoding encoding = &face->type1.encoding; + FT_UNUSED( pointer ); + cmap->first = encoding->code_first; cmap->count = (FT_UInt)( encoding->code_last - cmap->first ); @@ -272,12 +283,15 @@ FT_CALLBACK_DEF( FT_Error ) - t1_cmap_unicode_init( PS_Unicodes unicodes ) + t1_cmap_unicode_init( PS_Unicodes unicodes, + FT_Pointer pointer ) { T1_Face face = (T1_Face)FT_CMAP_FACE( unicodes ); FT_Memory memory = FT_FACE_MEMORY( face ); FT_Service_PsCMaps psnames = (FT_Service_PsCMaps)face->psnames; + FT_UNUSED( pointer ); + return psnames->unicodes_init( memory, unicodes, diff --git a/src/psaux/t1decode.c b/src/psaux/t1decode.c index ea67841..d67a05e 100644 --- a/src/psaux/t1decode.c +++ b/src/psaux/t1decode.c @@ -4,7 +4,7 @@ /* */ /* PostScript Type 1 decoding routines (body). */ /* */ -/* Copyright 2000-2011 by */ +/* Copyright 2000-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -205,7 +205,13 @@ if ( decoder->seac ) { FT_ERROR(( "t1operator_seac: invalid nested seac\n" )); - return PSaux_Err_Syntax_Error; + return FT_THROW( Syntax_Error ); + } + + if ( decoder->builder.metrics_only ) + { + FT_ERROR(( "t1operator_seac: unexpected seac\n" )); + return FT_THROW( Syntax_Error ); } /* seac weirdness */ @@ -222,7 +228,7 @@ { FT_ERROR(( "t1operator_seac:" " glyph names table not available in this font\n" )); - return PSaux_Err_Syntax_Error; + return FT_THROW( Syntax_Error ); } #ifdef FT_CONFIG_OPTION_INCREMENTAL @@ -243,7 +249,7 @@ { FT_ERROR(( "t1operator_seac:" " invalid seac character code arguments\n" )); - return PSaux_Err_Syntax_Error; + return FT_THROW( Syntax_Error ); } /* if we are trying to load a composite glyph, do not load the */ @@ -409,7 +415,7 @@ limit = zone->limit = charstring_base + charstring_len; ip = zone->cursor = zone->base; - error = PSaux_Err_Ok; + error = FT_Err_Ok; x = orig_x = builder->pos_x; y = orig_y = builder->pos_y; @@ -559,10 +565,10 @@ goto Syntax_Error; } - value = (FT_Int32)( ( (FT_Long)ip[0] << 24 ) | - ( (FT_Long)ip[1] << 16 ) | - ( (FT_Long)ip[2] << 8 ) | - ip[3] ); + value = (FT_Int32)( ( (FT_UInt32)ip[0] << 24 ) | + ( (FT_UInt32)ip[1] << 16 ) | + ( (FT_UInt32)ip[2] << 8 ) | + (FT_UInt32)ip[3] ); ip += 4; /* According to the specification, values > 32000 or < -32000 must */ @@ -585,7 +591,7 @@ else { if ( !large_int ) - value <<= 16; + value = (FT_Int32)( (FT_UInt32)value << 16 ); } break; @@ -605,13 +611,13 @@ } if ( ip[-2] < 251 ) - value = ( ( (FT_Int32)ip[-2] - 247 ) << 8 ) + ip[-1] + 108; + value = ( ( ip[-2] - 247 ) * 256 ) + ip[-1] + 108; else - value = -( ( ( (FT_Int32)ip[-2] - 251 ) << 8 ) + ip[-1] + 108 ); + value = -( ( ( ip[-2] - 251 ) * 256 ) + ip[-1] + 108 ); } if ( !large_int ) - value <<= 16; + value = (FT_Int32)( (FT_UInt32)value << 16 ); } else { @@ -750,9 +756,9 @@ decoder->flex_state = 1; decoder->num_flex_vectors = 0; if ( ( error = t1_builder_start_point( builder, x, y ) ) - != PSaux_Err_Ok || + != FT_Err_Ok || ( error = t1_builder_check_points( builder, 6 ) ) - != PSaux_Err_Ok ) + != FT_Err_Ok ) goto Fail; break; @@ -1092,10 +1098,12 @@ goto Syntax_Error; /* apply hints to the loaded glyph outline now */ - hinter->apply( hinter->hints, - builder->current, - (PSH_Globals)builder->hints_globals, - decoder->hint_mode ); + error = hinter->apply( hinter->hints, + builder->current, + (PSH_Globals)builder->hints_globals, + decoder->hint_mode ); + if ( error ) + goto Fail; } /* add current outline to the glyph slot */ @@ -1123,7 +1131,7 @@ FT_TRACE4(( "\n" )); /* return now! */ - return PSaux_Err_Ok; + return FT_Err_Ok; case op_hsbw: FT_TRACE4(( " hsbw" )); @@ -1143,7 +1151,7 @@ /* the glyph's metrics (lsb + advance width), not load the */ /* rest of it; so exit immediately */ if ( builder->metrics_only ) - return PSaux_Err_Ok; + return FT_Err_Ok; break; @@ -1172,7 +1180,7 @@ /* the glyph's metrics (lsb + advance width), not load the */ /* rest of it; so exit immediately */ if ( builder->metrics_only ) - return PSaux_Err_Ok; + return FT_Err_Ok; break; @@ -1191,7 +1199,7 @@ FT_TRACE4(( " hlineto" )); if ( ( error = t1_builder_start_point( builder, x, y ) ) - != PSaux_Err_Ok ) + != FT_Err_Ok ) goto Fail; x += top[0]; @@ -1213,9 +1221,9 @@ FT_TRACE4(( " hvcurveto" )); if ( ( error = t1_builder_start_point( builder, x, y ) ) - != PSaux_Err_Ok || + != FT_Err_Ok || ( error = t1_builder_check_points( builder, 3 ) ) - != PSaux_Err_Ok ) + != FT_Err_Ok ) goto Fail; x += top[0]; @@ -1231,7 +1239,7 @@ FT_TRACE4(( " rlineto" )); if ( ( error = t1_builder_start_point( builder, x, y ) ) - != PSaux_Err_Ok ) + != FT_Err_Ok ) goto Fail; x += top[0]; @@ -1239,7 +1247,7 @@ Add_Line: if ( ( error = t1_builder_add_point1( builder, x, y ) ) - != PSaux_Err_Ok ) + != FT_Err_Ok ) goto Fail; break; @@ -1260,9 +1268,9 @@ FT_TRACE4(( " rrcurveto" )); if ( ( error = t1_builder_start_point( builder, x, y ) ) - != PSaux_Err_Ok || + != FT_Err_Ok || ( error = t1_builder_check_points( builder, 3 ) ) - != PSaux_Err_Ok ) + != FT_Err_Ok ) goto Fail; x += top[0]; @@ -1282,9 +1290,9 @@ FT_TRACE4(( " vhcurveto" )); if ( ( error = t1_builder_start_point( builder, x, y ) ) - != PSaux_Err_Ok || + != FT_Err_Ok || ( error = t1_builder_check_points( builder, 3 ) ) - != PSaux_Err_Ok ) + != FT_Err_Ok ) goto Fail; y += top[0]; @@ -1300,7 +1308,7 @@ FT_TRACE4(( " vlineto" )); if ( ( error = t1_builder_start_point( builder, x, y ) ) - != PSaux_Err_Ok ) + != FT_Err_Ok ) goto Fail; y += top[0]; @@ -1539,10 +1547,10 @@ return error; Syntax_Error: - return PSaux_Err_Syntax_Error; + return FT_THROW( Syntax_Error ); Stack_Underflow: - return PSaux_Err_Stack_Underflow; + return FT_THROW( Stack_Underflow ); } @@ -1579,7 +1587,7 @@ { FT_ERROR(( "t1_decoder_init:" " the `psnames' module is not available\n" )); - return PSaux_Err_Unimplemented_Feature; + return FT_THROW( Unimplemented_Feature ); } decoder->psnames = psnames; @@ -1599,7 +1607,7 @@ decoder->funcs = t1_decoder_funcs; - return PSaux_Err_Ok; + return FT_Err_Ok; } diff --git a/src/pshinter/pshalgo.c b/src/pshinter/pshalgo.c index d798978..644c76d 100644 --- a/src/pshinter/pshalgo.c +++ b/src/pshinter/pshalgo.c @@ -4,8 +4,7 @@ /* */ /* PostScript hinting algorithm (body). */ /* */ -/* Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 */ -/* by */ +/* Copyright 2001-2010, 2012-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used */ @@ -402,13 +401,13 @@ FT_Fixed delta, FT_Int dimension ) { - PSH_Hint hint; - FT_UInt count; + FT_UInt count; for ( count = 0; count < table->max_hints; count++ ) { - hint = table->hints + count; + PSH_Hint hint = table->hints + count; + hint->cur_pos = FT_MulFix( hint->org_pos, scale ) + delta; hint->cur_len = FT_MulFix( hint->org_len, scale ); @@ -563,7 +562,7 @@ else if ( len > 0 ) { /* This is a very small stem; we simply align it to the - * pixel grid, trying to find the minimal displacement. + * pixel grid, trying to find the minimum displacement. * * left = pos * right = pos + len @@ -1162,8 +1161,8 @@ int result = PSH_DIR_NONE; - ax = ( dx >= 0 ) ? dx : -dx; - ay = ( dy >= 0 ) ? dy : -dy; + ax = FT_ABS( dx ); + ay = FT_ABS( dy ); if ( ay * 12 < ax ) { @@ -1407,7 +1406,6 @@ point = first; before = point; - after = point; do { @@ -2080,8 +2078,6 @@ start = first; do { - point = first; - /* skip consecutive fitted points */ for (;;) { @@ -2194,7 +2190,7 @@ /* something to do? */ if ( outline->n_points == 0 || outline->n_contours == 0 ) - return PSH_Err_Ok; + return FT_Err_Ok; #ifdef DEBUG_HINTER diff --git a/src/pshinter/pshalgo.h b/src/pshinter/pshalgo.h index 1a248a7..c70f31e 100644 --- a/src/pshinter/pshalgo.h +++ b/src/pshinter/pshalgo.h @@ -4,7 +4,7 @@ /* */ /* PostScript hinting algorithm (specification). */ /* */ -/* Copyright 2001, 2002, 2003, 2008 by */ +/* Copyright 2001-2003, 2008, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -22,7 +22,6 @@ #include "pshrec.h" #include "pshglob.h" -#include FT_TRIGONOMETRY_H FT_BEGIN_HEADER @@ -168,8 +167,6 @@ FT_BEGIN_HEADER FT_UInt flags2; FT_Char dir_in; FT_Char dir_out; - FT_Angle angle_in; - FT_Angle angle_out; PSH_Hint hint; FT_Pos org_u; FT_Pos org_v; @@ -186,12 +183,6 @@ FT_BEGIN_HEADER } PSH_PointRec; -#define PSH_POINT_EQUAL_ORG( a, b ) ( (a)->org_u == (b)->org_u && \ - (a)->org_v == (b)->org_v ) - -#define PSH_POINT_ANGLE( a, b ) FT_Atan2( (b)->org_u - (a)->org_u, \ - (b)->org_v - (a)->org_v ) - typedef struct PSH_ContourRec_ { PSH_Point start; diff --git a/src/pshinter/pshglob.c b/src/pshinter/pshglob.c index 31231ad..1bcc481 100644 --- a/src/pshinter/pshglob.c +++ b/src/pshinter/pshglob.c @@ -5,7 +5,7 @@ /* PostScript hinter global hinting management (body). */ /* Inspired by the new auto-hinter module. */ /* */ -/* Copyright 2001, 2002, 2003, 2004, 2006, 2010 by */ +/* Copyright 2001-2004, 2006, 2010, 2012-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used */ @@ -522,6 +522,28 @@ } + /* calculate the maximum height of given blue zones */ + static FT_Short + psh_calc_max_height( FT_UInt num, + const FT_Short* values, + FT_Short cur_max ) + { + FT_UInt count; + + + for ( count = 0; count < num; count += 2 ) + { + FT_Short cur_height = values[count + 1] - values[count]; + + + if ( cur_height > cur_max ) + cur_max = cur_height; + } + + return cur_max; + } + + FT_LOCAL_DEF( void ) psh_blues_snap_stem( PSH_Blues blues, FT_Int stem_top, @@ -684,7 +706,32 @@ priv->family_blues, priv->num_family_other_blues, priv->family_other_blues, priv->blue_fuzz, 1 ); - globals->blues.blue_scale = priv->blue_scale; + /* limit the BlueScale value to `1 / max_of_blue_zone_heights' */ + { + FT_Fixed max_scale; + FT_Short max_height = 1; + + + max_height = psh_calc_max_height( priv->num_blue_values, + priv->blue_values, + max_height ); + max_height = psh_calc_max_height( priv->num_other_blues, + priv->other_blues, + max_height ); + max_height = psh_calc_max_height( priv->num_family_blues, + priv->family_blues, + max_height ); + max_height = psh_calc_max_height( priv->num_family_other_blues, + priv->family_other_blues, + max_height ); + + /* BlueScale is scaled 1000 times */ + max_scale = FT_DivFix( 1000, max_height ); + globals->blues.blue_scale = priv->blue_scale < max_scale + ? priv->blue_scale + : max_scale; + } + globals->blues.blue_shift = priv->blue_shift; globals->blues.blue_fuzz = priv->blue_fuzz; @@ -703,14 +750,14 @@ } - FT_LOCAL_DEF( FT_Error ) + FT_LOCAL_DEF( void ) psh_globals_set_scale( PSH_Globals globals, FT_Fixed x_scale, FT_Fixed y_scale, FT_Fixed x_delta, FT_Fixed y_delta ) { - PSH_Dimension dim = &globals->dimension[0]; + PSH_Dimension dim; dim = &globals->dimension[0]; @@ -733,8 +780,6 @@ psh_globals_scale_widths( globals, 1 ); psh_blues_scale_zones( &globals->blues, y_scale, y_delta ); } - - return 0; } diff --git a/src/pshinter/pshglob.h b/src/pshinter/pshglob.h index c511626..94d972a 100644 --- a/src/pshinter/pshglob.h +++ b/src/pshinter/pshglob.h @@ -4,7 +4,7 @@ /* */ /* PostScript hinter global hinting management. */ /* */ -/* Copyright 2001, 2002, 2003 by */ +/* Copyright 2001, 2002, 2003, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -167,7 +167,7 @@ FT_BEGIN_HEADER FT_Int org_width ); #endif - FT_LOCAL( FT_Error ) + FT_LOCAL( void ) psh_globals_set_scale( PSH_Globals globals, FT_Fixed x_scale, FT_Fixed y_scale, diff --git a/src/pshinter/pshmod.c b/src/pshinter/pshmod.c index 91da5d7..cdeaca1 100644 --- a/src/pshinter/pshmod.c +++ b/src/pshinter/pshmod.c @@ -4,7 +4,7 @@ /* */ /* FreeType PostScript hinter module implementation (body). */ /* */ -/* Copyright 2001, 2002, 2007 by */ +/* Copyright 2001, 2002, 2007, 2009, 2012 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -93,14 +93,15 @@ } - FT_DEFINE_PSHINTER_INTERFACE(pshinter_interface, + FT_DEFINE_PSHINTER_INTERFACE( + pshinter_interface, pshinter_get_globals_funcs, pshinter_get_t1_funcs, - pshinter_get_t2_funcs - ) + pshinter_get_t2_funcs ) - FT_DEFINE_MODULE(pshinter_module_class, + FT_DEFINE_MODULE( + pshinter_module_class, 0, sizeof ( PS_Hinter_ModuleRec ), @@ -108,11 +109,11 @@ 0x10000L, 0x20000L, - &FTPSHINTER_INTERFACE_GET, /* module-specific interface */ + &PSHINTER_INTERFACE_GET, /* module-specific interface */ (FT_Module_Constructor)ps_hinter_init, (FT_Module_Destructor) ps_hinter_done, - (FT_Module_Requester) 0 /* no additional interface for now */ - ) + (FT_Module_Requester) NULL ) /* no additional interface for now */ + /* END */ diff --git a/src/pshinter/pshpic.c b/src/pshinter/pshpic.c index 1e0f9a9..568f4ac 100644 --- a/src/pshinter/pshpic.c +++ b/src/pshinter/pshpic.c @@ -4,7 +4,7 @@ /* */ /* The FreeType position independent code services for pshinter module. */ /* */ -/* Copyright 2009, 2010 by */ +/* Copyright 2009, 2010, 2012, 2013 by */ /* Oran Agra and Mickey Gabel. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -22,6 +22,7 @@ #include "pshpic.h" #include "pshnterr.h" + #ifdef FT_CONFIG_OPTION_PIC /* forward declaration of PIC init functions from pshmod.c */ @@ -33,7 +34,7 @@ pshinter_module_class_pic_free( FT_Library library ) { FT_PIC_Container* pic_container = &library->pic_container; - FT_Memory memory = library->memory; + FT_Memory memory = library->memory; if ( pic_container->pshinter ) @@ -48,13 +49,13 @@ pshinter_module_class_pic_init( FT_Library library ) { FT_PIC_Container* pic_container = &library->pic_container; - FT_Error error = PSH_Err_Ok; - PSHinterPIC* container; + FT_Error error = FT_Err_Ok; + PSHinterPIC* container = NULL; FT_Memory memory = library->memory; /* allocate pointer, clear and set global container pointer */ - if ( FT_ALLOC ( container, sizeof ( *container ) ) ) + if ( FT_ALLOC( container, sizeof ( *container ) ) ) return error; FT_MEM_SET( container, 0, sizeof ( *container ) ); pic_container->pshinter = container; @@ -63,13 +64,13 @@ FT_Init_Class_pshinter_interface( library, &container->pshinter_interface ); -/*Exit:*/ - if( error ) + if ( error ) pshinter_module_class_pic_free( library ); + return error; } - #endif /* FT_CONFIG_OPTION_PIC */ + /* END */ diff --git a/src/pshinter/pshpic.h b/src/pshinter/pshpic.h index c10bdd9..b46f853 100644 --- a/src/pshinter/pshpic.h +++ b/src/pshinter/pshpic.h @@ -4,7 +4,7 @@ /* */ /* The FreeType position independent code services for pshinter module. */ /* */ -/* Copyright 2009 by */ +/* Copyright 2009, 2012, 2013 by */ /* Oran Agra and Mickey Gabel. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -24,21 +24,25 @@ FT_BEGIN_HEADER #include FT_INTERNAL_PIC_H + #ifndef FT_CONFIG_OPTION_PIC -#define FTPSHINTER_INTERFACE_GET pshinter_interface +#define PSHINTER_INTERFACE_GET pshinter_interface #else /* FT_CONFIG_OPTION_PIC */ #include FT_INTERNAL_POSTSCRIPT_HINTS_H - typedef struct PSHinterPIC_ + typedef struct PSHinterPIC_ { - PSHinter_Interface pshinter_interface; + PSHinter_Interface pshinter_interface; + } PSHinterPIC; -#define GET_PIC(lib) ((PSHinterPIC*)((lib)->pic_container.autofit)) -#define FTPSHINTER_INTERFACE_GET (GET_PIC(library)->pshinter_interface) + +#define GET_PIC( lib ) ( (PSHinterPIC*)( (lib)->pic_container.pshinter ) ) + +#define PSHINTER_INTERFACE_GET ( GET_PIC( library )->pshinter_interface ) /* see pshpic.c for the implementation */ void diff --git a/src/pshinter/pshrec.c b/src/pshinter/pshrec.c index 0910cc5..73a18ff 100644 --- a/src/pshinter/pshrec.c +++ b/src/pshinter/pshrec.c @@ -4,7 +4,7 @@ /* */ /* FreeType PostScript hints recorder (body). */ /* */ -/* Copyright 2001, 2002, 2003, 2004, 2007, 2009 by */ +/* Copyright 2001-2004, 2007, 2009, 2013, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -64,7 +64,7 @@ { FT_UInt old_max = table->max_hints; FT_UInt new_max = count; - FT_Error error = PSH_Err_Ok; + FT_Error error = FT_Err_Ok; if ( new_max > old_max ) @@ -83,7 +83,7 @@ FT_Memory memory, PS_Hint *ahint ) { - FT_Error error = PSH_Err_Ok; + FT_Error error = FT_Err_Ok; FT_UInt count; PS_Hint hint = 0; @@ -139,7 +139,7 @@ { FT_UInt old_max = ( mask->max_bits + 7 ) >> 3; FT_UInt new_max = ( count + 7 ) >> 3; - FT_Error error = PSH_Err_Ok; + FT_Error error = FT_Err_Ok; if ( new_max > old_max ) @@ -186,7 +186,7 @@ FT_Int idx, FT_Memory memory ) { - FT_Error error = PSH_Err_Ok; + FT_Error error = FT_Err_Ok; FT_Byte* p; @@ -236,7 +236,7 @@ { FT_UInt old_max = table->max_masks; FT_UInt new_max = count; - FT_Error error = PSH_Err_Ok; + FT_Error error = FT_Err_Ok; if ( new_max > old_max ) @@ -256,7 +256,7 @@ PS_Mask *amask ) { FT_UInt count; - FT_Error error = PSH_Err_Ok; + FT_Error error = FT_Err_Ok; PS_Mask mask = 0; @@ -287,7 +287,7 @@ FT_Memory memory, PS_Mask *amask ) { - FT_Error error = PSH_Err_Ok; + FT_Error error = FT_Err_Ok; FT_UInt count; PS_Mask mask; @@ -316,7 +316,7 @@ FT_UInt bit_count, FT_Memory memory ) { - FT_Error error = PSH_Err_Ok; + FT_Error error; PS_Mask mask; @@ -384,7 +384,7 @@ FT_UInt count; - count = ( count1 <= count2 ) ? count1 : count2; + count = FT_MIN( count1, count2 ); for ( ; count >= 8; count -= 8 ) { if ( p1[0] & p2[0] ) @@ -409,7 +409,7 @@ FT_Memory memory ) { FT_UInt temp; - FT_Error error = PSH_Err_Ok; + FT_Error error = FT_Err_Ok; /* swap index1 and index2 so that index1 < index2 */ @@ -499,7 +499,7 @@ FT_Memory memory ) { FT_Int index1, index2; - FT_Error error = PSH_Err_Ok; + FT_Error error = FT_Err_Ok; for ( index1 = table->num_masks - 1; index1 > 0; index1-- ) @@ -561,7 +561,7 @@ FT_Memory memory ) { PS_Mask mask; - FT_Error error = PSH_Err_Ok; + FT_Error error = FT_Err_Ok; /* get last hint mask */ @@ -583,12 +583,13 @@ FT_UInt end_point ) { FT_UInt count = dim->masks.num_masks; - PS_Mask mask; if ( count > 0 ) { - mask = dim->masks.masks + count - 1; + PS_Mask mask = dim->masks.masks + count - 1; + + mask->end_point = end_point; } } @@ -621,7 +622,7 @@ FT_UInt end_point, FT_Memory memory ) { - FT_Error error = PSH_Err_Ok; + FT_Error error; /* reset current mask, if any */ @@ -646,7 +647,7 @@ FT_Memory memory, FT_Int *aindex ) { - FT_Error error = PSH_Err_Ok; + FT_Error error = FT_Err_Ok; FT_UInt flags = 0; @@ -717,7 +718,7 @@ FT_Int hint3, FT_Memory memory ) { - FT_Error error = PSH_Err_Ok; + FT_Error error = FT_Err_Ok; FT_UInt count = dim->counters.num_masks; PS_Mask counter = dim->counters.masks; @@ -791,18 +792,17 @@ ps_dimension_done( &hints->dimension[0], memory ); ps_dimension_done( &hints->dimension[1], memory ); - hints->error = PSH_Err_Ok; + hints->error = FT_Err_Ok; hints->memory = 0; } - FT_LOCAL( FT_Error ) + FT_LOCAL( void ) ps_hints_init( PS_Hints hints, FT_Memory memory ) { FT_MEM_ZERO( hints, sizeof ( *hints ) ); hints->memory = memory; - return PSH_Err_Ok; } @@ -815,7 +815,7 @@ { case PS_HINT_TYPE_1: case PS_HINT_TYPE_2: - hints->error = PSH_Err_Ok; + hints->error = FT_Err_Ok; hints->hint_type = hint_type; ps_dimension_init( &hints->dimension[0] ); @@ -823,7 +823,7 @@ break; default: - hints->error = PSH_Err_Invalid_Argument; + hints->error = FT_THROW( Invalid_Argument ); hints->hint_type = hint_type; FT_TRACE0(( "ps_hints_open: invalid charstring type\n" )); @@ -894,7 +894,7 @@ FT_Int dimension, FT_Fixed* stems ) { - FT_Error error = PSH_Err_Ok; + FT_Error error = FT_Err_Ok; if ( !hints->error ) @@ -938,7 +938,7 @@ else { FT_ERROR(( "ps_hints_t1stem3: called with invalid hint type\n" )); - error = PSH_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Fail; } } @@ -956,7 +956,7 @@ ps_hints_t1reset( PS_Hints hints, FT_UInt end_point ) { - FT_Error error = PSH_Err_Ok; + FT_Error error = FT_Err_Ok; if ( !hints->error ) @@ -979,7 +979,7 @@ else { /* invalid hint type */ - error = PSH_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Fail; } } diff --git a/src/pshinter/pshrec.h b/src/pshinter/pshrec.h index dcb3197..a88fe6e 100644 --- a/src/pshinter/pshrec.h +++ b/src/pshinter/pshrec.h @@ -4,7 +4,7 @@ /* */ /* Postscript (Type1/Type2) hints recorder (specification). */ /* */ -/* Copyright 2001, 2002, 2003, 2006, 2008 by */ +/* Copyright 2001, 2002, 2003, 2006, 2008, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -141,7 +141,7 @@ FT_BEGIN_HEADER /* */ /* initialize hints recorder */ - FT_LOCAL( FT_Error ) + FT_LOCAL( void ) ps_hints_init( PS_Hints hints, FT_Memory memory ); diff --git a/src/psnames/psmodule.c b/src/psnames/psmodule.c index 3619174..42c9aff 100644 --- a/src/psnames/psmodule.c +++ b/src/psnames/psmodule.c @@ -4,7 +4,7 @@ /* */ /* PSNames module implementation (body). */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2005, 2006, 2007, 2008 by */ +/* Copyright 1996-2003, 2005-2008, 2012-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -17,6 +17,7 @@ #include <ft2build.h> +#include FT_INTERNAL_DEBUG_H #include FT_INTERNAL_OBJECTS_H #include FT_SERVICE_POSTSCRIPT_CMAPS_H @@ -369,7 +370,7 @@ /* No unicode chars here! */ FT_FREE( table->maps ); if ( !error ) - error = PSnames_Err_No_Unicode_Glyph_Name; + error = FT_THROW( No_Unicode_Glyph_Name ); } else { @@ -377,7 +378,7 @@ if ( count < num_glyphs / 2 ) { (void)FT_RENEW_ARRAY( table->maps, num_glyphs, count ); - error = PSnames_Err_Ok; + error = FT_Err_Ok; } /* Sort the table in increasing order of unicode values, */ @@ -521,7 +522,9 @@ #ifdef FT_CONFIG_OPTION_ADOBE_GLYPH_LIST - FT_DEFINE_SERVICE_PSCMAPSREC(pscmaps_interface, + + FT_DEFINE_SERVICE_PSCMAPSREC( + pscmaps_interface, (PS_Unicode_ValueFunc) ps_unicode_value, (PS_Unicodes_InitFunc) ps_unicodes_init, (PS_Unicodes_CharIndexFunc)ps_unicodes_char_index, @@ -531,39 +534,36 @@ (PS_Adobe_Std_StringsFunc) ps_get_standard_strings, t1_standard_encoding, - t1_expert_encoding - ) + t1_expert_encoding ) #else - FT_DEFINE_SERVICE_PSCMAPSREC(pscmaps_interface, - 0, - 0, - 0, - 0, + FT_DEFINE_SERVICE_PSCMAPSREC( + pscmaps_interface, + NULL, + NULL, + NULL, + NULL, (PS_Macintosh_NameFunc) ps_get_macintosh_name, (PS_Adobe_Std_StringsFunc) ps_get_standard_strings, t1_standard_encoding, - t1_expert_encoding - ) + t1_expert_encoding ) #endif /* FT_CONFIG_OPTION_ADOBE_GLYPH_LIST */ - FT_DEFINE_SERVICEDESCREC1(pscmaps_services, - FT_SERVICE_ID_POSTSCRIPT_CMAPS, &FT_PSCMAPS_INTERFACE_GET - ) - - + FT_DEFINE_SERVICEDESCREC1( + pscmaps_services, + FT_SERVICE_ID_POSTSCRIPT_CMAPS, &PSCMAPS_INTERFACE_GET ) static FT_Pointer psnames_get_service( FT_Module module, const char* service_id ) { - /* FT_PSCMAPS_SERVICES_GET derefers `library' in PIC mode */ + /* PSCMAPS_SERVICES_GET dereferences `library' in PIC mode */ #ifdef FT_CONFIG_OPTION_PIC FT_Library library; @@ -577,19 +577,20 @@ FT_UNUSED( module ); #endif - return ft_service_list_lookup( FT_PSCMAPS_SERVICES_GET, service_id ); + return ft_service_list_lookup( PSCMAPS_SERVICES_GET, service_id ); } #endif /* FT_CONFIG_OPTION_POSTSCRIPT_NAMES */ #ifndef FT_CONFIG_OPTION_POSTSCRIPT_NAMES -#define PUT_PS_NAMES_SERVICE(a) 0 +#define PUT_PS_NAMES_SERVICE( a ) NULL #else -#define PUT_PS_NAMES_SERVICE(a) a +#define PUT_PS_NAMES_SERVICE( a ) a #endif - FT_DEFINE_MODULE(psnames_module_class, + FT_DEFINE_MODULE( + psnames_module_class, 0, /* this is not a font driver, nor a renderer */ sizeof ( FT_ModuleRec ), @@ -598,12 +599,11 @@ 0x10000L, /* driver version */ 0x20000L, /* driver requires FreeType 2 or above */ - PUT_PS_NAMES_SERVICE((void*)&FT_PSCMAPS_INTERFACE_GET), /* module specific interface */ - (FT_Module_Constructor)0, - (FT_Module_Destructor) 0, - (FT_Module_Requester) PUT_PS_NAMES_SERVICE(psnames_get_service) - ) - + PUT_PS_NAMES_SERVICE( + (void*)&PSCMAPS_INTERFACE_GET ), /* module specific interface */ + (FT_Module_Constructor)NULL, + (FT_Module_Destructor) NULL, + (FT_Module_Requester) PUT_PS_NAMES_SERVICE( psnames_get_service ) ) /* END */ diff --git a/src/psnames/pspic.c b/src/psnames/pspic.c index 467ab73..3820f65 100644 --- a/src/psnames/pspic.c +++ b/src/psnames/pspic.c @@ -4,7 +4,7 @@ /* */ /* The FreeType position independent code services for psnames module. */ /* */ -/* Copyright 2009, 2010 by */ +/* Copyright 2009, 2010, 2012, 2013 by */ /* Oran Agra and Mickey Gabel. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -22,6 +22,7 @@ #include "pspic.h" #include "psnamerr.h" + #ifdef FT_CONFIG_OPTION_PIC /* forward declaration of PIC init functions from psmodule.c */ @@ -36,11 +37,12 @@ FT_Init_Class_pscmaps_interface( FT_Library library, FT_Service_PsCMapsRec* clazz ); + void psnames_module_class_pic_free( FT_Library library ) { FT_PIC_Container* pic_container = &library->pic_container; - FT_Memory memory = library->memory; + FT_Memory memory = library->memory; if ( pic_container->psnames ) @@ -48,7 +50,7 @@ PSModulePIC* container = (PSModulePIC*)pic_container->psnames; - if(container->pscmaps_services) + if ( container->pscmaps_services ) FT_Destroy_Class_pscmaps_services( library, container->pscmaps_services ); container->pscmaps_services = NULL; @@ -62,18 +64,19 @@ psnames_module_class_pic_init( FT_Library library ) { FT_PIC_Container* pic_container = &library->pic_container; - FT_Error error = PSnames_Err_Ok; - PSModulePIC* container; + FT_Error error = FT_Err_Ok; + PSModulePIC* container = NULL; FT_Memory memory = library->memory; /* allocate pointer, clear and set global container pointer */ - if ( FT_ALLOC ( container, sizeof ( *container ) ) ) + if ( FT_ALLOC( container, sizeof ( *container ) ) ) return error; FT_MEM_SET( container, 0, sizeof ( *container ) ); pic_container->psnames = container; - /* initialize pointer table - this is how the module usually expects this data */ + /* initialize pointer table - */ + /* this is how the module usually expects this data */ error = FT_Create_Class_pscmaps_services( library, &container->pscmaps_services ); if ( error ) @@ -81,7 +84,7 @@ FT_Init_Class_pscmaps_interface( library, &container->pscmaps_interface ); -Exit: + Exit: if ( error ) psnames_module_class_pic_free( library ); return error; diff --git a/src/psnames/pspic.h b/src/psnames/pspic.h index 1169b89..6ff002c 100644 --- a/src/psnames/pspic.h +++ b/src/psnames/pspic.h @@ -4,7 +4,7 @@ /* */ /* The FreeType position independent code services for psnames module. */ /* */ -/* Copyright 2009 by */ +/* Copyright 2009, 2012 by */ /* Oran Agra and Mickey Gabel. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -25,22 +25,27 @@ FT_BEGIN_HEADER #include FT_INTERNAL_PIC_H #ifndef FT_CONFIG_OPTION_PIC -#define FT_PSCMAPS_SERVICES_GET pscmaps_services -#define FT_PSCMAPS_INTERFACE_GET pscmaps_interface + +#define PSCMAPS_SERVICES_GET pscmaps_services +#define PSCMAPS_INTERFACE_GET pscmaps_interface #else /* FT_CONFIG_OPTION_PIC */ #include FT_SERVICE_POSTSCRIPT_CMAPS_H - typedef struct PSModulePIC_ + typedef struct PSModulePIC_ { - FT_ServiceDescRec* pscmaps_services; - FT_Service_PsCMapsRec pscmaps_interface; + FT_ServiceDescRec* pscmaps_services; + FT_Service_PsCMapsRec pscmaps_interface; + } PSModulePIC; -#define GET_PIC(lib) ((PSModulePIC*)((lib)->pic_container.psnames)) -#define FT_PSCMAPS_SERVICES_GET (GET_PIC(library)->pscmaps_services) -#define FT_PSCMAPS_INTERFACE_GET (GET_PIC(library)->pscmaps_interface) + +#define GET_PIC( lib ) \ + ( (PSModulePIC*)((lib)->pic_container.psnames) ) +#define PSCMAPS_SERVICES_GET ( GET_PIC( library )->pscmaps_services ) +#define PSCMAPS_INTERFACE_GET ( GET_PIC( library )->pscmaps_interface ) + /* see pspic.c for the implementation */ void diff --git a/src/psnames/rules.mk b/src/psnames/rules.mk index 4cd39a8..f321de2 100644 --- a/src/psnames/rules.mk +++ b/src/psnames/rules.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2000, 2001, 2003, 2011 by +# Copyright 1996-2001, 2003, 2011, 2013 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -46,7 +46,7 @@ PSNAMES_DRV_OBJ_S := $(OBJ_DIR)/psnames.$O # PSNames driver source file for single build # -PSNAMES_DRV_SRC_S := $(PSNAMES_DIR)/psmodule.c +PSNAMES_DRV_SRC_S := $(PSNAMES_DIR)/psnames.c # PSNames driver - single object diff --git a/src/raster/ftmisc.h b/src/raster/ftmisc.h index 7773924..703155a 100644 --- a/src/raster/ftmisc.h +++ b/src/raster/ftmisc.h @@ -115,6 +115,27 @@ return ( s > 0 ) ? d : -d; } + + static FT_Long + FT_MulDiv_No_Round( FT_Long a, + FT_Long b, + FT_Long c ) + { + FT_Int s; + FT_Long d; + + + s = 1; + if ( a < 0 ) { a = -a; s = -1; } + if ( b < 0 ) { b = -b; s = -s; } + if ( c < 0 ) { c = -c; s = -s; } + + d = (FT_Long)( c > 0 ? (FT_Int64)a * b / c + : 0x7FFFFFFFL ); + + return ( s > 0 ) ? d : -d; + } + #endif /* __FTMISC_H__ */ diff --git a/src/raster/ftraster.c b/src/raster/ftraster.c index f85845e..b06ac33 100644 --- a/src/raster/ftraster.c +++ b/src/raster/ftraster.c @@ -4,7 +4,7 @@ /* */ /* The FreeType glyph rasterizer (body). */ /* */ -/* Copyright 1996-2003, 2005, 2007-2012 by */ +/* Copyright 1996-2003, 2005, 2007-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -24,8 +24,8 @@ /* */ /* - copy `src/raster/ftraster.c' (this file) to your current directory */ /* */ - /* - copy `include/freetype/ftimage.h' and `src/raster/ftmisc.h' */ - /* to your current directory */ + /* - copy `include/ftimage.h' and `src/raster/ftmisc.h' to your current */ + /* directory */ /* */ /* - compile `ftraster' with the _STANDALONE_ macro defined, as in */ /* */ @@ -60,7 +60,7 @@ #include <ft2build.h> #include "ftraster.h" -#include FT_INTERNAL_CALC_H /* for FT_MulDiv only */ +#include FT_INTERNAL_CALC_H /* for FT_MulDiv and FT_MulDiv_No_Round */ #include "rastpic.h" @@ -179,6 +179,9 @@ #ifdef _STANDALONE_ + /* Auxiliary macros for token concatenation. */ +#define FT_ERR_XCAT( x, y ) x ## y +#define FT_ERR_CAT( x, y ) FT_ERR_XCAT( x, y ) /* This macro is used to indicate that a function parameter is unused. */ /* Its purpose is simply to reduce compiler warnings. Note also that */ @@ -187,7 +190,7 @@ #define FT_UNUSED( x ) (x) = (x) /* Disable the tracing mechanism for simplicity -- developers can */ - /* activate it easily by redefining these two macros. */ + /* activate it easily by redefining these macros. */ #ifndef FT_ERROR #define FT_ERROR( x ) do { } while ( 0 ) /* nothing */ #endif @@ -198,6 +201,10 @@ #define FT_TRACE6( x ) do { } while ( 0 ) /* nothing */ #endif +#ifndef FT_THROW +#define FT_THROW( e ) FT_ERR_CAT( Raster_Err_, e ) +#endif + #define Raster_Err_None 0 #define Raster_Err_Not_Ini -1 #define Raster_Err_Overflow -2 @@ -224,11 +231,11 @@ #include FT_INTERNAL_OBJECTS_H -#include FT_INTERNAL_DEBUG_H /* for FT_TRACE() and FT_ERROR() */ +#include FT_INTERNAL_DEBUG_H /* for FT_TRACE, FT_ERROR, and FT_THROW */ #include "rasterrs.h" -#define Raster_Err_None Raster_Err_Ok +#define Raster_Err_None FT_Err_Ok #define Raster_Err_Not_Ini Raster_Err_Raster_Uninitialized #define Raster_Err_Overflow Raster_Err_Raster_Overflow #define Raster_Err_Neg_Height Raster_Err_Raster_Negative_Height @@ -255,7 +262,8 @@ /* On the other hand, SMulDiv means `Slow MulDiv', and is used typically */ /* for clipping computations. It simply uses the FT_MulDiv() function */ /* defined in `ftcalc.h'. */ -#define SMulDiv FT_MulDiv +#define SMulDiv FT_MulDiv +#define SMulDiv_No_Round FT_MulDiv_No_Round /* The rasterizer is a very general purpose component; please leave */ /* the following redefinitions there (you never know your target */ @@ -302,6 +310,7 @@ typedef short Short; typedef unsigned short UShort, *PUShort; typedef long Long, *PLong; + typedef unsigned long ULong; typedef unsigned char Byte, *PByte; typedef char Bool; @@ -440,12 +449,14 @@ #define FLOOR( x ) ( (x) & -ras.precision ) #define CEILING( x ) ( ( (x) + ras.precision - 1 ) & -ras.precision ) -#define TRUNC( x ) ( (signed long)(x) >> ras.precision_bits ) +#define TRUNC( x ) ( (Long)(x) >> ras.precision_bits ) #define FRAC( x ) ( (x) & ( ras.precision - 1 ) ) -#define SCALED( x ) ( ( (x) << ras.scale_shift ) - ras.precision_half ) +#define SCALED( x ) ( ( (ULong)(x) << ras.scale_shift ) - ras.precision_half ) -#define IS_BOTTOM_OVERSHOOT( x ) ( CEILING( x ) - x >= ras.precision_half ) -#define IS_TOP_OVERSHOOT( x ) ( x - FLOOR( x ) >= ras.precision_half ) +#define IS_BOTTOM_OVERSHOOT( x ) \ + (Bool)( CEILING( x ) - x >= ras.precision_half ) +#define IS_TOP_OVERSHOOT( x ) \ + (Bool)( x - FLOOR( x ) >= ras.precision_half ) /* The most used variables are positioned at the top of the structure. */ /* Thus, their offset can be coded with less opcodes, resulting in a */ @@ -654,7 +665,7 @@ /* Set precision variables according to param flag. */ /* */ /* <Input> */ - /* High :: Set to True for high precision (typically for ppem < 18), */ + /* High :: Set to True for high precision (typically for ppem < 24), */ /* false otherwise. */ /* */ static void @@ -734,7 +745,7 @@ if ( ras.top >= ras.maxBuff ) { - ras.error = Raster_Err_Overflow; + ras.error = FT_THROW( Overflow ); return FAILURE; } @@ -764,7 +775,7 @@ default: FT_ERROR(( "New_Profile: invalid profile direction\n" )); - ras.error = Raster_Err_Invalid; + ras.error = FT_THROW( Invalid ); return FAILURE; } @@ -797,8 +808,7 @@ static Bool End_Profile( RAS_ARGS Bool overshoot ) { - Long h; - PProfile oldProfile; + Long h; h = (Long)( ras.top - ras.cProfile->offset ); @@ -806,12 +816,15 @@ if ( h < 0 ) { FT_ERROR(( "End_Profile: negative height encountered\n" )); - ras.error = Raster_Err_Neg_Height; + ras.error = FT_THROW( Neg_Height ); return FAILURE; } if ( h > 0 ) { + PProfile oldProfile; + + FT_TRACE6(( "Ending profile %p, start = %ld, height = %ld\n", ras.cProfile, ras.cProfile->start, h )); @@ -839,7 +852,7 @@ if ( ras.top >= ras.maxBuff ) { FT_TRACE1(( "overflow in End_Profile\n" )); - ras.error = Raster_Err_Overflow; + ras.error = FT_THROW( Overflow ); return FAILURE; } @@ -868,7 +881,7 @@ Insert_Y_Turn( RAS_ARGS Int y ) { PLong y_turns; - Int y2, n; + Int n; n = ras.numTurns - 1; @@ -882,7 +895,9 @@ if ( n >= 0 && y > y_turns[n] ) while ( n >= 0 ) { - y2 = (Int)y_turns[n]; + Int y2 = (Int)y_turns[n]; + + y_turns[n] = y; y = y2; n--; @@ -893,7 +908,7 @@ ras.maxBuff--; if ( ras.maxBuff <= ras.top ) { - ras.error = Raster_Err_Overflow; + ras.error = FT_THROW( Overflow ); return FAILURE; } ras.numTurns++; @@ -918,7 +933,6 @@ static Bool Finalize_Profile_Table( RAS_ARG ) { - Int bottom, top; UShort n; PProfile p; @@ -930,6 +944,9 @@ { while ( n > 0 ) { + Int bottom, top; + + if ( n > 1 ) p->link = (PProfile)( p->offset + p->height ); else @@ -1144,20 +1161,20 @@ size = e2 - e1 + 1; if ( ras.top + size >= ras.maxBuff ) { - ras.error = Raster_Err_Overflow; + ras.error = FT_THROW( Overflow ); return FAILURE; } if ( Dx > 0 ) { - Ix = SMulDiv( ras.precision, Dx, Dy); + Ix = SMulDiv_No_Round( ras.precision, Dx, Dy ); Rx = ( ras.precision * Dx ) % Dy; Dx = 1; } else { - Ix = SMulDiv( ras.precision, -Dx, Dy) * -1; - Rx = ( ras.precision * -Dx ) % Dy; + Ix = -SMulDiv_No_Round( ras.precision, -Dx, Dy ); + Rx = ( ras.precision * -Dx ) % Dy; Dx = -1; } @@ -1319,7 +1336,7 @@ if ( ( top + TRUNC( e2 - e ) + 1 ) >= ras.maxBuff ) { ras.top = top; - ras.error = Raster_Err_Overflow; + ras.error = FT_THROW( Overflow ); return FAILURE; } @@ -1857,7 +1874,7 @@ v_start.x = ( v_start.x + v_last.x ) / 2; v_start.y = ( v_start.y + v_last.y ) / 2; - v_last = v_start; + /* v_last = v_start; */ } point--; tags--; @@ -1994,7 +2011,7 @@ return SUCCESS; Invalid_Outline: - ras.error = Raster_Err_Invalid; + ras.error = FT_THROW( Invalid ); Fail: return FAILURE; @@ -2023,8 +2040,6 @@ int i; unsigned start; - PProfile lastProfile; - ras.fProfile = NULL; ras.joint = FALSE; @@ -2042,7 +2057,8 @@ for ( i = 0; i < ras.outline.n_contours; i++ ) { - Bool o; + PProfile lastProfile; + Bool o; ras.state = Unknown_State; @@ -2266,10 +2282,10 @@ PProfile right ) { Long e1, e2; - int c1, c2; - Byte f1, f2; Byte* target; + Int dropOutControl = left->flags & 7; + FT_UNUSED( y ); FT_UNUSED( left ); FT_UNUSED( right ); @@ -2279,13 +2295,18 @@ e1 = TRUNC( CEILING( x1 ) ); - if ( x2 - x1 - ras.precision <= ras.precision_jitter ) + if ( dropOutControl != 2 && + x2 - x1 - ras.precision <= ras.precision_jitter ) e2 = e1; else e2 = TRUNC( FLOOR( x2 ) ); if ( e2 >= 0 && e1 < ras.bWidth ) { + int c1, c2; + Byte f1, f2; + + if ( e1 < 0 ) e1 = 0; if ( e2 >= ras.bWidth ) @@ -2509,27 +2530,30 @@ PProfile left, PProfile right ) { - Long e1, e2; - PByte bits; - Byte f1; - FT_UNUSED( left ); FT_UNUSED( right ); if ( x2 - x1 < ras.precision ) { + Long e1, e2; + + e1 = CEILING( x1 ); e2 = FLOOR ( x2 ); if ( e1 == e2 ) { + Byte f1; + PByte bits; + + bits = ras.bTarget + ( y >> 3 ); f1 = (Byte)( 0x80 >> ( y & 7 ) ); e1 = TRUNC( e1 ); - if ( e1 >= 0 && e1 < ras.target.rows ) + if ( e1 >= 0 && (ULong)e1 < ras.target.rows ) { PByte p; @@ -2623,7 +2647,7 @@ /* bounding box instead */ if ( pxl < 0 ) pxl = e1; - else if ( TRUNC( pxl ) >= ras.target.rows ) + else if ( (ULong)( TRUNC( pxl ) ) >= ras.target.rows ) pxl = e2; /* check that the other pixel isn't set */ @@ -2638,9 +2662,9 @@ if ( ras.target.pitch > 0 ) bits += ( ras.target.rows - 1 ) * ras.target.pitch; - if ( e1 >= 0 && - e1 < ras.target.rows && - *bits & f1 ) + if ( e1 >= 0 && + (ULong)e1 < ras.target.rows && + *bits & f1 ) return; } else @@ -2652,7 +2676,7 @@ e1 = TRUNC( pxl ); - if ( e1 >= 0 && e1 < ras.target.rows ) + if ( e1 >= 0 && (ULong)e1 < ras.target.rows ) { bits -= e1 * ras.target.pitch; if ( ras.target.pitch > 0 ) @@ -2720,8 +2744,6 @@ static void Vertical_Gray_Sweep_Step( RAS_ARG ) { - Int c1, c2; - PByte pix, bit, bit2; short* count = (short*)count_table; Byte* grays; @@ -2730,6 +2752,9 @@ if ( ras.traceOfs > ras.gray_width ) { + PByte pix; + + pix = ras.gTarget + ras.traceG + ras.gray_min_x * 4; grays = ras.grays; @@ -2740,6 +2765,9 @@ Int last_bit = last_pixel & 3; Bool over = 0; + Int c1, c2; + PByte bit, bit2; + if ( ras.gray_max_x >= last_cell && last_bit != 3 ) { @@ -2832,7 +2860,6 @@ { Long e1, e2; PByte pixel; - Byte color; /* During the horizontal sweep, we only take care of drop-outs */ @@ -2886,6 +2913,9 @@ if ( e1 >= 0 ) { + Byte color; + + if ( x2 - x1 >= ras.precision_half ) color = ras.grays[2]; else @@ -2963,7 +2993,7 @@ /* check the Y-turns */ if ( ras.numTurns == 0 ) { - ras.error = Raster_Err_Invalid; + ras.error = FT_THROW( Invalid ); return FAILURE; } @@ -3204,7 +3234,7 @@ if ( ras.band_top >= 7 || k < i ) { ras.band_top = 0; - ras.error = Raster_Err_Invalid; + ras.error = FT_THROW( Invalid ); return ras.error; } @@ -3393,7 +3423,7 @@ { FT_UNUSED_RASTER; - return Raster_Err_Unsupported; + return FT_THROW( Unsupported ); } #endif /* !FT_RASTER_OPTION_ANTI_ALIASING */ @@ -3498,7 +3528,8 @@ raster->buffer = pool_base + ( ( sizeof ( *worker ) + 7 ) & ~7 ); - raster->buffer_size = pool_base + pool_size - (char*)raster->buffer; + raster->buffer_size = (long)( pool_base + pool_size - + (char*)raster->buffer ); raster->worker = worker; } else @@ -3511,7 +3542,7 @@ } - static void + static int ft_black_set_mode( black_PRaster raster, unsigned long mode, const char* palette ) @@ -3535,6 +3566,8 @@ FT_UNUSED( palette ); #endif + + return 0; } @@ -3548,37 +3581,37 @@ if ( !raster || !raster->buffer || !raster->buffer_size ) - return Raster_Err_Not_Ini; + return FT_THROW( Not_Ini ); if ( !outline ) - return Raster_Err_Invalid; + return FT_THROW( Invalid ); /* return immediately if the outline is empty */ if ( outline->n_points == 0 || outline->n_contours <= 0 ) return Raster_Err_None; if ( !outline->contours || !outline->points ) - return Raster_Err_Invalid; + return FT_THROW( Invalid ); if ( outline->n_points != outline->contours[outline->n_contours - 1] + 1 ) - return Raster_Err_Invalid; + return FT_THROW( Invalid ); worker = raster->worker; /* this version of the raster does not support direct rendering, sorry */ if ( params->flags & FT_RASTER_FLAG_DIRECT ) - return Raster_Err_Unsupported; + return FT_THROW( Unsupported ); if ( !target_map ) - return Raster_Err_Invalid; + return FT_THROW( Invalid ); /* nothing to do */ if ( !target_map->width || !target_map->rows ) return Raster_Err_None; if ( !target_map->buffer ) - return Raster_Err_Invalid; + return FT_THROW( Invalid ); ras.outline = *outline; ras.target = *target_map; diff --git a/src/raster/ftrend1.c b/src/raster/ftrend1.c index 859cb7d..aa7f6d5 100644 --- a/src/raster/ftrend1.c +++ b/src/raster/ftrend1.c @@ -4,7 +4,7 @@ /* */ /* The FreeType glyph rasterizer interface (body). */ /* */ -/* Copyright 1996-2003, 2005, 2006, 2011 by */ +/* Copyright 1996-2003, 2005, 2006, 2011, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -17,6 +17,7 @@ #include <ft2build.h> +#include FT_INTERNAL_DEBUG_H #include FT_INTERNAL_OBJECTS_H #include FT_OUTLINE_H #include "ftrend1.h" @@ -37,7 +38,7 @@ library->raster_pool, library->raster_pool_size ); - return Raster_Err_Ok; + return FT_Err_Ok; } @@ -61,12 +62,12 @@ const FT_Matrix* matrix, const FT_Vector* delta ) { - FT_Error error = Raster_Err_Ok; + FT_Error error = FT_Err_Ok; if ( slot->format != render->glyph_format ) { - error = Raster_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Exit; } @@ -114,7 +115,7 @@ /* check glyph image format */ if ( slot->format != render->glyph_format ) { - error = Raster_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Exit; } @@ -124,13 +125,13 @@ { /* raster1 is only capable of producing monochrome bitmaps */ if ( render->clazz == &ft_raster1_renderer_class ) - return Raster_Err_Cannot_Render_Glyph; + return FT_THROW( Cannot_Render_Glyph ); } else { /* raster5 is only capable of producing 5-gray-levels bitmaps */ if ( render->clazz == &ft_raster5_renderer_class ) - return Raster_Err_Cannot_Render_Glyph; + return FT_THROW( Cannot_Render_Glyph ); } #else /* FT_CONFIG_OPTION_PIC */ /* When PIC is enabled, we cannot get to the class object */ @@ -142,13 +143,13 @@ { /* raster1 is only capable of producing monochrome bitmaps */ if ( render->clazz->root.module_name[6] == '1' ) - return Raster_Err_Cannot_Render_Glyph; + return FT_THROW( Cannot_Render_Glyph ); } else { /* raster5 is only capable of producing 5-gray-levels bitmaps */ if ( render->clazz->root.module_name[6] == '5' ) - return Raster_Err_Cannot_Render_Glyph; + return FT_THROW( Cannot_Render_Glyph ); } #endif /* FT_CONFIG_OPTION_PIC */ @@ -179,7 +180,7 @@ if ( width > FT_USHORT_MAX || height > FT_USHORT_MAX ) { - error = Raster_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Exit; } diff --git a/src/raster/rastpic.c b/src/raster/rastpic.c index 2883e3f..5e9f7cc 100644 --- a/src/raster/rastpic.c +++ b/src/raster/rastpic.c @@ -4,7 +4,7 @@ /* */ /* The FreeType position independent code services for raster module. */ /* */ -/* Copyright 2009, 2010 by */ +/* Copyright 2009, 2010, 2012, 2013 by */ /* Oran Agra and Mickey Gabel. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -22,22 +22,26 @@ #include "rastpic.h" #include "rasterrs.h" + #ifdef FT_CONFIG_OPTION_PIC /* forward declaration of PIC init functions from ftraster.c */ void FT_Init_Class_ft_standard_raster( FT_Raster_Funcs* funcs ); + void ft_raster1_renderer_class_pic_free( FT_Library library ) { FT_PIC_Container* pic_container = &library->pic_container; - FT_Memory memory = library->memory; + FT_Memory memory = library->memory; if ( pic_container->raster ) { - RasterPIC* container = (RasterPIC*)pic_container->raster; + RasterPIC* container = (RasterPIC*)pic_container->raster; + + if ( --container->ref_count ) return; FT_FREE( container ); @@ -49,14 +53,14 @@ FT_Error ft_raster1_renderer_class_pic_init( FT_Library library ) { - FT_PIC_Container* pic_container = &library->pic_container; - FT_Error error = Raster_Err_Ok; - RasterPIC* container; - FT_Memory memory = library->memory; + FT_PIC_Container* pic_container = &library->pic_container; + FT_Error error = FT_Err_Ok; + RasterPIC* container = NULL; + FT_Memory memory = library->memory; - /* since this function also serve raster5 renderer, - it implements reference counting */ + /* since this function also serves raster5 renderer, */ + /* it implements reference counting */ if ( pic_container->raster ) { ((RasterPIC*)pic_container->raster)->ref_count++; @@ -68,16 +72,17 @@ return error; FT_MEM_SET( container, 0, sizeof ( *container ) ); pic_container->raster = container; + container->ref_count = 1; - /* initialize pointer table - this is how the module usually expects this data */ + /* initialize pointer table - */ + /* this is how the module usually expects this data */ FT_Init_Class_ft_standard_raster( &container->ft_standard_raster ); -/*Exit:*/ - if( error ) - ft_raster1_renderer_class_pic_free( library ); + return error; } + /* re-route these init and free functions to the above functions */ FT_Error ft_raster5_renderer_class_pic_init( FT_Library library ) @@ -85,6 +90,7 @@ return ft_raster1_renderer_class_pic_init( library ); } + void ft_raster5_renderer_class_pic_free( FT_Library library ) { diff --git a/src/raster/rastpic.h b/src/raster/rastpic.h index 7822a24..e0ddba6 100644 --- a/src/raster/rastpic.h +++ b/src/raster/rastpic.h @@ -24,19 +24,25 @@ FT_BEGIN_HEADER #include FT_INTERNAL_PIC_H + #ifndef FT_CONFIG_OPTION_PIC -#define FT_STANDARD_RASTER_GET ft_standard_raster + +#define FT_STANDARD_RASTER_GET ft_standard_raster #else /* FT_CONFIG_OPTION_PIC */ - typedef struct RasterPIC_ + typedef struct RasterPIC_ { - int ref_count; - FT_Raster_Funcs ft_standard_raster; + int ref_count; + FT_Raster_Funcs ft_standard_raster; + } RasterPIC; -#define GET_PIC(lib) ((RasterPIC*)((lib)->pic_container.raster)) -#define FT_STANDARD_RASTER_GET (GET_PIC(library)->ft_standard_raster) + +#define GET_PIC( lib ) \ + ( (RasterPIC*)( (lib)->pic_container.raster ) ) +#define FT_STANDARD_RASTER_GET ( GET_PIC( library )->ft_standard_raster ) + /* see rastpic.c for the implementation */ void diff --git a/src/sfnt/pngshim.c b/src/sfnt/pngshim.c new file mode 100644 index 0000000..9bfcc2a --- /dev/null +++ b/src/sfnt/pngshim.c @@ -0,0 +1,377 @@ +/***************************************************************************/ +/* */ +/* pngshim.c */ +/* */ +/* PNG Bitmap glyph support. */ +/* */ +/* Copyright 2013, 2014 by Google, Inc. */ +/* Written by Stuart Gill and Behdad Esfahbod. */ +/* */ +/* This file is part of the FreeType project, and may only be used, */ +/* modified, and distributed under the terms of the FreeType project */ +/* license, LICENSE.TXT. By continuing to use, modify, or distribute */ +/* this file you indicate that you have read the license and */ +/* understand and accept it fully. */ +/* */ +/***************************************************************************/ + + +#include <ft2build.h> +#include FT_INTERNAL_DEBUG_H +#include FT_INTERNAL_STREAM_H +#include FT_TRUETYPE_TAGS_H +#include FT_CONFIG_STANDARD_LIBRARY_H + + +#ifdef FT_CONFIG_OPTION_USE_PNG + + /* We always include <stjmp.h>, so make libpng shut up! */ +#define PNG_SKIP_SETJMP_CHECK 1 +#include <png.h> +#include "pngshim.h" + +#include "sferrors.h" + + + /* This code is freely based on cairo-png.c. There's so many ways */ + /* to call libpng, and the way cairo does it is defacto standard. */ + + static int + multiply_alpha( int alpha, + int color ) + { + int temp = ( alpha * color ) + 0x80; + + + return ( temp + ( temp >> 8 ) ) >> 8; + } + + + /* Premultiplies data and converts RGBA bytes => native endian. */ + static void + premultiply_data( png_structp png, + png_row_infop row_info, + png_bytep data ) + { + unsigned int i; + + FT_UNUSED( png ); + + + for ( i = 0; i < row_info->rowbytes; i += 4 ) + { + unsigned char* base = &data[i]; + unsigned int alpha = base[3]; + + + if ( alpha == 0 ) + base[0] = base[1] = base[2] = base[3] = 0; + + else + { + unsigned int red = base[0]; + unsigned int green = base[1]; + unsigned int blue = base[2]; + + + if ( alpha != 0xFF ) + { + red = multiply_alpha( alpha, red ); + green = multiply_alpha( alpha, green ); + blue = multiply_alpha( alpha, blue ); + } + + base[0] = blue; + base[1] = green; + base[2] = red; + base[3] = alpha; + } + } + } + + + /* Converts RGBx bytes to BGRA. */ + static void + convert_bytes_to_data( png_structp png, + png_row_infop row_info, + png_bytep data ) + { + unsigned int i; + + FT_UNUSED( png ); + + + for ( i = 0; i < row_info->rowbytes; i += 4 ) + { + unsigned char* base = &data[i]; + unsigned int red = base[0]; + unsigned int green = base[1]; + unsigned int blue = base[2]; + + + base[0] = blue; + base[1] = green; + base[2] = red; + base[3] = 0xFF; + } + } + + + /* Use error callback to avoid png writing to stderr. */ + static void + error_callback( png_structp png, + png_const_charp error_msg ) + { + FT_Error* error = (FT_Error*)png_get_error_ptr( png ); + + FT_UNUSED( error_msg ); + + + *error = FT_THROW( Out_Of_Memory ); +#ifdef PNG_SETJMP_SUPPORTED + ft_longjmp( png_jmpbuf( png ), 1 ); +#endif + /* if we get here, then we have no choice but to abort ... */ + } + + + /* Use warning callback to avoid png writing to stderr. */ + static void + warning_callback( png_structp png, + png_const_charp error_msg ) + { + FT_UNUSED( png ); + FT_UNUSED( error_msg ); + + /* Just ignore warnings. */ + } + + + static void + read_data_from_FT_Stream( png_structp png, + png_bytep data, + png_size_t length ) + { + FT_Error error; + png_voidp p = png_get_io_ptr( png ); + FT_Stream stream = (FT_Stream)p; + + + if ( FT_FRAME_ENTER( length ) ) + { + FT_Error* e = (FT_Error*)png_get_error_ptr( png ); + + + *e = FT_THROW( Invalid_Stream_Read ); + png_error( png, NULL ); + + return; + } + + memcpy( data, stream->cursor, length ); + + FT_FRAME_EXIT(); + } + + + FT_LOCAL_DEF( FT_Error ) + Load_SBit_Png( FT_GlyphSlot slot, + FT_Int x_offset, + FT_Int y_offset, + FT_Int pix_bits, + TT_SBit_Metrics metrics, + FT_Memory memory, + FT_Byte* data, + FT_UInt png_len, + FT_Bool populate_map_and_metrics ) + { + FT_Bitmap *map = &slot->bitmap; + FT_Error error = FT_Err_Ok; + FT_StreamRec stream; + + png_structp png; + png_infop info; + png_uint_32 imgWidth, imgHeight; + + int bitdepth, color_type, interlace; + FT_Int i; + png_byte* *rows = NULL; /* pacify compiler */ + + + if ( x_offset < 0 || + y_offset < 0 ) + { + error = FT_THROW( Invalid_Argument ); + goto Exit; + } + + if ( !populate_map_and_metrics && + ( (FT_UInt)x_offset + metrics->width > map->width || + (FT_UInt)y_offset + metrics->height > map->rows || + pix_bits != 32 || + map->pixel_mode != FT_PIXEL_MODE_BGRA ) ) + { + error = FT_THROW( Invalid_Argument ); + goto Exit; + } + + FT_Stream_OpenMemory( &stream, data, png_len ); + + png = png_create_read_struct( PNG_LIBPNG_VER_STRING, + &error, + error_callback, + warning_callback ); + if ( !png ) + { + error = FT_THROW( Out_Of_Memory ); + goto Exit; + } + + info = png_create_info_struct( png ); + if ( !info ) + { + error = FT_THROW( Out_Of_Memory ); + png_destroy_read_struct( &png, NULL, NULL ); + goto Exit; + } + + if ( ft_setjmp( png_jmpbuf( png ) ) ) + { + error = FT_THROW( Invalid_File_Format ); + goto DestroyExit; + } + + png_set_read_fn( png, &stream, read_data_from_FT_Stream ); + + png_read_info( png, info ); + png_get_IHDR( png, info, + &imgWidth, &imgHeight, + &bitdepth, &color_type, &interlace, + NULL, NULL ); + + if ( error || + ( !populate_map_and_metrics && + ( (FT_Int)imgWidth != metrics->width || + (FT_Int)imgHeight != metrics->height ) ) ) + goto DestroyExit; + + if ( populate_map_and_metrics ) + { + FT_Long size; + + + metrics->width = (FT_Int)imgWidth; + metrics->height = (FT_Int)imgHeight; + + map->width = metrics->width; + map->rows = metrics->height; + map->pixel_mode = FT_PIXEL_MODE_BGRA; + map->pitch = map->width * 4; + map->num_grays = 256; + + /* reject too large bitmaps similarly to the rasterizer */ + if ( map->rows > 0x7FFF || map->width > 0x7FFF ) + { + error = FT_THROW( Array_Too_Large ); + goto DestroyExit; + } + + /* this doesn't overflow: 0x7FFF * 0x7FFF * 4 < 2^32 */ + size = map->rows * map->pitch; + + error = ft_glyphslot_alloc_bitmap( slot, size ); + if ( error ) + goto DestroyExit; + } + + /* convert palette/gray image to rgb */ + if ( color_type == PNG_COLOR_TYPE_PALETTE ) + png_set_palette_to_rgb( png ); + + /* expand gray bit depth if needed */ + if ( color_type == PNG_COLOR_TYPE_GRAY ) + { +#if PNG_LIBPNG_VER >= 10209 + png_set_expand_gray_1_2_4_to_8( png ); +#else + png_set_gray_1_2_4_to_8( png ); +#endif + } + + /* transform transparency to alpha */ + if ( png_get_valid(png, info, PNG_INFO_tRNS ) ) + png_set_tRNS_to_alpha( png ); + + if ( bitdepth == 16 ) + png_set_strip_16( png ); + + if ( bitdepth < 8 ) + png_set_packing( png ); + + /* convert grayscale to RGB */ + if ( color_type == PNG_COLOR_TYPE_GRAY || + color_type == PNG_COLOR_TYPE_GRAY_ALPHA ) + png_set_gray_to_rgb( png ); + + if ( interlace != PNG_INTERLACE_NONE ) + png_set_interlace_handling( png ); + + png_set_filler( png, 0xFF, PNG_FILLER_AFTER ); + + /* recheck header after setting EXPAND options */ + png_read_update_info(png, info ); + png_get_IHDR( png, info, + &imgWidth, &imgHeight, + &bitdepth, &color_type, &interlace, + NULL, NULL ); + + if ( bitdepth != 8 || + !( color_type == PNG_COLOR_TYPE_RGB || + color_type == PNG_COLOR_TYPE_RGB_ALPHA ) ) + { + error = FT_THROW( Invalid_File_Format ); + goto DestroyExit; + } + + switch ( color_type ) + { + default: + /* Shouldn't happen, but fall through. */ + + case PNG_COLOR_TYPE_RGB_ALPHA: + png_set_read_user_transform_fn( png, premultiply_data ); + break; + + case PNG_COLOR_TYPE_RGB: + /* Humm, this smells. Carry on though. */ + png_set_read_user_transform_fn( png, convert_bytes_to_data ); + break; + } + + if ( FT_NEW_ARRAY( rows, imgHeight ) ) + { + error = FT_THROW( Out_Of_Memory ); + goto DestroyExit; + } + + for ( i = 0; i < (FT_Int)imgHeight; i++ ) + rows[i] = map->buffer + ( y_offset + i ) * map->pitch + x_offset * 4; + + png_read_image( png, rows ); + + FT_FREE( rows ); + + png_read_end( png, info ); + + DestroyExit: + png_destroy_read_struct( &png, &info, NULL ); + FT_Stream_Close( &stream ); + + Exit: + return error; + } + +#endif /* FT_CONFIG_OPTION_USE_PNG */ + + +/* END */ diff --git a/src/sfnt/pngshim.h b/src/sfnt/pngshim.h new file mode 100644 index 0000000..dc9ecaf --- /dev/null +++ b/src/sfnt/pngshim.h @@ -0,0 +1,49 @@ +/***************************************************************************/ +/* */ +/* pngshim.h */ +/* */ +/* PNG Bitmap glyph support. */ +/* */ +/* Copyright 2013 by Google, Inc. */ +/* Written by Stuart Gill and Behdad Esfahbod. */ +/* */ +/* This file is part of the FreeType project, and may only be used, */ +/* modified, and distributed under the terms of the FreeType project */ +/* license, LICENSE.TXT. By continuing to use, modify, or distribute */ +/* this file you indicate that you have read the license and */ +/* understand and accept it fully. */ +/* */ +/***************************************************************************/ + + +#ifndef __PNGSHIM_H__ +#define __PNGSHIM_H__ + + +#include <ft2build.h> +#include "ttload.h" + + +FT_BEGIN_HEADER + +#ifdef FT_CONFIG_OPTION_USE_PNG + + FT_LOCAL( FT_Error ) + Load_SBit_Png( FT_GlyphSlot slot, + FT_Int x_offset, + FT_Int y_offset, + FT_Int pix_bits, + TT_SBit_Metrics metrics, + FT_Memory memory, + FT_Byte* data, + FT_UInt png_len, + FT_Bool populate_map_and_metrics ); + +#endif + +FT_END_HEADER + +#endif /* __PNGSHIM_H__ */ + + +/* END */ diff --git a/src/sfnt/rules.mk b/src/sfnt/rules.mk index 02cee58..a6c956a 100644 --- a/src/sfnt/rules.mk +++ b/src/sfnt/rules.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2000, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2011 by +# Copyright 1996-2000, 2002-2007, 2009, 2011, 2013 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -34,15 +34,13 @@ SFNT_DRV_SRC := $(SFNT_DIR)/ttload.c \ $(SFNT_DIR)/ttbdf.c \ $(SFNT_DIR)/sfobjs.c \ $(SFNT_DIR)/sfdriver.c \ - $(SFNT_DIR)/sfntpic.c + $(SFNT_DIR)/sfntpic.c \ + $(SFNT_DIR)/pngshim.c # SFNT driver headers # -# Note that ttsbit0.c gets #included by ttsbit.c. -# SFNT_DRV_H := $(SFNT_DRV_SRC:%c=%h) \ - $(SFNT_DIR)/sferrors.h \ - $(SFNT_DIR)/ttsbit0.c + $(SFNT_DIR)/sferrors.h # SFNT driver object(s) diff --git a/src/sfnt/sfdriver.c b/src/sfnt/sfdriver.c index 847d83d..badb159 100644 --- a/src/sfnt/sfdriver.c +++ b/src/sfnt/sfdriver.c @@ -4,7 +4,7 @@ /* */ /* High-level SFNT driver interface (body). */ /* */ -/* Copyright 1996-2007, 2009-2011 by */ +/* Copyright 1996-2007, 2009-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -50,6 +50,7 @@ #include FT_SERVICE_SFNT_H #include FT_SERVICE_TT_CMAP_H + /*************************************************************************/ /* */ /* The macro FT_COMPONENT is used in trace mode. It is an implicit */ @@ -60,10 +61,10 @@ #define FT_COMPONENT trace_sfdriver - /* - * SFNT TABLE SERVICE - * - */ + /* + * SFNT TABLE SERVICE + * + */ static void* get_sfnt_table( TT_Face face, @@ -74,36 +75,36 @@ switch ( tag ) { - case ft_sfnt_head: + case FT_SFNT_HEAD: table = &face->header; break; - case ft_sfnt_hhea: + case FT_SFNT_HHEA: table = &face->horizontal; break; - case ft_sfnt_vhea: - table = face->vertical_info ? &face->vertical : 0; + case FT_SFNT_VHEA: + table = face->vertical_info ? &face->vertical : NULL; break; - case ft_sfnt_os2: - table = face->os2.version == 0xFFFFU ? 0 : &face->os2; + case FT_SFNT_OS2: + table = face->os2.version == 0xFFFFU ? NULL : &face->os2; break; - case ft_sfnt_post: + case FT_SFNT_POST: table = &face->postscript; break; - case ft_sfnt_maxp: + case FT_SFNT_MAXP: table = &face->max_profile; break; - case ft_sfnt_pclt: - table = face->pclt.Version ? &face->pclt : 0; + case FT_SFNT_PCLT: + table = face->pclt.Version ? &face->pclt : NULL; break; default: - table = 0; + table = NULL; } return table; @@ -118,37 +119,37 @@ FT_ULong *length ) { if ( !offset || !length ) - return SFNT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); if ( !tag ) *length = face->num_tables; else { if ( idx >= face->num_tables ) - return SFNT_Err_Table_Missing; + return FT_THROW( Table_Missing ); *tag = face->dir_tables[idx].Tag; *offset = face->dir_tables[idx].Offset; *length = face->dir_tables[idx].Length; } - return SFNT_Err_Ok; + return FT_Err_Ok; } - FT_DEFINE_SERVICE_SFNT_TABLEREC(sfnt_service_sfnt_table, + FT_DEFINE_SERVICE_SFNT_TABLEREC( + sfnt_service_sfnt_table, (FT_SFNT_TableLoadFunc)tt_face_load_any, (FT_SFNT_TableGetFunc) get_sfnt_table, - (FT_SFNT_TableInfoFunc)sfnt_table_info - ) + (FT_SFNT_TableInfoFunc)sfnt_table_info ) #ifdef TT_CONFIG_OPTION_POSTSCRIPT_NAMES - /* - * GLYPH DICT SERVICE - * - */ + /* + * GLYPH DICT SERVICE + * + */ static FT_Error sfnt_get_glyph_name( TT_Face face, @@ -172,17 +173,18 @@ sfnt_get_name_index( TT_Face face, FT_String* glyph_name ) { - FT_Face root = &face->root; - FT_UInt i, max_gid = FT_UINT_MAX; + FT_Face root = &face->root; + + FT_UInt i, max_gid = FT_UINT_MAX; if ( root->num_glyphs < 0 ) return 0; - else if ( ( FT_ULong ) root->num_glyphs < FT_UINT_MAX ) - max_gid = ( FT_UInt ) root->num_glyphs; + else if ( (FT_ULong)root->num_glyphs < FT_UINT_MAX ) + max_gid = (FT_UInt)root->num_glyphs; else FT_TRACE0(( "Ignore glyph names for invalid GID 0x%08x - 0x%08x\n", - FT_UINT_MAX, root->num_glyphs )); + FT_UINT_MAX, root->num_glyphs )); for ( i = 0; i < max_gid; i++ ) { @@ -201,18 +203,19 @@ } - FT_DEFINE_SERVICE_GLYPHDICTREC(sfnt_service_glyph_dict, + FT_DEFINE_SERVICE_GLYPHDICTREC( + sfnt_service_glyph_dict, (FT_GlyphDict_GetNameFunc) sfnt_get_glyph_name, - (FT_GlyphDict_NameIndexFunc)sfnt_get_name_index - ) + (FT_GlyphDict_NameIndexFunc)sfnt_get_name_index ) + #endif /* TT_CONFIG_OPTION_POSTSCRIPT_NAMES */ - /* - * POSTSCRIPT NAME SERVICE - * - */ + /* + * POSTSCRIPT NAME SERVICE + * + */ static const char* sfnt_get_ps_name( TT_Face face ) @@ -254,7 +257,7 @@ FT_Memory memory = face->root.memory; TT_NameEntryRec* name = face->name_table.names + found_win; FT_UInt len = name->stringLength / 2; - FT_Error error = SFNT_Err_Ok; + FT_Error error = FT_Err_Ok; FT_UNUSED( error ); @@ -263,7 +266,7 @@ { FT_Stream stream = face->name_table.stream; FT_String* r = (FT_String*)result; - FT_Byte* p = (FT_Byte*)name->string; + FT_Byte* p; if ( FT_STREAM_SEEK( name->stringOffset ) || @@ -296,7 +299,7 @@ FT_Memory memory = face->root.memory; TT_NameEntryRec* name = face->name_table.names + found_apple; FT_UInt len = name->stringLength; - FT_Error error = SFNT_Err_Ok; + FT_Error error = FT_Err_Ok; FT_UNUSED( error ); @@ -324,17 +327,18 @@ return result; } - FT_DEFINE_SERVICE_PSFONTNAMEREC(sfnt_service_ps_name, - (FT_PsName_GetFunc)sfnt_get_ps_name - ) + + FT_DEFINE_SERVICE_PSFONTNAMEREC( + sfnt_service_ps_name, + (FT_PsName_GetFunc)sfnt_get_ps_name ) /* * TT CMAP INFO */ - FT_DEFINE_SERVICE_TTCMAPSREC(tt_service_get_cmap_info, - (TT_CMap_Info_GetFunc)tt_get_cmap_info - ) + FT_DEFINE_SERVICE_TTCMAPSREC( + tt_service_get_cmap_info, + (TT_CMap_Info_GetFunc)tt_get_cmap_info ) #ifdef TT_CONFIG_OPTION_BDF @@ -367,7 +371,7 @@ *acharset_registry = registry.u.atom; } else - error = SFNT_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); } } @@ -375,10 +379,11 @@ } - FT_DEFINE_SERVICE_BDFRec(sfnt_service_bdf, - (FT_BDF_GetCharsetIdFunc) sfnt_get_charset_id, - (FT_BDF_GetPropertyFunc) tt_face_find_bdf_prop - ) + FT_DEFINE_SERVICE_BDFRec( + sfnt_service_bdf, + (FT_BDF_GetCharsetIdFunc)sfnt_get_charset_id, + (FT_BDF_GetPropertyFunc) tt_face_find_bdf_prop ) + #endif /* TT_CONFIG_OPTION_BDF */ @@ -388,33 +393,33 @@ */ #if defined TT_CONFIG_OPTION_POSTSCRIPT_NAMES && defined TT_CONFIG_OPTION_BDF - FT_DEFINE_SERVICEDESCREC5(sfnt_services, - FT_SERVICE_ID_SFNT_TABLE, &FT_SFNT_SERVICE_SFNT_TABLE_GET, - FT_SERVICE_ID_POSTSCRIPT_FONT_NAME, &FT_SFNT_SERVICE_PS_NAME_GET, - FT_SERVICE_ID_GLYPH_DICT, &FT_SFNT_SERVICE_GLYPH_DICT_GET, - FT_SERVICE_ID_BDF, &FT_SFNT_SERVICE_BDF_GET, - FT_SERVICE_ID_TT_CMAP, &FT_TT_SERVICE_GET_CMAP_INFO_GET - ) + FT_DEFINE_SERVICEDESCREC5( + sfnt_services, + FT_SERVICE_ID_SFNT_TABLE, &SFNT_SERVICE_SFNT_TABLE_GET, + FT_SERVICE_ID_POSTSCRIPT_FONT_NAME, &SFNT_SERVICE_PS_NAME_GET, + FT_SERVICE_ID_GLYPH_DICT, &SFNT_SERVICE_GLYPH_DICT_GET, + FT_SERVICE_ID_BDF, &SFNT_SERVICE_BDF_GET, + FT_SERVICE_ID_TT_CMAP, &TT_SERVICE_CMAP_INFO_GET ) #elif defined TT_CONFIG_OPTION_POSTSCRIPT_NAMES - FT_DEFINE_SERVICEDESCREC4(sfnt_services, - FT_SERVICE_ID_SFNT_TABLE, &FT_SFNT_SERVICE_SFNT_TABLE_GET, - FT_SERVICE_ID_POSTSCRIPT_FONT_NAME, &FT_SFNT_SERVICE_PS_NAME_GET, - FT_SERVICE_ID_GLYPH_DICT, &FT_SFNT_SERVICE_GLYPH_DICT_GET, - FT_SERVICE_ID_TT_CMAP, &FT_TT_SERVICE_GET_CMAP_INFO_GET - ) + FT_DEFINE_SERVICEDESCREC4( + sfnt_services, + FT_SERVICE_ID_SFNT_TABLE, &SFNT_SERVICE_SFNT_TABLE_GET, + FT_SERVICE_ID_POSTSCRIPT_FONT_NAME, &SFNT_SERVICE_PS_NAME_GET, + FT_SERVICE_ID_GLYPH_DICT, &SFNT_SERVICE_GLYPH_DICT_GET, + FT_SERVICE_ID_TT_CMAP, &TT_SERVICE_CMAP_INFO_GET ) #elif defined TT_CONFIG_OPTION_BDF - FT_DEFINE_SERVICEDESCREC4(sfnt_services, - FT_SERVICE_ID_SFNT_TABLE, &FT_SFNT_SERVICE_SFNT_TABLE_GET, - FT_SERVICE_ID_POSTSCRIPT_FONT_NAME, &FT_SFNT_SERVICE_PS_NAME_GET, - FT_SERVICE_ID_BDF, &FT_SFNT_SERVICE_BDF_GET, - FT_SERVICE_ID_TT_CMAP, &FT_TT_SERVICE_GET_CMAP_INFO_GET - ) + FT_DEFINE_SERVICEDESCREC4( + sfnt_services, + FT_SERVICE_ID_SFNT_TABLE, &SFNT_SERVICE_SFNT_TABLE_GET, + FT_SERVICE_ID_POSTSCRIPT_FONT_NAME, &SFNT_SERVICE_PS_NAME_GET, + FT_SERVICE_ID_BDF, &SFNT_SERVICE_BDF_GET, + FT_SERVICE_ID_TT_CMAP, &TT_SERVICE_CMAP_INFO_GET ) #else - FT_DEFINE_SERVICEDESCREC3(sfnt_services, - FT_SERVICE_ID_SFNT_TABLE, &FT_SFNT_SERVICE_SFNT_TABLE_GET, - FT_SERVICE_ID_POSTSCRIPT_FONT_NAME, &FT_SFNT_SERVICE_PS_NAME_GET, - FT_SERVICE_ID_TT_CMAP, &FT_TT_SERVICE_GET_CMAP_INFO_GET - ) + FT_DEFINE_SERVICEDESCREC3( + sfnt_services, + FT_SERVICE_ID_SFNT_TABLE, &SFNT_SERVICE_SFNT_TABLE_GET, + FT_SERVICE_ID_POSTSCRIPT_FONT_NAME, &SFNT_SERVICE_PS_NAME_GET, + FT_SERVICE_ID_TT_CMAP, &TT_SERVICE_CMAP_INFO_GET ) #endif @@ -422,7 +427,7 @@ sfnt_get_interface( FT_Module module, const char* module_interface ) { - /* FT_SFNT_SERVICES_GET derefers `library' in PIC mode */ + /* SFNT_SERVICES_GET dereferences `library' in PIC mode */ #ifdef FT_CONFIG_OPTION_PIC FT_Library library; @@ -435,149 +440,25 @@ #else FT_UNUSED( module ); #endif - return ft_service_list_lookup( FT_SFNT_SERVICES_GET, module_interface ); - } - - -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS - - FT_CALLBACK_DEF( FT_Error ) - tt_face_load_sfnt_header_stub( TT_Face face, - FT_Stream stream, - FT_Long face_index, - SFNT_Header header ) - { - FT_UNUSED( face ); - FT_UNUSED( stream ); - FT_UNUSED( face_index ); - FT_UNUSED( header ); - - return SFNT_Err_Unimplemented_Feature; - } - - - FT_CALLBACK_DEF( FT_Error ) - tt_face_load_directory_stub( TT_Face face, - FT_Stream stream, - SFNT_Header header ) - { - FT_UNUSED( face ); - FT_UNUSED( stream ); - FT_UNUSED( header ); - - return SFNT_Err_Unimplemented_Feature; - } - - - FT_CALLBACK_DEF( FT_Error ) - tt_face_load_hdmx_stub( TT_Face face, - FT_Stream stream ) - { - FT_UNUSED( face ); - FT_UNUSED( stream ); - - return SFNT_Err_Unimplemented_Feature; - } - - - FT_CALLBACK_DEF( void ) - tt_face_free_hdmx_stub( TT_Face face ) - { - FT_UNUSED( face ); - } - - - FT_CALLBACK_DEF( FT_Error ) - tt_face_set_sbit_strike_stub( TT_Face face, - FT_UInt x_ppem, - FT_UInt y_ppem, - FT_ULong* astrike_index ) - { - /* - * We simply forge a FT_Size_Request and call the real function - * that does all the work. - * - * This stub might be called by libXfont in the X.Org Xserver, - * compiled against version 2.1.8 or newer. - */ - - FT_Size_RequestRec req; - - - req.type = FT_SIZE_REQUEST_TYPE_NOMINAL; - req.width = (FT_F26Dot6)x_ppem; - req.height = (FT_F26Dot6)y_ppem; - req.horiResolution = 0; - req.vertResolution = 0; - - *astrike_index = 0x7FFFFFFFUL; - return tt_face_set_sbit_strike( face, &req, astrike_index ); + return ft_service_list_lookup( SFNT_SERVICES_GET, module_interface ); } - FT_CALLBACK_DEF( FT_Error ) - tt_face_load_sbit_stub( TT_Face face, - FT_Stream stream ) - { - FT_UNUSED( face ); - FT_UNUSED( stream ); - - /* - * This function was originally implemented to load the sbit table. - * However, it has been replaced by `tt_face_load_eblc', and this stub - * is only there for some rogue clients which would want to call it - * directly (which doesn't make much sense). - */ - return SFNT_Err_Unimplemented_Feature; - } - - - FT_CALLBACK_DEF( void ) - tt_face_free_sbit_stub( TT_Face face ) - { - /* nothing to do in this stub */ - FT_UNUSED( face ); - } - - - FT_CALLBACK_DEF( FT_Error ) - tt_face_load_charmap_stub( TT_Face face, - void* cmap, - FT_Stream input ) - { - FT_UNUSED( face ); - FT_UNUSED( cmap ); - FT_UNUSED( input ); - - return SFNT_Err_Unimplemented_Feature; - } - - - FT_CALLBACK_DEF( FT_Error ) - tt_face_free_charmap_stub( TT_Face face, - void* cmap ) - { - FT_UNUSED( face ); - FT_UNUSED( cmap ); - - return SFNT_Err_Ok; - } - -#endif /* FT_CONFIG_OPTION_OLD_INTERNALS */ - #ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS -#define PUT_EMBEDDED_BITMAPS(a) a +#define PUT_EMBEDDED_BITMAPS( a ) a #else -#define PUT_EMBEDDED_BITMAPS(a) 0 +#define PUT_EMBEDDED_BITMAPS( a ) NULL #endif + #ifdef TT_CONFIG_OPTION_POSTSCRIPT_NAMES -#define PUT_PS_NAMES(a) a +#define PUT_PS_NAMES( a ) a #else -#define PUT_PS_NAMES(a) 0 +#define PUT_PS_NAMES( a ) NULL #endif - FT_DEFINE_SFNT_INTERFACE(sfnt_interface, + FT_DEFINE_SFNT_INTERFACE( + sfnt_interface, tt_face_goto_table, sfnt_init_face, @@ -587,9 +468,6 @@ tt_face_load_any, - tt_face_load_sfnt_header_stub, /* FT_CONFIG_OPTION_OLD_INTERNALS */ - tt_face_load_directory_stub, /* FT_CONFIG_OPTION_OLD_INTERNALS */ - tt_face_load_head, tt_face_load_hhea, tt_face_load_cmap, @@ -600,54 +478,39 @@ tt_face_load_name, tt_face_free_name, - tt_face_load_hdmx_stub, /* FT_CONFIG_OPTION_OLD_INTERNALS */ - tt_face_free_hdmx_stub, /* FT_CONFIG_OPTION_OLD_INTERNALS */ - tt_face_load_kern, tt_face_load_gasp, tt_face_load_pclt, /* see `ttload.h' */ - PUT_EMBEDDED_BITMAPS(tt_face_load_bhed), - - tt_face_set_sbit_strike_stub, /* FT_CONFIG_OPTION_OLD_INTERNALS */ - tt_face_load_sbit_stub, /* FT_CONFIG_OPTION_OLD_INTERNALS */ - - tt_find_sbit_image, /* FT_CONFIG_OPTION_OLD_INTERNALS */ - tt_load_sbit_metrics, /* FT_CONFIG_OPTION_OLD_INTERNALS */ - - PUT_EMBEDDED_BITMAPS(tt_face_load_sbit_image), + PUT_EMBEDDED_BITMAPS( tt_face_load_bhed ), - tt_face_free_sbit_stub, /* FT_CONFIG_OPTION_OLD_INTERNALS */ + PUT_EMBEDDED_BITMAPS( tt_face_load_sbit_image ), /* see `ttpost.h' */ - PUT_PS_NAMES(tt_face_get_ps_name), - PUT_PS_NAMES(tt_face_free_ps_names), - - tt_face_load_charmap_stub, /* FT_CONFIG_OPTION_OLD_INTERNALS */ - tt_face_free_charmap_stub, /* FT_CONFIG_OPTION_OLD_INTERNALS */ + PUT_PS_NAMES( tt_face_get_ps_name ), + PUT_PS_NAMES( tt_face_free_ps_names ), /* since version 2.1.8 */ - tt_face_get_kerning, /* since version 2.2 */ - tt_face_load_font_dir, tt_face_load_hmtx, /* see `ttsbit.h' and `sfnt.h' */ - PUT_EMBEDDED_BITMAPS(tt_face_load_eblc), - PUT_EMBEDDED_BITMAPS(tt_face_free_eblc), + PUT_EMBEDDED_BITMAPS( tt_face_load_sbit ), + PUT_EMBEDDED_BITMAPS( tt_face_free_sbit ), - PUT_EMBEDDED_BITMAPS(tt_face_set_sbit_strike), - PUT_EMBEDDED_BITMAPS(tt_face_load_strike_metrics), + PUT_EMBEDDED_BITMAPS( tt_face_set_sbit_strike ), + PUT_EMBEDDED_BITMAPS( tt_face_load_strike_metrics ), tt_face_get_metrics ) - FT_DEFINE_MODULE(sfnt_module_class, + FT_DEFINE_MODULE( + sfnt_module_class, 0, /* not a font driver or renderer */ sizeof ( FT_ModuleRec ), @@ -656,12 +519,11 @@ 0x10000L, /* driver version 1.0 */ 0x20000L, /* driver requires FreeType 2.0 or higher */ - (const void*)&FT_SFNT_INTERFACE_GET, /* module specific interface */ + (const void*)&SFNT_INTERFACE_GET, /* module specific interface */ (FT_Module_Constructor)0, (FT_Module_Destructor) 0, - (FT_Module_Requester) sfnt_get_interface - ) + (FT_Module_Requester) sfnt_get_interface ) /* END */ diff --git a/src/sfnt/sferrors.h b/src/sfnt/sferrors.h index 564a3fe..e981e1d 100644 --- a/src/sfnt/sferrors.h +++ b/src/sfnt/sferrors.h @@ -4,7 +4,7 @@ /* */ /* SFNT error codes (specification only). */ /* */ -/* Copyright 2001, 2004, 2012 by */ +/* Copyright 2001, 2004, 2012, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -33,8 +33,6 @@ #define FT_ERR_PREFIX SFNT_Err_ #define FT_ERR_BASE FT_Mod_Err_SFNT -#define FT_KEEP_ERR_PREFIX - #include FT_ERRORS_H #endif /* __SFERRORS_H__ */ diff --git a/src/sfnt/sfnt.c b/src/sfnt/sfnt.c index fc507b4..d62ed4e 100644 --- a/src/sfnt/sfnt.c +++ b/src/sfnt/sfnt.c @@ -4,7 +4,7 @@ /* */ /* Single object library component. */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006 by */ +/* Copyright 1996-2006, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -28,6 +28,7 @@ #include "sfdriver.c" #ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS +#include "pngshim.c" #include "ttsbit.c" #endif diff --git a/src/sfnt/sfntpic.c b/src/sfnt/sfntpic.c index 1372376..b3fb24b 100644 --- a/src/sfnt/sfntpic.c +++ b/src/sfnt/sfntpic.c @@ -4,7 +4,7 @@ /* */ /* The FreeType position independent code services for sfnt module. */ /* */ -/* Copyright 2009, 2010 by */ +/* Copyright 2009, 2010, 2012, 2013 by */ /* Oran Agra and Mickey Gabel. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -22,57 +22,52 @@ #include "sfntpic.h" #include "sferrors.h" + #ifdef FT_CONFIG_OPTION_PIC /* forward declaration of PIC init functions from sfdriver.c */ FT_Error FT_Create_Class_sfnt_services( FT_Library library, - FT_ServiceDescRec** ouput_class ); - + FT_ServiceDescRec** output_class ); void FT_Destroy_Class_sfnt_services( FT_Library library, FT_ServiceDescRec* clazz ); - void FT_Init_Class_sfnt_service_bdf( FT_Service_BDFRec* clazz ); - void FT_Init_Class_sfnt_interface( FT_Library library, SFNT_Interface* clazz ); - void FT_Init_Class_sfnt_service_glyph_dict( FT_Library library, FT_Service_GlyphDictRec* clazz ); - void FT_Init_Class_sfnt_service_ps_name( FT_Library library, FT_Service_PsFontNameRec* clazz ); - void FT_Init_Class_tt_service_get_cmap_info( FT_Library library, FT_Service_TTCMapsRec* clazz ); - void FT_Init_Class_sfnt_service_sfnt_table( FT_Service_SFNT_TableRec* clazz ); + /* forward declaration of PIC init functions from ttcmap.c */ FT_Error FT_Create_Class_tt_cmap_classes( FT_Library library, TT_CMap_Class** output_class ); - void FT_Destroy_Class_tt_cmap_classes( FT_Library library, TT_CMap_Class* clazz ); + void sfnt_module_class_pic_free( FT_Library library ) { FT_PIC_Container* pic_container = &library->pic_container; - FT_Memory memory = library->memory; + FT_Memory memory = library->memory; if ( pic_container->sfnt ) @@ -84,10 +79,12 @@ FT_Destroy_Class_sfnt_services( library, container->sfnt_services ); container->sfnt_services = NULL; + if ( container->tt_cmap_classes ) FT_Destroy_Class_tt_cmap_classes( library, container->tt_cmap_classes ); container->tt_cmap_classes = NULL; + FT_FREE( container ); pic_container->sfnt = NULL; } @@ -95,25 +92,27 @@ FT_Error - sfnt_module_class_pic_init( FT_Library library ) + sfnt_module_class_pic_init( FT_Library library ) { FT_PIC_Container* pic_container = &library->pic_container; - FT_Error error = SFNT_Err_Ok; - sfntModulePIC* container; - FT_Memory memory = library->memory; + FT_Error error = FT_Err_Ok; + sfntModulePIC* container = NULL; + FT_Memory memory = library->memory; /* allocate pointer, clear and set global container pointer */ - if ( FT_ALLOC ( container, sizeof ( *container ) ) ) + if ( FT_ALLOC( container, sizeof ( *container ) ) ) return error; FT_MEM_SET( container, 0, sizeof ( *container ) ); pic_container->sfnt = container; - /* initialize pointer table - this is how the module usually expects this data */ + /* initialize pointer table - */ + /* this is how the module usually expects this data */ error = FT_Create_Class_sfnt_services( library, &container->sfnt_services ); if ( error ) goto Exit; + error = FT_Create_Class_tt_cmap_classes( library, &container->tt_cmap_classes ); if ( error ) @@ -132,14 +131,12 @@ #endif FT_Init_Class_sfnt_interface( library, &container->sfnt_interface ); -Exit: + Exit: if ( error ) sfnt_module_class_pic_free( library ); return error; } - - #endif /* FT_CONFIG_OPTION_PIC */ diff --git a/src/sfnt/sfntpic.h b/src/sfnt/sfntpic.h index f7993d1..b09a914 100644 --- a/src/sfnt/sfntpic.h +++ b/src/sfnt/sfntpic.h @@ -4,7 +4,7 @@ /* */ /* The FreeType position independent code services for sfnt module. */ /* */ -/* Copyright 2009 by */ +/* Copyright 2009, 2012 by */ /* Oran Agra and Mickey Gabel. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -24,57 +24,76 @@ FT_BEGIN_HEADER #include FT_INTERNAL_PIC_H - #ifndef FT_CONFIG_OPTION_PIC -#define FT_SFNT_SERVICES_GET sfnt_services -#define FT_SFNT_SERVICE_GLYPH_DICT_GET sfnt_service_glyph_dict -#define FT_SFNT_SERVICE_PS_NAME_GET sfnt_service_ps_name -#define FT_TT_SERVICE_GET_CMAP_INFO_GET tt_service_get_cmap_info -#define FT_SFNT_SERVICES_GET sfnt_services -#define FT_TT_CMAP_CLASSES_GET tt_cmap_classes -#define FT_SFNT_SERVICE_SFNT_TABLE_GET sfnt_service_sfnt_table -#define FT_SFNT_SERVICE_BDF_GET sfnt_service_bdf -#define FT_SFNT_INTERFACE_GET sfnt_interface + +#ifndef FT_CONFIG_OPTION_PIC + +#define SFNT_SERVICES_GET sfnt_services +#define SFNT_SERVICE_GLYPH_DICT_GET sfnt_service_glyph_dict +#define SFNT_SERVICE_PS_NAME_GET sfnt_service_ps_name +#define TT_SERVICE_CMAP_INFO_GET tt_service_get_cmap_info +#define SFNT_SERVICES_GET sfnt_services +#define TT_CMAP_CLASSES_GET tt_cmap_classes +#define SFNT_SERVICE_SFNT_TABLE_GET sfnt_service_sfnt_table +#define SFNT_SERVICE_BDF_GET sfnt_service_bdf +#define SFNT_INTERFACE_GET sfnt_interface #else /* FT_CONFIG_OPTION_PIC */ -/* some include files required for members of sfntModulePIC */ + /* some include files required for members of sfntModulePIC */ #include FT_SERVICE_GLYPH_DICT_H #include FT_SERVICE_POSTSCRIPT_NAME_H #include FT_SERVICE_SFNT_H #include FT_SERVICE_TT_CMAP_H + #ifdef TT_CONFIG_OPTION_BDF #include "ttbdf.h" #include FT_SERVICE_BDF_H #endif + #include FT_INTERNAL_DEBUG_H #include FT_INTERNAL_STREAM_H #include FT_INTERNAL_SFNT_H #include "ttcmap.h" -typedef struct sfntModulePIC_ + + typedef struct sfntModulePIC_ { - FT_ServiceDescRec* sfnt_services; - FT_Service_GlyphDictRec sfnt_service_glyph_dict; + FT_ServiceDescRec* sfnt_services; + FT_Service_GlyphDictRec sfnt_service_glyph_dict; FT_Service_PsFontNameRec sfnt_service_ps_name; - FT_Service_TTCMapsRec tt_service_get_cmap_info; - TT_CMap_Class* tt_cmap_classes; - FT_Service_SFNT_TableRec sfnt_service_sfnt_table; + FT_Service_TTCMapsRec tt_service_get_cmap_info; + TT_CMap_Class* tt_cmap_classes; + FT_Service_SFNT_TableRec sfnt_service_sfnt_table; #ifdef TT_CONFIG_OPTION_BDF - FT_Service_BDFRec sfnt_service_bdf; + FT_Service_BDFRec sfnt_service_bdf; #endif - SFNT_Interface sfnt_interface; + SFNT_Interface sfnt_interface; + } sfntModulePIC; -#define GET_PIC(lib) ((sfntModulePIC*)((lib)->pic_container.sfnt)) -#define FT_SFNT_SERVICES_GET (GET_PIC(library)->sfnt_services) -#define FT_SFNT_SERVICE_GLYPH_DICT_GET (GET_PIC(library)->sfnt_service_glyph_dict) -#define FT_SFNT_SERVICE_PS_NAME_GET (GET_PIC(library)->sfnt_service_ps_name) -#define FT_TT_SERVICE_GET_CMAP_INFO_GET (GET_PIC(library)->tt_service_get_cmap_info) -#define FT_SFNT_SERVICES_GET (GET_PIC(library)->sfnt_services) -#define FT_TT_CMAP_CLASSES_GET (GET_PIC(library)->tt_cmap_classes) -#define FT_SFNT_SERVICE_SFNT_TABLE_GET (GET_PIC(library)->sfnt_service_sfnt_table) -#define FT_SFNT_SERVICE_BDF_GET (GET_PIC(library)->sfnt_service_bdf) -#define FT_SFNT_INTERFACE_GET (GET_PIC(library)->sfnt_interface) + +#define GET_PIC( lib ) \ + ( (sfntModulePIC*)( (lib)->pic_container.sfnt ) ) + +#define SFNT_SERVICES_GET \ + ( GET_PIC( library )->sfnt_services ) +#define SFNT_SERVICE_GLYPH_DICT_GET \ + ( GET_PIC( library )->sfnt_service_glyph_dict ) +#define SFNT_SERVICE_PS_NAME_GET \ + ( GET_PIC( library )->sfnt_service_ps_name ) +#define TT_SERVICE_CMAP_INFO_GET \ + ( GET_PIC( library )->tt_service_get_cmap_info ) +#define SFNT_SERVICES_GET \ + ( GET_PIC( library )->sfnt_services ) +#define TT_CMAP_CLASSES_GET \ + ( GET_PIC( library )->tt_cmap_classes ) +#define SFNT_SERVICE_SFNT_TABLE_GET \ + ( GET_PIC( library )->sfnt_service_sfnt_table ) +#define SFNT_SERVICE_BDF_GET \ + ( GET_PIC( library )->sfnt_service_bdf ) +#define SFNT_INTERFACE_GET \ + ( GET_PIC( library )->sfnt_interface ) + /* see sfntpic.c for the implementation */ void @@ -85,7 +104,7 @@ typedef struct sfntModulePIC_ #endif /* FT_CONFIG_OPTION_PIC */ -/* */ + /* */ FT_END_HEADER diff --git a/src/sfnt/sfobjs.c b/src/sfnt/sfobjs.c index d7be631..70b988d 100644 --- a/src/sfnt/sfobjs.c +++ b/src/sfnt/sfobjs.c @@ -4,7 +4,7 @@ /* */ /* SFNT object management (base). */ /* */ -/* Copyright 1996-2008, 2010-2011 by */ +/* Copyright 1996-2008, 2010-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -27,6 +27,7 @@ #include FT_TRUETYPE_TAGS_H #include FT_SERVICE_POSTSCRIPT_CMAPS_H #include FT_SFNT_NAMES_H +#include FT_GZIP_H #include "sferrors.h" #ifdef TT_CONFIG_OPTION_BDF @@ -64,13 +65,17 @@ for ( n = 0; n < len; n++ ) { code = FT_NEXT_USHORT( read ); + + if ( code == 0 ) + break; + if ( code < 32 || code > 127 ) code = '?'; string[n] = (char)code; } - string[len] = 0; + string[n] = 0; return string; } @@ -95,13 +100,17 @@ for ( n = 0; n < len; n++ ) { code = *read++; + + if ( code == 0 ) + break; + if ( code < 32 || code > 127 ) code = '?'; string[n] = (char)code; } - string[len] = 0; + string[n] = 0; return string; } @@ -137,7 +146,7 @@ FT_String** name ) { FT_Memory memory = face->root.memory; - FT_Error error = SFNT_Err_Ok; + FT_Error error = FT_Err_Ok; FT_String* result = NULL; FT_UShort n; TT_NameEntryRec* rec; @@ -339,6 +348,383 @@ } +#define WRITE_USHORT( p, v ) \ + do \ + { \ + *(p)++ = (FT_Byte)( (v) >> 8 ); \ + *(p)++ = (FT_Byte)( (v) >> 0 ); \ + \ + } while ( 0 ) + +#define WRITE_ULONG( p, v ) \ + do \ + { \ + *(p)++ = (FT_Byte)( (v) >> 24 ); \ + *(p)++ = (FT_Byte)( (v) >> 16 ); \ + *(p)++ = (FT_Byte)( (v) >> 8 ); \ + *(p)++ = (FT_Byte)( (v) >> 0 ); \ + \ + } while ( 0 ) + + + static void + sfnt_stream_close( FT_Stream stream ) + { + FT_Memory memory = stream->memory; + + + FT_FREE( stream->base ); + + stream->size = 0; + stream->base = 0; + stream->close = 0; + } + + + FT_CALLBACK_DEF( int ) + compare_offsets( const void* a, + const void* b ) + { + WOFF_Table table1 = *(WOFF_Table*)a; + WOFF_Table table2 = *(WOFF_Table*)b; + + FT_ULong offset1 = table1->Offset; + FT_ULong offset2 = table2->Offset; + + + if ( offset1 > offset2 ) + return 1; + else if ( offset1 < offset2 ) + return -1; + else + return 0; + } + + + /* Replace `face->root.stream' with a stream containing the extracted */ + /* SFNT of a WOFF font. */ + + static FT_Error + woff_open_font( FT_Stream stream, + TT_Face face ) + { + FT_Memory memory = stream->memory; + FT_Error error = FT_Err_Ok; + + WOFF_HeaderRec woff; + WOFF_Table tables = NULL; + WOFF_Table* indices = NULL; + + FT_ULong woff_offset; + + FT_Byte* sfnt = NULL; + FT_Stream sfnt_stream = NULL; + + FT_Byte* sfnt_header; + FT_ULong sfnt_offset; + + FT_Int nn; + FT_ULong old_tag = 0; + + static const FT_Frame_Field woff_header_fields[] = + { +#undef FT_STRUCTURE +#define FT_STRUCTURE WOFF_HeaderRec + + FT_FRAME_START( 44 ), + FT_FRAME_ULONG ( signature ), + FT_FRAME_ULONG ( flavor ), + FT_FRAME_ULONG ( length ), + FT_FRAME_USHORT( num_tables ), + FT_FRAME_USHORT( reserved ), + FT_FRAME_ULONG ( totalSfntSize ), + FT_FRAME_USHORT( majorVersion ), + FT_FRAME_USHORT( minorVersion ), + FT_FRAME_ULONG ( metaOffset ), + FT_FRAME_ULONG ( metaLength ), + FT_FRAME_ULONG ( metaOrigLength ), + FT_FRAME_ULONG ( privOffset ), + FT_FRAME_ULONG ( privLength ), + FT_FRAME_END + }; + + + FT_ASSERT( stream == face->root.stream ); + FT_ASSERT( FT_STREAM_POS() == 0 ); + + if ( FT_STREAM_READ_FIELDS( woff_header_fields, &woff ) ) + return error; + + /* Make sure we don't recurse back here or hit TTC code. */ + if ( woff.flavor == TTAG_wOFF || woff.flavor == TTAG_ttcf ) + return FT_THROW( Invalid_Table ); + + /* Miscellaneous checks. */ + if ( woff.length != stream->size || + woff.num_tables == 0 || + 44 + woff.num_tables * 20UL >= woff.length || + 12 + woff.num_tables * 16UL >= woff.totalSfntSize || + ( woff.totalSfntSize & 3 ) != 0 || + ( woff.metaOffset == 0 && ( woff.metaLength != 0 || + woff.metaOrigLength != 0 ) ) || + ( woff.metaLength != 0 && woff.metaOrigLength == 0 ) || + ( woff.privOffset == 0 && woff.privLength != 0 ) ) + return FT_THROW( Invalid_Table ); + + if ( FT_ALLOC( sfnt, woff.totalSfntSize ) || + FT_NEW( sfnt_stream ) ) + goto Exit; + + sfnt_header = sfnt; + + /* Write sfnt header. */ + { + FT_UInt searchRange, entrySelector, rangeShift, x; + + + x = woff.num_tables; + entrySelector = 0; + while ( x ) + { + x >>= 1; + entrySelector += 1; + } + entrySelector--; + + searchRange = ( 1 << entrySelector ) * 16; + rangeShift = woff.num_tables * 16 - searchRange; + + WRITE_ULONG ( sfnt_header, woff.flavor ); + WRITE_USHORT( sfnt_header, woff.num_tables ); + WRITE_USHORT( sfnt_header, searchRange ); + WRITE_USHORT( sfnt_header, entrySelector ); + WRITE_USHORT( sfnt_header, rangeShift ); + } + + /* While the entries in the sfnt header must be sorted by the */ + /* tag value, the tables themselves are not. We thus have to */ + /* sort them by offset and check that they don't overlap. */ + + if ( FT_NEW_ARRAY( tables, woff.num_tables ) || + FT_NEW_ARRAY( indices, woff.num_tables ) ) + goto Exit; + + FT_TRACE2(( "\n" + " tag offset compLen origLen checksum\n" + " -------------------------------------------\n" )); + + if ( FT_FRAME_ENTER( 20L * woff.num_tables ) ) + goto Exit; + + for ( nn = 0; nn < woff.num_tables; nn++ ) + { + WOFF_Table table = tables + nn; + + table->Tag = FT_GET_TAG4(); + table->Offset = FT_GET_ULONG(); + table->CompLength = FT_GET_ULONG(); + table->OrigLength = FT_GET_ULONG(); + table->CheckSum = FT_GET_ULONG(); + + FT_TRACE2(( " %c%c%c%c %08lx %08lx %08lx %08lx\n", + (FT_Char)( table->Tag >> 24 ), + (FT_Char)( table->Tag >> 16 ), + (FT_Char)( table->Tag >> 8 ), + (FT_Char)( table->Tag ), + table->Offset, + table->CompLength, + table->OrigLength, + table->CheckSum )); + + if ( table->Tag <= old_tag ) + { + FT_FRAME_EXIT(); + error = FT_THROW( Invalid_Table ); + goto Exit; + } + + old_tag = table->Tag; + indices[nn] = table; + } + + FT_FRAME_EXIT(); + + /* Sort by offset. */ + + ft_qsort( indices, + woff.num_tables, + sizeof ( WOFF_Table ), + compare_offsets ); + + /* Check offsets and lengths. */ + + woff_offset = 44 + woff.num_tables * 20L; + sfnt_offset = 12 + woff.num_tables * 16L; + + for ( nn = 0; nn < woff.num_tables; nn++ ) + { + WOFF_Table table = indices[nn]; + + + if ( table->Offset != woff_offset || + table->CompLength > woff.length || + table->Offset > woff.length - table->CompLength || + table->OrigLength > woff.totalSfntSize || + sfnt_offset > woff.totalSfntSize - table->OrigLength || + table->CompLength > table->OrigLength ) + { + error = FT_THROW( Invalid_Table ); + goto Exit; + } + + table->OrigOffset = sfnt_offset; + + /* The offsets must be multiples of 4. */ + woff_offset += ( table->CompLength + 3 ) & ~3; + sfnt_offset += ( table->OrigLength + 3 ) & ~3; + } + + /* + * Final checks! + * + * We don't decode and check the metadata block. + * We don't check table checksums either. + * But other than those, I think we implement all + * `MUST' checks from the spec. + */ + + if ( woff.metaOffset ) + { + if ( woff.metaOffset != woff_offset || + woff.metaOffset + woff.metaLength > woff.length ) + { + error = FT_THROW( Invalid_Table ); + goto Exit; + } + + /* We have padding only ... */ + woff_offset += woff.metaLength; + } + + if ( woff.privOffset ) + { + /* ... if it isn't the last block. */ + woff_offset = ( woff_offset + 3 ) & ~3; + + if ( woff.privOffset != woff_offset || + woff.privOffset + woff.privLength > woff.length ) + { + error = FT_THROW( Invalid_Table ); + goto Exit; + } + + /* No padding for the last block. */ + woff_offset += woff.privLength; + } + + if ( sfnt_offset != woff.totalSfntSize || + woff_offset != woff.length ) + { + error = FT_THROW( Invalid_Table ); + goto Exit; + } + + /* Write the tables. */ + + for ( nn = 0; nn < woff.num_tables; nn++ ) + { + WOFF_Table table = tables + nn; + + + /* Write SFNT table entry. */ + WRITE_ULONG( sfnt_header, table->Tag ); + WRITE_ULONG( sfnt_header, table->CheckSum ); + WRITE_ULONG( sfnt_header, table->OrigOffset ); + WRITE_ULONG( sfnt_header, table->OrigLength ); + + /* Write table data. */ + if ( FT_STREAM_SEEK( table->Offset ) || + FT_FRAME_ENTER( table->CompLength ) ) + goto Exit; + + if ( table->CompLength == table->OrigLength ) + { + /* Uncompressed data; just copy. */ + ft_memcpy( sfnt + table->OrigOffset, + stream->cursor, + table->OrigLength ); + } + else + { +#ifdef FT_CONFIG_OPTION_USE_ZLIB + + /* Uncompress with zlib. */ + FT_ULong output_len = table->OrigLength; + + + error = FT_Gzip_Uncompress( memory, + sfnt + table->OrigOffset, &output_len, + stream->cursor, table->CompLength ); + if ( error ) + goto Exit; + if ( output_len != table->OrigLength ) + { + error = FT_THROW( Invalid_Table ); + goto Exit; + } + +#else /* !FT_CONFIG_OPTION_USE_ZLIB */ + + error = FT_THROW( Unimplemented_Feature ); + goto Exit; + +#endif /* !FT_CONFIG_OPTION_USE_ZLIB */ + } + + FT_FRAME_EXIT(); + + /* We don't check whether the padding bytes in the WOFF file are */ + /* actually '\0'. For the output, however, we do set them properly. */ + sfnt_offset = table->OrigOffset + table->OrigLength; + while ( sfnt_offset & 3 ) + { + sfnt[sfnt_offset] = '\0'; + sfnt_offset++; + } + } + + /* Ok! Finally ready. Swap out stream and return. */ + FT_Stream_OpenMemory( sfnt_stream, sfnt, woff.totalSfntSize ); + sfnt_stream->memory = stream->memory; + sfnt_stream->close = sfnt_stream_close; + + FT_Stream_Free( + face->root.stream, + ( face->root.face_flags & FT_FACE_FLAG_EXTERNAL_STREAM ) != 0 ); + + face->root.stream = sfnt_stream; + + face->root.face_flags &= ~FT_FACE_FLAG_EXTERNAL_STREAM; + + Exit: + FT_FREE( tables ); + FT_FREE( indices ); + + if ( error ) + { + FT_FREE( sfnt ); + FT_Stream_Close( sfnt_stream ); + FT_FREE( sfnt_stream ); + } + + return error; + } + + +#undef WRITE_USHORT +#undef WRITE_ULONG + + /* Fill in face->ttc_header. If the font is not a TTC, it is */ /* synthesized into a TTC with one offset table. */ static FT_Error @@ -365,11 +751,28 @@ face->ttc_header.version = 0; face->ttc_header.count = 0; + retry: offset = FT_STREAM_POS(); if ( FT_READ_ULONG( tag ) ) return error; + if ( tag == TTAG_wOFF ) + { + FT_TRACE2(( "sfnt_open_font: file is a WOFF; synthesizing SFNT\n" )); + + if ( FT_STREAM_SEEK( offset ) ) + return error; + + error = woff_open_font( stream, face ); + if ( error ) + return error; + + /* Swap out stream and retry! */ + stream = face->root.stream; + goto retry; + } + if ( tag != 0x00010000UL && tag != TTAG_ttcf && tag != TTAG_OTTO && @@ -378,7 +781,7 @@ tag != 0x00020000UL ) { FT_TRACE2(( " not a font using the SFNT container format\n" )); - return SFNT_Err_Unknown_File_Format; + return FT_THROW( Unknown_File_Format ); } face->ttc_header.tag = TTAG_ttcf; @@ -394,7 +797,7 @@ return error; if ( face->ttc_header.count == 0 ) - return SFNT_Err_Invalid_Table; + return FT_THROW( Invalid_Table ); /* a rough size estimate: let's conservatively assume that there */ /* is just a single table info in each subfont header (12 + 16*1 = */ @@ -402,7 +805,7 @@ /* size of the TTC header plus `28*count' bytes for all subfont */ /* headers */ if ( (FT_ULong)face->ttc_header.count > stream->size / ( 28 + 4 ) ) - return SFNT_Err_Array_Too_Large; + return FT_THROW( Array_Too_Large ); /* now read the offsets of each font in the file */ if ( FT_NEW_ARRAY( face->ttc_header.offsets, face->ttc_header.count ) ) @@ -457,7 +860,7 @@ if ( !sfnt ) { FT_ERROR(( "sfnt_init_face: cannot access `sfnt' module\n" )); - return SFNT_Err_Missing_Module; + return FT_THROW( Missing_Module ); } face->sfnt = sfnt; @@ -472,13 +875,16 @@ if ( error ) return error; + /* Stream may have changed in sfnt_open_font. */ + stream = face->root.stream; + FT_TRACE2(( "sfnt_init_face: %08p, %ld\n", face, face_index )); if ( face_index < 0 ) face_index = 0; if ( face_index >= face->ttc_header.count ) - return SFNT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); if ( FT_STREAM_SEEK( face->ttc_header.offsets[face_index] ) ) return error; @@ -495,42 +901,45 @@ } -#define LOAD_( x ) \ - do { \ - FT_TRACE2(( "`" #x "' " )); \ - FT_TRACE3(( "-->\n" )); \ - \ - error = sfnt->load_##x( face, stream ); \ - \ - FT_TRACE2(( "%s\n", ( !error ) \ - ? "loaded" \ - : ( error == SFNT_Err_Table_Missing ) \ - ? "missing" \ - : "failed to load" )); \ - FT_TRACE3(( "\n" )); \ +#define LOAD_( x ) \ + do \ + { \ + FT_TRACE2(( "`" #x "' " )); \ + FT_TRACE3(( "-->\n" )); \ + \ + error = sfnt->load_ ## x( face, stream ); \ + \ + FT_TRACE2(( "%s\n", ( !error ) \ + ? "loaded" \ + : FT_ERR_EQ( error, Table_Missing ) \ + ? "missing" \ + : "failed to load" )); \ + FT_TRACE3(( "\n" )); \ } while ( 0 ) -#define LOADM_( x, vertical ) \ - do { \ - FT_TRACE2(( "`%s" #x "' ", \ - vertical ? "vertical " : "" )); \ - FT_TRACE3(( "-->\n" )); \ - \ - error = sfnt->load_##x( face, stream, vertical ); \ - \ - FT_TRACE2(( "%s\n", ( !error ) \ - ? "loaded" \ - : ( error == SFNT_Err_Table_Missing ) \ - ? "missing" \ - : "failed to load" )); \ - FT_TRACE3(( "\n" )); \ +#define LOADM_( x, vertical ) \ + do \ + { \ + FT_TRACE2(( "`%s" #x "' ", \ + vertical ? "vertical " : "" )); \ + FT_TRACE3(( "-->\n" )); \ + \ + error = sfnt->load_ ## x( face, stream, vertical ); \ + \ + FT_TRACE2(( "%s\n", ( !error ) \ + ? "loaded" \ + : FT_ERR_EQ( error, Table_Missing ) \ + ? "missing" \ + : "failed to load" )); \ + FT_TRACE3(( "\n" )); \ } while ( 0 ) -#define GET_NAME( id, field ) \ - do { \ - error = tt_face_get_name( face, TT_NAME_ID_##id, field ); \ - if ( error ) \ - goto Exit; \ +#define GET_NAME( id, field ) \ + do \ + { \ + error = tt_face_get_name( face, TT_NAME_ID_ ## id, field ); \ + if ( error ) \ + goto Exit; \ } while ( 0 ) @@ -547,13 +956,15 @@ #endif FT_Bool has_outline; FT_Bool is_apple_sbit; - FT_Bool ignore_preferred_family = FALSE; + FT_Bool is_apple_sbix; + FT_Bool ignore_preferred_family = FALSE; FT_Bool ignore_preferred_subfamily = FALSE; SFNT_Service sfnt = (SFNT_Service)face->sfnt; FT_UNUSED( face_index ); + /* Check parameters */ { @@ -599,6 +1010,13 @@ #endif is_apple_sbit = 0; + is_apple_sbix = !face->goto_table( face, TTAG_sbix, stream, 0 ); + + /* Apple 'sbix' color bitmaps are rendered scaled and then the 'glyf' + * outline rendered on top. We don't support that yet, so just ignore + * the 'glyf' outline and advertise it as a bitmap-only font. */ + if ( is_apple_sbix ) + has_outline = FALSE; /* if this font doesn't contain outlines, we try to load */ /* a `bhed' table */ @@ -610,7 +1028,7 @@ /* load the font header (`head' table) if this isn't an Apple */ /* sbit font file */ - if ( !is_apple_sbit ) + if ( !is_apple_sbit || is_apple_sbix ) { LOAD_( head ); if ( error ) @@ -619,7 +1037,7 @@ if ( face->header.Units_Per_EM == 0 ) { - error = SFNT_Err_Invalid_Table; + error = FT_THROW( Invalid_Table ); goto Exit; } @@ -647,9 +1065,9 @@ if ( !error ) { LOADM_( hmtx, 0 ); - if ( error == SFNT_Err_Table_Missing ) + if ( FT_ERR_EQ( error, Table_Missing ) ) { - error = SFNT_Err_Hmtx_Table_Missing; + error = FT_THROW( Hmtx_Table_Missing ); #ifdef FT_CONFIG_OPTION_INCREMENTAL /* If this is an incrementally loaded font and there are */ @@ -659,12 +1077,12 @@ get_glyph_metrics ) { face->horizontal.number_Of_HMetrics = 0; - error = SFNT_Err_Ok; + error = FT_Err_Ok; } #endif } } - else if ( error == SFNT_Err_Table_Missing ) + else if ( FT_ERR_EQ( error, Table_Missing ) ) { /* No `hhea' table necessary for SFNT Mac fonts. */ if ( face->format_tag == TTAG_true ) @@ -672,11 +1090,11 @@ FT_TRACE2(( "This is an SFNT Mac font.\n" )); has_outline = 0; - error = SFNT_Err_Ok; + error = FT_Err_Ok; } else { - error = SFNT_Err_Horiz_Header_Missing; + error = FT_THROW( Horiz_Header_Missing ); #ifdef FT_CONFIG_OPTION_INCREMENTAL /* If this is an incrementally loaded font and there are */ @@ -686,7 +1104,7 @@ get_glyph_metrics ) { face->horizontal.number_Of_HMetrics = 0; - error = SFNT_Err_Ok; + error = FT_Err_Ok; } #endif @@ -705,7 +1123,7 @@ face->vertical_info = 1; } - if ( error && error != SFNT_Err_Table_Missing ) + if ( error && FT_ERR_NEQ( error, Table_Missing ) ) goto Exit; LOAD_( os2 ); @@ -727,8 +1145,8 @@ /* a font which contains neither bitmaps nor outlines is */ /* still valid (although rather useless in most cases); */ /* however, you can find such stripped fonts in PDFs */ - if ( error == SFNT_Err_Table_Missing ) - error = SFNT_Err_Ok; + if ( FT_ERR_EQ( error, Table_Missing ) ) + error = FT_Err_Ok; else goto Exit; } @@ -737,7 +1155,7 @@ LOAD_( pclt ); if ( error ) { - if ( error != SFNT_Err_Table_Missing ) + if ( FT_ERR_NEQ( error, Table_Missing ) ) goto Exit; face->pclt.Version = 0; @@ -794,6 +1212,10 @@ /* */ /* Compute face flags. */ /* */ + if ( face->sbit_table_type == TT_SBIT_TABLE_TYPE_CBLC || + face->sbit_table_type == TT_SBIT_TABLE_TYPE_SBIX ) + flags |= FT_FACE_FLAG_COLOR; /* color glyphs */ + if ( has_outline == TRUE ) flags |= FT_FACE_FLAG_SCALABLE; /* scalable outlines */ @@ -803,7 +1225,7 @@ FT_FACE_FLAG_HORIZONTAL; /* horizontal data */ #ifdef TT_CONFIG_OPTION_POSTSCRIPT_NAMES - if ( psnames_error == SFNT_Err_Ok && + if ( !psnames_error && face->postscript.FormatType != 0x00030000L ) flags |= FT_FACE_FLAG_GLYPH_NAMES; #endif @@ -910,11 +1332,7 @@ FT_UInt i, count; -#ifndef FT_CONFIG_OPTION_OLD_INTERNALS count = face->sbit_num_strikes; -#else - count = (FT_UInt)face->num_sbit_strikes; -#endif if ( count > 0 ) { @@ -926,7 +1344,7 @@ if ( em_size == 0 || face->os2.version == 0xFFFFU ) { - avgwidth = 0; + avgwidth = 1; em_size = 1; } @@ -1115,7 +1533,6 @@ } /* freeing the horizontal metrics */ -#ifndef FT_CONFIG_OPTION_OLD_INTERNALS { FT_Stream stream = FT_FACE_STREAM( face ); @@ -1125,10 +1542,6 @@ face->horz_metrics_size = 0; face->vert_metrics_size = 0; } -#else - FT_FREE( face->horizontal.long_metrics ); - FT_FREE( face->horizontal.short_metrics ); -#endif /* freeing the vertical ones, if any */ if ( face->vertical_info ) diff --git a/src/sfnt/ttbdf.c b/src/sfnt/ttbdf.c index 18845c3..9401dae 100644 --- a/src/sfnt/ttbdf.c +++ b/src/sfnt/ttbdf.c @@ -4,7 +4,7 @@ /* */ /* TrueType and OpenType embedded BDF properties (body). */ /* */ -/* Copyright 2005, 2006, 2010 by */ +/* Copyright 2005, 2006, 2010, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -74,7 +74,7 @@ length < 8 || FT_FRAME_EXTRACT( length, bdf->table ) ) { - error = SFNT_Err_Invalid_Table; + error = FT_THROW( Invalid_Table ); goto Exit; } @@ -131,7 +131,7 @@ BadTable: FT_FRAME_RELEASE( bdf->table ); FT_ZERO( bdf ); - error = SFNT_Err_Invalid_Table; + error = FT_THROW( Invalid_Table ); goto Exit; } @@ -143,7 +143,7 @@ { TT_BDF bdf = &face->bdf; FT_Size size = FT_FACE(face)->size; - FT_Error error = SFNT_Err_Ok; + FT_Error error = FT_Err_Ok; FT_Byte* p; FT_UInt count; FT_Byte* strike; @@ -163,7 +163,7 @@ p = bdf->table + 8; strike = p + 4 * count; - error = SFNT_Err_Invalid_Argument; + error = FT_ERR( Invalid_Argument ); if ( size == NULL || property_name == NULL ) goto Exit; @@ -215,7 +215,7 @@ { aprop->type = BDF_PROPERTY_TYPE_ATOM; aprop->u.atom = (const char*)bdf->strings + value; - error = SFNT_Err_Ok; + error = FT_Err_Ok; goto Exit; } break; @@ -223,13 +223,13 @@ case 0x02: aprop->type = BDF_PROPERTY_TYPE_INTEGER; aprop->u.integer = (FT_Int32)value; - error = SFNT_Err_Ok; + error = FT_Err_Ok; goto Exit; case 0x03: aprop->type = BDF_PROPERTY_TYPE_CARDINAL; aprop->u.cardinal = value; - error = SFNT_Err_Ok; + error = FT_Err_Ok; goto Exit; default: diff --git a/src/sfnt/ttcmap.c b/src/sfnt/ttcmap.c index 1dfd987..f54de70 100644 --- a/src/sfnt/ttcmap.c +++ b/src/sfnt/ttcmap.c @@ -4,7 +4,7 @@ /* */ /* TrueType character mapping table (cmap) support (body). */ /* */ -/* Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 by */ +/* Copyright 2002-2010, 2012-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -56,7 +56,7 @@ FT_Byte* table ) { cmap->data = table; - return SFNT_Err_Ok; + return FT_Err_Ok; } @@ -88,9 +88,15 @@ tt_cmap0_validate( FT_Byte* table, FT_Validator valid ) { - FT_Byte* p = table + 2; - FT_UInt length = TT_NEXT_USHORT( p ); + FT_Byte* p; + FT_UInt length; + + + if ( table + 2 + 2 > valid->limit ) + FT_INVALID_TOO_SHORT; + p = table + 2; /* skip format */ + length = TT_NEXT_USHORT( p ); if ( table + length > valid->limit || length < 262 ) FT_INVALID_TOO_SHORT; @@ -110,7 +116,7 @@ } } - return SFNT_Err_Ok; + return FT_Err_Ok; } @@ -161,24 +167,28 @@ cmap_info->format = 0; cmap_info->language = (FT_ULong)TT_PEEK_USHORT( p ); - return SFNT_Err_Ok; + return FT_Err_Ok; } - FT_DEFINE_TT_CMAP(tt_cmap0_class_rec, - sizeof ( TT_CMapRec ), + FT_DEFINE_TT_CMAP( + tt_cmap0_class_rec, + sizeof ( TT_CMapRec ), + + (FT_CMap_InitFunc) tt_cmap_init, + (FT_CMap_DoneFunc) NULL, + (FT_CMap_CharIndexFunc)tt_cmap0_char_index, + (FT_CMap_CharNextFunc) tt_cmap0_char_next, - (FT_CMap_InitFunc) tt_cmap_init, - (FT_CMap_DoneFunc) NULL, - (FT_CMap_CharIndexFunc)tt_cmap0_char_index, - (FT_CMap_CharNextFunc) tt_cmap0_char_next, + NULL, + NULL, + NULL, + NULL, + NULL, - NULL, NULL, NULL, NULL, NULL - , 0, - (TT_CMap_ValidateFunc) tt_cmap0_validate, - (TT_CMap_Info_GetFunc) tt_cmap0_get_info - ) + (TT_CMap_ValidateFunc)tt_cmap0_validate, + (TT_CMap_Info_GetFunc)tt_cmap0_get_info ) #endif /* TT_CONFIG_CMAP_FORMAT_0 */ @@ -275,13 +285,20 @@ tt_cmap2_validate( FT_Byte* table, FT_Validator valid ) { - FT_Byte* p = table + 2; /* skip format */ - FT_UInt length = TT_PEEK_USHORT( p ); + FT_Byte* p; + FT_UInt length; + FT_UInt n, max_subs; - FT_Byte* keys; /* keys table */ - FT_Byte* subs; /* sub-headers */ - FT_Byte* glyph_ids; /* glyph ID array */ + FT_Byte* keys; /* keys table */ + FT_Byte* subs; /* sub-headers */ + FT_Byte* glyph_ids; /* glyph ID array */ + + + if ( table + 2 + 2 > valid->limit ) + FT_INVALID_TOO_SHORT; + p = table + 2; /* skip format */ + length = TT_NEXT_USHORT( p ); if ( table + length > valid->limit || length < 6 + 512 ) FT_INVALID_TOO_SHORT; @@ -316,9 +333,8 @@ /* parse sub-headers */ for ( n = 0; n <= max_subs; n++ ) { - FT_UInt first_code, code_count, offset; - FT_Int delta; - FT_Byte* ids; + FT_UInt first_code, code_count, offset; + FT_Int delta; first_code = TT_NEXT_USHORT( p ); @@ -340,6 +356,9 @@ /* check offset */ if ( offset != 0 ) { + FT_Byte* ids; + + ids = p - 2 + offset; if ( ids < glyph_ids || ids + code_count*2 > table + length ) FT_INVALID_OFFSET; @@ -365,7 +384,7 @@ } } - return SFNT_Err_Ok; + return FT_Err_Ok; } @@ -537,24 +556,28 @@ cmap_info->format = 2; cmap_info->language = (FT_ULong)TT_PEEK_USHORT( p ); - return SFNT_Err_Ok; + return FT_Err_Ok; } - FT_DEFINE_TT_CMAP(tt_cmap2_class_rec, - sizeof ( TT_CMapRec ), + FT_DEFINE_TT_CMAP( + tt_cmap2_class_rec, + sizeof ( TT_CMapRec ), + + (FT_CMap_InitFunc) tt_cmap_init, + (FT_CMap_DoneFunc) NULL, + (FT_CMap_CharIndexFunc)tt_cmap2_char_index, + (FT_CMap_CharNextFunc) tt_cmap2_char_next, - (FT_CMap_InitFunc) tt_cmap_init, - (FT_CMap_DoneFunc) NULL, - (FT_CMap_CharIndexFunc)tt_cmap2_char_index, - (FT_CMap_CharNextFunc) tt_cmap2_char_next, + NULL, + NULL, + NULL, + NULL, + NULL, - NULL, NULL, NULL, NULL, NULL - , 2, - (TT_CMap_ValidateFunc) tt_cmap2_validate, - (TT_CMap_Info_GetFunc) tt_cmap2_get_info - ) + (TT_CMap_ValidateFunc)tt_cmap2_validate, + (TT_CMap_Info_GetFunc)tt_cmap2_get_info ) #endif /* TT_CONFIG_CMAP_FORMAT_2 */ @@ -662,7 +685,7 @@ cmap->cur_charcode = (FT_UInt32)0xFFFFFFFFUL; cmap->cur_gindex = 0; - return SFNT_Err_Ok; + return FT_Err_Ok; } @@ -808,16 +831,20 @@ tt_cmap4_validate( FT_Byte* table, FT_Validator valid ) { - FT_Byte* p = table + 2; /* skip format */ - FT_UInt length = TT_NEXT_USHORT( p ); + FT_Byte* p; + FT_UInt length; + FT_Byte *ends, *starts, *offsets, *deltas, *glyph_ids; FT_UInt num_segs; - FT_Error error = SFNT_Err_Ok; + FT_Error error = FT_Err_Ok; - if ( length < 16 ) + if ( table + 2 + 2 > valid->limit ) FT_INVALID_TOO_SHORT; + p = table + 2; /* skip format */ + length = TT_NEXT_USHORT( p ); + /* in certain fonts, the `length' field is invalid and goes */ /* out of bound. We try to correct this here... */ if ( table + length > valid->limit ) @@ -828,6 +855,9 @@ length = (FT_UInt)( valid->limit - table ); } + if ( length < 16 ) + FT_INVALID_TOO_SHORT; + p = table + 6; num_segs = TT_NEXT_USHORT( p ); /* read segCountX2 */ @@ -1373,23 +1403,27 @@ cmap_info->format = 4; cmap_info->language = (FT_ULong)TT_PEEK_USHORT( p ); - return SFNT_Err_Ok; + return FT_Err_Ok; } - FT_DEFINE_TT_CMAP(tt_cmap4_class_rec, - sizeof ( TT_CMap4Rec ), - (FT_CMap_InitFunc) tt_cmap4_init, - (FT_CMap_DoneFunc) NULL, - (FT_CMap_CharIndexFunc)tt_cmap4_char_index, - (FT_CMap_CharNextFunc) tt_cmap4_char_next, + FT_DEFINE_TT_CMAP( + tt_cmap4_class_rec, + sizeof ( TT_CMap4Rec ), + (FT_CMap_InitFunc) tt_cmap4_init, + (FT_CMap_DoneFunc) NULL, + (FT_CMap_CharIndexFunc)tt_cmap4_char_index, + (FT_CMap_CharNextFunc) tt_cmap4_char_next, + + NULL, + NULL, + NULL, + NULL, + NULL, - NULL, NULL, NULL, NULL, NULL - , 4, - (TT_CMap_ValidateFunc) tt_cmap4_validate, - (TT_CMap_Info_GetFunc) tt_cmap4_get_info - ) + (TT_CMap_ValidateFunc)tt_cmap4_validate, + (TT_CMap_Info_GetFunc)tt_cmap4_get_info ) #endif /* TT_CONFIG_CMAP_FORMAT_4 */ @@ -1456,7 +1490,7 @@ } } - return SFNT_Err_Ok; + return FT_Err_Ok; } @@ -1532,24 +1566,28 @@ cmap_info->format = 6; cmap_info->language = (FT_ULong)TT_PEEK_USHORT( p ); - return SFNT_Err_Ok; + return FT_Err_Ok; } - FT_DEFINE_TT_CMAP(tt_cmap6_class_rec, - sizeof ( TT_CMapRec ), + FT_DEFINE_TT_CMAP( + tt_cmap6_class_rec, + sizeof ( TT_CMapRec ), + + (FT_CMap_InitFunc) tt_cmap_init, + (FT_CMap_DoneFunc) NULL, + (FT_CMap_CharIndexFunc)tt_cmap6_char_index, + (FT_CMap_CharNextFunc) tt_cmap6_char_next, - (FT_CMap_InitFunc) tt_cmap_init, - (FT_CMap_DoneFunc) NULL, - (FT_CMap_CharIndexFunc)tt_cmap6_char_index, - (FT_CMap_CharNextFunc) tt_cmap6_char_next, + NULL, + NULL, + NULL, + NULL, + NULL, - NULL, NULL, NULL, NULL, NULL - , 6, - (TT_CMap_ValidateFunc) tt_cmap6_validate, - (TT_CMap_Info_GetFunc) tt_cmap6_get_info - ) + (TT_CMap_ValidateFunc)tt_cmap6_validate, + (TT_CMap_Info_GetFunc)tt_cmap6_get_info ) #endif /* TT_CONFIG_CMAP_FORMAT_6 */ @@ -1631,7 +1669,8 @@ p = is32 + 8192; /* skip `is32' array */ num_groups = TT_NEXT_ULONG( p ); - if ( p + num_groups * 12 > valid->limit ) + /* p + num_groups * 12 > valid->limit ? */ + if ( num_groups > (FT_UInt32)( valid->limit - p ) / 12 ) FT_INVALID_TOO_SHORT; /* check groups, they must be in increasing order */ @@ -1656,7 +1695,12 @@ if ( valid->level >= FT_VALIDATE_TIGHT ) { - if ( start_id + end - start >= TT_VALID_GLYPH_COUNT( valid ) ) + FT_UInt32 d = end - start; + + + /* start_id + end - start >= TT_VALID_GLYPH_COUNT( valid ) ? */ + if ( d > TT_VALID_GLYPH_COUNT( valid ) || + start_id >= TT_VALID_GLYPH_COUNT( valid ) - d ) FT_INVALID_GLYPH_ID; count = (FT_UInt32)( end - start + 1 ); @@ -1700,7 +1744,7 @@ } } - return SFNT_Err_Ok; + return FT_Err_Ok; } @@ -1785,24 +1829,28 @@ cmap_info->format = 8; cmap_info->language = (FT_ULong)TT_PEEK_ULONG( p ); - return SFNT_Err_Ok; + return FT_Err_Ok; } - FT_DEFINE_TT_CMAP(tt_cmap8_class_rec, - sizeof ( TT_CMapRec ), + FT_DEFINE_TT_CMAP( + tt_cmap8_class_rec, + sizeof ( TT_CMapRec ), - (FT_CMap_InitFunc) tt_cmap_init, - (FT_CMap_DoneFunc) NULL, - (FT_CMap_CharIndexFunc)tt_cmap8_char_index, - (FT_CMap_CharNextFunc) tt_cmap8_char_next, + (FT_CMap_InitFunc) tt_cmap_init, + (FT_CMap_DoneFunc) NULL, + (FT_CMap_CharIndexFunc)tt_cmap8_char_index, + (FT_CMap_CharNextFunc) tt_cmap8_char_next, + + NULL, + NULL, + NULL, + NULL, + NULL, - NULL, NULL, NULL, NULL, NULL - , 8, - (TT_CMap_ValidateFunc) tt_cmap8_validate, - (TT_CMap_Info_GetFunc) tt_cmap8_get_info - ) + (TT_CMap_ValidateFunc)tt_cmap8_validate, + (TT_CMap_Info_GetFunc)tt_cmap8_get_info ) #endif /* TT_CONFIG_CMAP_FORMAT_8 */ @@ -1850,7 +1898,9 @@ count = TT_NEXT_ULONG( p ); if ( length > (FT_ULong)( valid->limit - table ) || - length < 20 + count * 2 ) + /* length < 20 + count * 2 ? */ + length < 20 || + ( length - 20 ) / 2 < count ) FT_INVALID_TOO_SHORT; /* check glyph indices */ @@ -1867,7 +1917,7 @@ } } - return SFNT_Err_Ok; + return FT_Err_Ok; } @@ -1934,24 +1984,28 @@ cmap_info->format = 10; cmap_info->language = (FT_ULong)TT_PEEK_ULONG( p ); - return SFNT_Err_Ok; + return FT_Err_Ok; } - FT_DEFINE_TT_CMAP(tt_cmap10_class_rec, - sizeof ( TT_CMapRec ), + FT_DEFINE_TT_CMAP( + tt_cmap10_class_rec, + sizeof ( TT_CMapRec ), - (FT_CMap_InitFunc) tt_cmap_init, - (FT_CMap_DoneFunc) NULL, - (FT_CMap_CharIndexFunc)tt_cmap10_char_index, - (FT_CMap_CharNextFunc) tt_cmap10_char_next, + (FT_CMap_InitFunc) tt_cmap_init, + (FT_CMap_DoneFunc) NULL, + (FT_CMap_CharIndexFunc)tt_cmap10_char_index, + (FT_CMap_CharNextFunc) tt_cmap10_char_next, + + NULL, + NULL, + NULL, + NULL, + NULL, - NULL, NULL, NULL, NULL, NULL - , 10, - (TT_CMap_ValidateFunc) tt_cmap10_validate, - (TT_CMap_Info_GetFunc) tt_cmap10_get_info - ) + (TT_CMap_ValidateFunc)tt_cmap10_validate, + (TT_CMap_Info_GetFunc)tt_cmap10_get_info ) #endif /* TT_CONFIG_CMAP_FORMAT_10 */ @@ -2010,7 +2064,7 @@ cmap->valid = 0; - return SFNT_Err_Ok; + return FT_Err_Ok; } @@ -2018,9 +2072,9 @@ tt_cmap12_validate( FT_Byte* table, FT_Validator valid ) { - FT_Byte* p; - FT_ULong length; - FT_ULong num_groups; + FT_Byte* p; + FT_ULong length; + FT_ULong num_groups; if ( table + 16 > valid->limit ) @@ -2033,7 +2087,9 @@ num_groups = TT_NEXT_ULONG( p ); if ( length > (FT_ULong)( valid->limit - table ) || - length < 16 + 12 * num_groups ) + /* length < 16 + 12 * num_groups ? */ + length < 16 || + ( length - 16 ) / 12 < num_groups ) FT_INVALID_TOO_SHORT; /* check groups, they must be in increasing order */ @@ -2055,7 +2111,12 @@ if ( valid->level >= FT_VALIDATE_TIGHT ) { - if ( start_id + end - start >= TT_VALID_GLYPH_COUNT( valid ) ) + FT_UInt32 d = end - start; + + + /* start_id + end - start >= TT_VALID_GLYPH_COUNT( valid ) ? */ + if ( d > TT_VALID_GLYPH_COUNT( valid ) || + start_id >= TT_VALID_GLYPH_COUNT( valid ) - d ) FT_INVALID_GLYPH_ID; } @@ -2063,7 +2124,7 @@ } } - return SFNT_Err_Ok; + return FT_Err_Ok; } @@ -2084,8 +2145,6 @@ char_code = cmap->cur_charcode + 1; - n = cmap->cur_group; - for ( n = cmap->cur_group; n < cmap->num_groups; n++ ) { p = cmap->cmap.data + 16 + 12 * n; @@ -2254,24 +2313,28 @@ cmap_info->format = 12; cmap_info->language = (FT_ULong)TT_PEEK_ULONG( p ); - return SFNT_Err_Ok; + return FT_Err_Ok; } - FT_DEFINE_TT_CMAP(tt_cmap12_class_rec, - sizeof ( TT_CMap12Rec ), + FT_DEFINE_TT_CMAP( + tt_cmap12_class_rec, + sizeof ( TT_CMap12Rec ), + + (FT_CMap_InitFunc) tt_cmap12_init, + (FT_CMap_DoneFunc) NULL, + (FT_CMap_CharIndexFunc)tt_cmap12_char_index, + (FT_CMap_CharNextFunc) tt_cmap12_char_next, - (FT_CMap_InitFunc) tt_cmap12_init, - (FT_CMap_DoneFunc) NULL, - (FT_CMap_CharIndexFunc)tt_cmap12_char_index, - (FT_CMap_CharNextFunc) tt_cmap12_char_next, + NULL, + NULL, + NULL, + NULL, + NULL, - NULL, NULL, NULL, NULL, NULL - , 12, - (TT_CMap_ValidateFunc) tt_cmap12_validate, - (TT_CMap_Info_GetFunc) tt_cmap12_get_info - ) + (TT_CMap_ValidateFunc)tt_cmap12_validate, + (TT_CMap_Info_GetFunc)tt_cmap12_get_info ) #endif /* TT_CONFIG_CMAP_FORMAT_12 */ @@ -2330,7 +2393,7 @@ cmap->valid = 0; - return SFNT_Err_Ok; + return FT_Err_Ok; } @@ -2338,9 +2401,9 @@ tt_cmap13_validate( FT_Byte* table, FT_Validator valid ) { - FT_Byte* p; - FT_ULong length; - FT_ULong num_groups; + FT_Byte* p; + FT_ULong length; + FT_ULong num_groups; if ( table + 16 > valid->limit ) @@ -2353,7 +2416,9 @@ num_groups = TT_NEXT_ULONG( p ); if ( length > (FT_ULong)( valid->limit - table ) || - length < 16 + 12 * num_groups ) + /* length < 16 + 12 * num_groups ? */ + length < 16 || + ( length - 16 ) / 12 < num_groups ) FT_INVALID_TOO_SHORT; /* check groups, they must be in increasing order */ @@ -2383,7 +2448,7 @@ } } - return SFNT_Err_Ok; + return FT_Err_Ok; } @@ -2404,8 +2469,6 @@ char_code = cmap->cur_charcode + 1; - n = cmap->cur_group; - for ( n = cmap->cur_group; n < cmap->num_groups; n++ ) { p = cmap->cmap.data + 16 + 12 * n; @@ -2490,7 +2553,6 @@ /* if `char_code' is not in any group, then `mid' is */ /* the group nearest to `char_code' */ - /* */ if ( char_code > end ) { @@ -2570,24 +2632,28 @@ cmap_info->format = 13; cmap_info->language = (FT_ULong)TT_PEEK_ULONG( p ); - return SFNT_Err_Ok; + return FT_Err_Ok; } - FT_DEFINE_TT_CMAP(tt_cmap13_class_rec, - sizeof ( TT_CMap13Rec ), + FT_DEFINE_TT_CMAP( + tt_cmap13_class_rec, + sizeof ( TT_CMap13Rec ), - (FT_CMap_InitFunc) tt_cmap13_init, - (FT_CMap_DoneFunc) NULL, - (FT_CMap_CharIndexFunc)tt_cmap13_char_index, - (FT_CMap_CharNextFunc) tt_cmap13_char_next, + (FT_CMap_InitFunc) tt_cmap13_init, + (FT_CMap_DoneFunc) NULL, + (FT_CMap_CharIndexFunc)tt_cmap13_char_index, + (FT_CMap_CharNextFunc) tt_cmap13_char_next, + + NULL, + NULL, + NULL, + NULL, + NULL, - NULL, NULL, NULL, NULL, NULL - , 13, - (TT_CMap_ValidateFunc) tt_cmap13_validate, - (TT_CMap_Info_GetFunc) tt_cmap13_get_info - ) + (TT_CMap_ValidateFunc)tt_cmap13_validate, + (TT_CMap_Info_GetFunc)tt_cmap13_get_info ) #endif /* TT_CONFIG_CMAP_FORMAT_13 */ @@ -2688,8 +2754,8 @@ FT_UInt32 num_results, FT_Memory memory ) { - FT_UInt32 old_max = cmap->max_results; - FT_Error error = SFNT_Err_Ok; + FT_UInt32 old_max = cmap->max_results; + FT_Error error = FT_Err_Ok; if ( num_results > cmap->max_results ) @@ -2713,11 +2779,11 @@ cmap->cmap.data = table; table += 6; - cmap->num_selectors = FT_PEEK_ULONG( table ); - cmap->max_results = 0; - cmap->results = NULL; + cmap->num_selectors = FT_PEEK_ULONG( table ); + cmap->max_results = 0; + cmap->results = NULL; - return SFNT_Err_Ok; + return FT_Err_Ok; } @@ -2725,13 +2791,22 @@ tt_cmap14_validate( FT_Byte* table, FT_Validator valid ) { - FT_Byte* p = table + 2; - FT_ULong length = TT_NEXT_ULONG( p ); - FT_ULong num_selectors = TT_NEXT_ULONG( p ); + FT_Byte* p; + FT_ULong length; + FT_ULong num_selectors; + + if ( table + 2 + 4 + 4 > valid->limit ) + FT_INVALID_TOO_SHORT; + + p = table + 2; + length = TT_NEXT_ULONG( p ); + num_selectors = TT_NEXT_ULONG( p ); if ( length > (FT_ULong)( valid->limit - table ) || - length < 10 + 11 * num_selectors ) + /* length < 10 + 11 * num_selectors ? */ + length < 10 || + ( length - 10 ) / 11 < num_selectors ) FT_INVALID_TOO_SHORT; /* check selectors, they must be in increasing order */ @@ -2767,7 +2842,8 @@ FT_ULong lastBase = 0; - if ( defp + numRanges * 4 > valid->limit ) + /* defp + numRanges * 4 > valid->limit ? */ + if ( numRanges > (FT_ULong)( valid->limit - defp ) / 4 ) FT_INVALID_TOO_SHORT; for ( i = 0; i < numRanges; ++i ) @@ -2791,10 +2867,11 @@ { FT_Byte* ndp = table + nondefOff; FT_ULong numMappings = TT_NEXT_ULONG( ndp ); - FT_ULong i, lastUni = 0; + FT_ULong i, lastUni = 0; - if ( numMappings * 4 > (FT_ULong)( valid->limit - ndp ) ) + /* numMappings * 4 > (FT_ULong)( valid->limit - ndp ) ? */ + if ( numMappings > ( (FT_ULong)( valid->limit - ndp ) ) / 4 ) FT_INVALID_TOO_SHORT; for ( i = 0; i < numMappings; ++i ) @@ -2819,7 +2896,7 @@ } } - return SFNT_Err_Ok; + return FT_Err_Ok; } @@ -2857,7 +2934,7 @@ /* subtable 14 does not define a language field */ cmap_info->language = 0xFFFFFFFFUL; - return SFNT_Err_Ok; + return FT_Err_Ok; } @@ -2965,7 +3042,7 @@ tt_cmap14_char_var_index( TT_CMap cmap, TT_CMap ucmap, FT_UInt32 charcode, - FT_UInt32 variantSelector) + FT_UInt32 variantSelector ) { FT_Byte* p = tt_cmap14_find_variant( cmap->data + 6, variantSelector ); FT_ULong defOff; @@ -3106,9 +3183,9 @@ static FT_UInt32* - tt_cmap14_get_def_chars( TT_CMap cmap, - FT_Byte* p, - FT_Memory memory ) + tt_cmap14_get_def_chars( TT_CMap cmap, + FT_Byte* p, + FT_Memory memory ) { TT_CMap14 cmap14 = (TT_CMap14) cmap; FT_UInt32 numRanges; @@ -3124,7 +3201,7 @@ for ( q = cmap14->results; numRanges > 0; --numRanges ) { - FT_UInt32 uni = (FT_UInt32)TT_NEXT_UINT24( p ); + FT_UInt32 uni = (FT_UInt32)TT_NEXT_UINT24( p ); cnt = FT_NEXT_BYTE( p ) + 1; @@ -3133,6 +3210,7 @@ q[0] = uni; uni += 1; q += 1; + } while ( --cnt != 0 ); } q[0] = 0; @@ -3176,7 +3254,6 @@ { FT_Byte *p = tt_cmap14_find_variant( cmap->data + 6, variantSelector ); - FT_UInt32 *ret; FT_Int i; FT_ULong defOff; FT_ULong nondefOff; @@ -3210,6 +3287,8 @@ FT_Byte* dp; FT_UInt di, ni, k; + FT_UInt32 *ret; + p = cmap->data + nondefOff; dp = cmap->data + defOff; @@ -3306,25 +3385,25 @@ } - FT_DEFINE_TT_CMAP(tt_cmap14_class_rec, - sizeof ( TT_CMap14Rec ), + FT_DEFINE_TT_CMAP( + tt_cmap14_class_rec, + sizeof ( TT_CMap14Rec ), + + (FT_CMap_InitFunc) tt_cmap14_init, + (FT_CMap_DoneFunc) tt_cmap14_done, + (FT_CMap_CharIndexFunc)tt_cmap14_char_index, + (FT_CMap_CharNextFunc) tt_cmap14_char_next, - (FT_CMap_InitFunc) tt_cmap14_init, - (FT_CMap_DoneFunc) tt_cmap14_done, - (FT_CMap_CharIndexFunc)tt_cmap14_char_index, - (FT_CMap_CharNextFunc) tt_cmap14_char_next, + /* Format 14 extension functions */ + (FT_CMap_CharVarIndexFunc) tt_cmap14_char_var_index, + (FT_CMap_CharVarIsDefaultFunc)tt_cmap14_char_var_isdefault, + (FT_CMap_VariantListFunc) tt_cmap14_variants, + (FT_CMap_CharVariantListFunc) tt_cmap14_char_variants, + (FT_CMap_VariantCharListFunc) tt_cmap14_variant_chars, - /* Format 14 extension functions */ - (FT_CMap_CharVarIndexFunc) tt_cmap14_char_var_index, - (FT_CMap_CharVarIsDefaultFunc)tt_cmap14_char_var_isdefault, - (FT_CMap_VariantListFunc) tt_cmap14_variants, - (FT_CMap_CharVariantListFunc) tt_cmap14_char_variants, - (FT_CMap_VariantCharListFunc) tt_cmap14_variant_chars - , 14, (TT_CMap_ValidateFunc)tt_cmap14_validate, - (TT_CMap_Info_GetFunc)tt_cmap14_get_info - ) + (TT_CMap_Info_GetFunc)tt_cmap14_get_info ) #endif /* TT_CONFIG_CMAP_FORMAT_14 */ @@ -3333,50 +3412,62 @@ static const TT_CMap_Class tt_cmap_classes[] = { -#define TTCMAPCITEM(a) &a, +#define TTCMAPCITEM( a ) &a, #include "ttcmapc.h" NULL, }; #else /*FT_CONFIG_OPTION_PIC*/ - void FT_Destroy_Class_tt_cmap_classes(FT_Library library, TT_CMap_Class* clazz) + void + FT_Destroy_Class_tt_cmap_classes( FT_Library library, + TT_CMap_Class* clazz ) { - FT_Memory memory = library->memory; + FT_Memory memory = library->memory; + + if ( clazz ) FT_FREE( clazz ); } - FT_Error FT_Create_Class_tt_cmap_classes(FT_Library library, TT_CMap_Class** output_class) + + FT_Error + FT_Create_Class_tt_cmap_classes( FT_Library library, + TT_CMap_Class** output_class ) { - TT_CMap_Class* clazz; - TT_CMap_ClassRec* recs; - FT_Error error; - FT_Memory memory = library->memory; - int i = 0; + TT_CMap_Class* clazz = NULL; + TT_CMap_ClassRec* recs; + FT_Error error; + FT_Memory memory = library->memory; + + int i = 0; + -#define TTCMAPCITEM(a) i++; +#define TTCMAPCITEM( a ) i++; #include "ttcmapc.h" - /* allocate enough space for both the pointers +terminator and the class instances */ - if ( FT_ALLOC( clazz, sizeof(*clazz)*(i+1)+sizeof(TT_CMap_ClassRec)*i ) ) + /* allocate enough space for both the pointers */ + /* plus terminator and the class instances */ + if ( FT_ALLOC( clazz, sizeof ( *clazz ) * ( i + 1 ) + + sizeof ( TT_CMap_ClassRec ) * i ) ) return error; /* the location of the class instances follows the array of pointers */ - recs = (TT_CMap_ClassRec*) (((char*)clazz)+(sizeof(*clazz)*(i+1))); - i=0; + recs = (TT_CMap_ClassRec*)( (char*)clazz + + sizeof ( *clazz ) * ( i + 1 ) ); + i = 0; #undef TTCMAPCITEM -#define TTCMAPCITEM(a) \ - FT_Init_Class_##a(&recs[i]); \ - clazz[i] = &recs[i]; \ +#define TTCMAPCITEM( a ) \ + FT_Init_Class_ ## a( &recs[i] ); \ + clazz[i] = &recs[i]; \ i++; #include "ttcmapc.h" clazz[i] = NULL; *output_class = clazz; - return SFNT_Err_Ok; + return FT_Err_Ok; } #endif /*FT_CONFIG_OPTION_PIC*/ @@ -3398,25 +3489,18 @@ if ( !p || p + 4 > limit ) - return SFNT_Err_Invalid_Table; + return FT_THROW( Invalid_Table ); /* only recognize format 0 */ if ( TT_NEXT_USHORT( p ) != 0 ) { - p -= 2; FT_ERROR(( "tt_face_build_cmaps:" " unsupported `cmap' table format = %d\n", - TT_PEEK_USHORT( p ) )); - return SFNT_Err_Invalid_Table; + TT_PEEK_USHORT( p - 2 ) )); + return FT_THROW( Invalid_Table ); } num_cmaps = TT_NEXT_USHORT( p ); -#ifdef FT_MAX_CHARMAP_CACHEABLE - if ( num_cmaps > FT_MAX_CHARMAP_CACHEABLE ) - FT_ERROR(( "tt_face_build_cmaps: too many cmap subtables(%d) " - "subtable#%d and later are loaded but cannot be searched\n", - num_cmaps, FT_MAX_CHARMAP_CACHEABLE + 1 )); -#endif for ( ; num_cmaps > 0 && p + 8 <= limit; num_cmaps-- ) { @@ -3434,7 +3518,7 @@ { FT_Byte* volatile cmap = table + offset; volatile FT_UInt format = TT_PEEK_USHORT( cmap ); - const TT_CMap_Class* volatile pclazz = FT_TT_CMAP_CLASSES_GET; + const TT_CMap_Class* volatile pclazz = TT_CMAP_CLASSES_GET; TT_CMap_Class volatile clazz; @@ -3444,7 +3528,7 @@ if ( clazz->format == format ) { volatile TT_ValidatorRec valid; - volatile FT_Error error = SFNT_Err_Ok; + volatile FT_Error error = FT_Err_Ok; ft_validator_init( FT_VALIDATOR( &valid ), cmap, limit, @@ -3452,8 +3536,7 @@ valid.num_glyphs = (FT_UInt)face->max_profile.numGlyphs; - if ( ft_setjmp( - *((ft_jmp_buf*)&FT_VALIDATOR( &valid )->jump_buffer) ) == 0 ) + if ( ft_setjmp( FT_VALIDATOR( &valid )->jump_buffer) == 0 ) { /* validate this cmap sub-table */ error = clazz->validate( cmap, FT_VALIDATOR( &valid ) ); @@ -3464,9 +3547,9 @@ FT_CMap ttcmap; - /* It might make sense to store the single variation selector */ - /* cmap somewhere special. But it would have to be in the */ - /* public FT_FaceRec, and we can't change that. */ + /* It might make sense to store the single variation */ + /* selector cmap somewhere special. But it would have to be */ + /* in the public FT_FaceRec, and we can't change that. */ if ( !FT_CMap_New( (FT_CMap_Class)clazz, cmap, &charmap, &ttcmap ) ) @@ -3493,7 +3576,7 @@ } } - return SFNT_Err_Ok; + return FT_Err_Ok; } diff --git a/src/sfnt/ttcmap.h b/src/sfnt/ttcmap.h index 94f7978..0fde167 100644 --- a/src/sfnt/ttcmap.h +++ b/src/sfnt/ttcmap.h @@ -4,7 +4,7 @@ /* */ /* TrueType character mapping table (cmap) support (specification). */ /* */ -/* Copyright 2002, 2003, 2004, 2005 by */ +/* Copyright 2002-2005, 2009, 2012 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -55,47 +55,80 @@ FT_BEGIN_HEADER } TT_CMap_ClassRec; + #ifndef FT_CONFIG_OPTION_PIC -#define FT_DEFINE_TT_CMAP(class_, size_, init_, done_, char_index_, \ - char_next_, char_var_index_, char_var_default_, variant_list_, \ - charvariant_list_,variantchar_list_, \ - format_, validate_, get_cmap_info_) \ - FT_CALLBACK_TABLE_DEF \ - const TT_CMap_ClassRec class_ = \ - { \ - {size_, init_, done_, char_index_, \ - char_next_, char_var_index_, char_var_default_, variant_list_, \ - charvariant_list_, variantchar_list_}, \ - format_, validate_, get_cmap_info_ \ +#define FT_DEFINE_TT_CMAP( class_, \ + size_, \ + init_, \ + done_, \ + char_index_, \ + char_next_, \ + char_var_index_, \ + char_var_default_, \ + variant_list_, \ + charvariant_list_, \ + variantchar_list_, \ + format_, \ + validate_, \ + get_cmap_info_ ) \ + FT_CALLBACK_TABLE_DEF \ + const TT_CMap_ClassRec class_ = \ + { \ + { size_, \ + init_, \ + done_, \ + char_index_, \ + char_next_, \ + char_var_index_, \ + char_var_default_, \ + variant_list_, \ + charvariant_list_, \ + variantchar_list_ \ + }, \ + \ + format_, \ + validate_, \ + get_cmap_info_ \ }; #else /* FT_CONFIG_OPTION_PIC */ -#define FT_DEFINE_TT_CMAP(class_, size_, init_, done_, char_index_, \ - char_next_, char_var_index_, char_var_default_, variant_list_, \ - charvariant_list_,variantchar_list_, \ - format_, validate_, get_cmap_info_) \ - void \ - FT_Init_Class_##class_( TT_CMap_ClassRec* clazz ) \ - { \ - clazz->clazz.size = size_; \ - clazz->clazz.init = init_; \ - clazz->clazz.done = done_; \ - clazz->clazz.char_index = char_index_; \ - clazz->clazz.char_next = char_next_; \ - clazz->clazz.char_var_index = char_var_index_; \ - clazz->clazz.char_var_default = char_var_default_; \ - clazz->clazz.variant_list = variant_list_; \ - clazz->clazz.charvariant_list = charvariant_list_; \ - clazz->clazz.variantchar_list = variantchar_list_; \ - clazz->format = format_; \ - clazz->validate = validate_; \ - clazz->get_cmap_info = get_cmap_info_; \ +#define FT_DEFINE_TT_CMAP( class_, \ + size_, \ + init_, \ + done_, \ + char_index_, \ + char_next_, \ + char_var_index_, \ + char_var_default_, \ + variant_list_, \ + charvariant_list_, \ + variantchar_list_, \ + format_, \ + validate_, \ + get_cmap_info_ ) \ + void \ + FT_Init_Class_ ## class_( TT_CMap_ClassRec* clazz ) \ + { \ + clazz->clazz.size = size_; \ + clazz->clazz.init = init_; \ + clazz->clazz.done = done_; \ + clazz->clazz.char_index = char_index_; \ + clazz->clazz.char_next = char_next_; \ + clazz->clazz.char_var_index = char_var_index_; \ + clazz->clazz.char_var_default = char_var_default_; \ + clazz->clazz.variant_list = variant_list_; \ + clazz->clazz.charvariant_list = charvariant_list_; \ + clazz->clazz.variantchar_list = variantchar_list_; \ + clazz->format = format_; \ + clazz->validate = validate_; \ + clazz->get_cmap_info = get_cmap_info_; \ } #endif /* FT_CONFIG_OPTION_PIC */ + typedef struct TT_ValidatorRec_ { FT_ValidatorRec validator; @@ -104,7 +137,7 @@ FT_BEGIN_HEADER } TT_ValidatorRec, *TT_Validator; -#define TT_VALIDATOR( x ) ((TT_Validator)( x )) +#define TT_VALIDATOR( x ) ( (TT_Validator)( x ) ) #define TT_VALID_GLYPH_COUNT( x ) TT_VALIDATOR( x )->num_glyphs diff --git a/src/sfnt/ttcmapc.h b/src/sfnt/ttcmapc.h index 4c9c6a5..2ea2043 100644 --- a/src/sfnt/ttcmapc.h +++ b/src/sfnt/ttcmapc.h @@ -17,39 +17,40 @@ #ifdef TT_CONFIG_CMAP_FORMAT_0 - TTCMAPCITEM(tt_cmap0_class_rec) + TTCMAPCITEM( tt_cmap0_class_rec ) #endif #ifdef TT_CONFIG_CMAP_FORMAT_2 - TTCMAPCITEM(tt_cmap2_class_rec) + TTCMAPCITEM( tt_cmap2_class_rec ) #endif #ifdef TT_CONFIG_CMAP_FORMAT_4 - TTCMAPCITEM(tt_cmap4_class_rec) + TTCMAPCITEM( tt_cmap4_class_rec ) #endif #ifdef TT_CONFIG_CMAP_FORMAT_6 - TTCMAPCITEM(tt_cmap6_class_rec) + TTCMAPCITEM( tt_cmap6_class_rec ) #endif #ifdef TT_CONFIG_CMAP_FORMAT_8 - TTCMAPCITEM(tt_cmap8_class_rec) + TTCMAPCITEM( tt_cmap8_class_rec ) #endif #ifdef TT_CONFIG_CMAP_FORMAT_10 - TTCMAPCITEM(tt_cmap10_class_rec) + TTCMAPCITEM( tt_cmap10_class_rec ) #endif #ifdef TT_CONFIG_CMAP_FORMAT_12 - TTCMAPCITEM(tt_cmap12_class_rec) + TTCMAPCITEM( tt_cmap12_class_rec ) #endif #ifdef TT_CONFIG_CMAP_FORMAT_13 - TTCMAPCITEM(tt_cmap13_class_rec) + TTCMAPCITEM( tt_cmap13_class_rec ) #endif #ifdef TT_CONFIG_CMAP_FORMAT_14 - TTCMAPCITEM(tt_cmap14_class_rec) + TTCMAPCITEM( tt_cmap14_class_rec ) #endif + /* END */ diff --git a/src/sfnt/ttkern.c b/src/sfnt/ttkern.c index 4688898..455e7b5 100644 --- a/src/sfnt/ttkern.c +++ b/src/sfnt/ttkern.c @@ -5,7 +5,7 @@ /* Load the basic TrueType kerning table. This doesn't handle */ /* kerning data within the GPOS table at the moment. */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010 by */ +/* Copyright 1996-2007, 2009, 2010, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -61,7 +61,7 @@ { FT_ERROR(( "tt_face_load_kern:" " kerning table is too small - ignored\n" )); - error = SFNT_Err_Table_Missing; + error = FT_THROW( Table_Missing ); goto Exit; } @@ -99,7 +99,7 @@ length = FT_NEXT_USHORT( p ); coverage = FT_NEXT_USHORT( p ); - if ( length <= 6 ) + if ( length <= 6 + 8 ) break; p_next += length; @@ -183,7 +183,7 @@ FT_UInt right_glyph ) { FT_Int result = 0; - FT_UInt count, mask = 1; + FT_UInt count, mask; FT_Byte* p = face->kern_table; FT_Byte* p_limit = p + face->kern_table_size; @@ -196,7 +196,7 @@ count--, mask <<= 1 ) { FT_Byte* base = p; - FT_Byte* next = base; + FT_Byte* next; FT_UInt version = FT_NEXT_USHORT( p ); FT_UInt length = FT_NEXT_USHORT( p ); FT_UInt coverage = FT_NEXT_USHORT( p ); diff --git a/src/sfnt/ttload.c b/src/sfnt/ttload.c index 5fb9aea..8338150 100644 --- a/src/sfnt/ttload.c +++ b/src/sfnt/ttload.c @@ -5,8 +5,7 @@ /* Load the basic TrueType tables, i.e., tables that can be either in */ /* TTF or OTF fonts (body). */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, */ -/* 2010 by */ +/* Copyright 1996-2010, 2012-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -143,7 +142,7 @@ goto Exit; } else - error = SFNT_Err_Table_Missing; + error = FT_THROW( Table_Missing ); Exit: return error; @@ -208,7 +207,10 @@ } /* we ignore invalid tables */ - if ( table.Offset + table.Length > stream->size ) + + /* table.Offset + table.Length > stream->size ? */ + if ( table.Length > stream->size || + table.Offset > stream->size - table.Length ) { FT_TRACE2(( "check_table_dir: table entry %d invalid\n", nn )); continue; @@ -237,8 +239,9 @@ */ if ( table.Length < 0x36 ) { - FT_TRACE2(( "check_table_dir: `head' table too small\n" )); - error = SFNT_Err_Table_Missing; + FT_TRACE2(( "check_table_dir:" + " `head' or `bhed' table too small\n" )); + error = FT_THROW( Table_Missing ); goto Exit; } @@ -247,12 +250,8 @@ goto Exit; if ( magic != 0x5F0F3CF5UL ) - { FT_TRACE2(( "check_table_dir:" - " no magic number found in `head' table\n")); - error = SFNT_Err_Table_Missing; - goto Exit; - } + " invalid magic number in `head' or `bhed' table\n")); if ( FT_STREAM_SEEK( offset + ( nn + 1 ) * 16 ) ) goto Exit; @@ -268,14 +267,14 @@ if ( sfnt->num_tables == 0 ) { FT_TRACE2(( "check_table_dir: no tables found\n" )); - error = SFNT_Err_Unknown_File_Format; + error = FT_THROW( Unknown_File_Format ); goto Exit; } /* if `sing' and `meta' tables are present, there is no `head' table */ if ( has_head || ( has_sing && has_meta ) ) { - error = SFNT_Err_Ok; + error = FT_Err_Ok; goto Exit; } else @@ -286,7 +285,7 @@ #else FT_TRACE2(( " neither `head' nor `sing' table found\n" )); #endif - error = SFNT_Err_Table_Missing; + error = FT_THROW( Table_Missing ); } Exit: @@ -354,7 +353,7 @@ #if 0 if ( sfnt.search_range != 1 << ( sfnt.entry_selector + 4 ) || sfnt.search_range + sfnt.range_shift != sfnt.num_tables << 4 ) - return SFNT_Err_Unknown_File_Format; + return FT_THROW( Unknown_File_Format ); #endif /* load the table directory */ @@ -362,14 +361,17 @@ FT_TRACE2(( "-- Number of tables: %10u\n", sfnt.num_tables )); FT_TRACE2(( "-- Format version: 0x%08lx\n", sfnt.format_tag )); - /* check first */ - error = check_table_dir( &sfnt, stream ); - if ( error ) + if ( sfnt.format_tag != TTAG_OTTO ) { - FT_TRACE2(( "tt_face_load_font_dir:" - " invalid table directory for TrueType\n" )); + /* check first */ + error = check_table_dir( &sfnt, stream ); + if ( error ) + { + FT_TRACE2(( "tt_face_load_font_dir:" + " invalid table directory for TrueType\n" )); - goto Exit; + goto Exit; + } } face->num_tables = sfnt.num_tables; @@ -392,11 +394,14 @@ { entry->Tag = FT_GET_TAG4(); entry->CheckSum = FT_GET_ULONG(); - entry->Offset = FT_GET_LONG(); - entry->Length = FT_GET_LONG(); + entry->Offset = FT_GET_ULONG(); + entry->Length = FT_GET_ULONG(); /* ignore invalid tables */ - if ( entry->Offset + entry->Length > stream->size ) + + /* entry->Offset + entry->Length > stream->size ? */ + if ( entry->Length > stream->size || + entry->Offset > stream->size - entry->Length ) continue; else { @@ -480,7 +485,7 @@ table = tt_face_lookup_table( face, tag ); if ( !table ) { - error = SFNT_Err_Table_Missing; + error = FT_THROW( Table_Missing ); goto Exit; } @@ -495,7 +500,7 @@ { *length = size; - return SFNT_Err_Ok; + return FT_Err_Ok; } if ( length ) @@ -624,7 +629,7 @@ FT_Error error; TT_MaxProfile* maxProfile = &face->max_profile; - const FT_Frame_Field maxp_fields[] = + static const FT_Frame_Field maxp_fields[] = { #undef FT_STRUCTURE #define FT_STRUCTURE TT_MaxProfile @@ -635,7 +640,7 @@ FT_FRAME_END }; - const FT_Frame_Field maxp_fields_extra[] = + static const FT_Frame_Field maxp_fields_extra[] = { FT_FRAME_START( 26 ), FT_FRAME_USHORT( maxPoints ), @@ -721,7 +726,7 @@ /*************************************************************************/ /* */ /* <Function> */ - /* tt_face_load_names */ + /* tt_face_load_name */ /* */ /* <Description> */ /* Loads the name records. */ @@ -799,7 +804,7 @@ if ( storage_start > storage_limit ) { FT_ERROR(( "tt_face_load_name: invalid `name' table\n" )); - error = SFNT_Err_Name_Table_Missing; + error = FT_THROW( Name_Table_Missing ); goto Exit; } @@ -952,7 +957,7 @@ FT_Error error; TT_OS2* os2; - const FT_Frame_Field os2_fields[] = + static const FT_Frame_Field os2_fields[] = { #undef FT_STRUCTURE #define FT_STRUCTURE TT_OS2 @@ -1004,7 +1009,8 @@ FT_FRAME_END }; - const FT_Frame_Field os2_fields_extra[] = + /* `OS/2' version 1 and newer */ + static const FT_Frame_Field os2_fields_extra1[] = { FT_FRAME_START( 8 ), FT_FRAME_ULONG( ulCodePageRange1 ), @@ -1012,7 +1018,8 @@ FT_FRAME_END }; - const FT_Frame_Field os2_fields_extra2[] = + /* `OS/2' version 2 and newer */ + static const FT_Frame_Field os2_fields_extra2[] = { FT_FRAME_START( 10 ), FT_FRAME_SHORT ( sxHeight ), @@ -1023,6 +1030,15 @@ FT_FRAME_END }; + /* `OS/2' version 5 and newer */ + static const FT_Frame_Field os2_fields_extra5[] = + { + FT_FRAME_START( 4 ), + FT_FRAME_USHORT( usLowerOpticalPointSize ), + FT_FRAME_USHORT( usUpperOpticalPointSize ), + FT_FRAME_END + }; + /* We now support old Mac fonts where the OS/2 table doesn't */ /* exist. Simply put, we set the `version' field to 0xFFFF */ @@ -1036,18 +1052,20 @@ if ( FT_STREAM_READ_FIELDS( os2_fields, os2 ) ) goto Exit; - os2->ulCodePageRange1 = 0; - os2->ulCodePageRange2 = 0; - os2->sxHeight = 0; - os2->sCapHeight = 0; - os2->usDefaultChar = 0; - os2->usBreakChar = 0; - os2->usMaxContext = 0; + os2->ulCodePageRange1 = 0; + os2->ulCodePageRange2 = 0; + os2->sxHeight = 0; + os2->sCapHeight = 0; + os2->usDefaultChar = 0; + os2->usBreakChar = 0; + os2->usMaxContext = 0; + os2->usLowerOpticalPointSize = 0; + os2->usUpperOpticalPointSize = 0xFFFF; if ( os2->version >= 0x0001 ) { /* only version 1 tables */ - if ( FT_STREAM_READ_FIELDS( os2_fields_extra, os2 ) ) + if ( FT_STREAM_READ_FIELDS( os2_fields_extra1, os2 ) ) goto Exit; if ( os2->version >= 0x0002 ) @@ -1055,6 +1073,13 @@ /* only version 2 tables */ if ( FT_STREAM_READ_FIELDS( os2_fields_extra2, os2 ) ) goto Exit; + + if ( os2->version >= 0x0005 ) + { + /* only version 5 tables */ + if ( FT_STREAM_READ_FIELDS( os2_fields_extra5, os2 ) ) + goto Exit; + } } } @@ -1125,7 +1150,7 @@ FT_TRACE3(( "isFixedPitch: %s\n", post->isFixedPitch ? " yes" : " no" )); - return SFNT_Err_Ok; + return FT_Err_Ok; } @@ -1162,6 +1187,7 @@ FT_FRAME_USHORT( Style ), FT_FRAME_USHORT( TypeFamily ), FT_FRAME_USHORT( CapHeight ), + FT_FRAME_USHORT( SymbolSet ), FT_FRAME_BYTES ( TypeFace, 16 ), FT_FRAME_BYTES ( CharacterComplement, 8 ), FT_FRAME_BYTES ( FileName, 6 ), @@ -1233,18 +1259,18 @@ if ( face->gasp.version >= 2 ) { face->gasp.numRanges = 0; - error = SFNT_Err_Invalid_Table; + error = FT_THROW( Invalid_Table ); goto Exit; } num_ranges = face->gasp.numRanges; FT_TRACE3(( "numRanges: %u\n", num_ranges )); - if ( FT_QNEW_ARRAY( gaspranges, num_ranges ) || - FT_FRAME_ENTER( num_ranges * 4L ) ) + if ( FT_QNEW_ARRAY( face->gasp.gaspRanges, num_ranges ) || + FT_FRAME_ENTER( num_ranges * 4L ) ) goto Exit; - face->gasp.gaspRanges = gaspranges; + gaspranges = face->gasp.gaspRanges; for ( j = 0; j < num_ranges; j++ ) { diff --git a/src/sfnt/ttmtx.c b/src/sfnt/ttmtx.c index 73ac8b2..bb31957 100644 --- a/src/sfnt/ttmtx.c +++ b/src/sfnt/ttmtx.c @@ -4,7 +4,7 @@ /* */ /* Load the metrics tables common to TTF and OTF fonts (body). */ /* */ -/* Copyright 2006-2009, 2011 by */ +/* Copyright 2006-2009, 2011-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -35,13 +35,6 @@ #define FT_COMPONENT trace_ttmtx - /* - * Unfortunately, we can't enable our memory optimizations if - * FT_CONFIG_OPTION_OLD_INTERNALS is defined. This is because at least - * one rogue client (libXfont in the X.Org XServer) is directly accessing - * the metrics. - */ - /*************************************************************************/ /* */ /* <Function> */ @@ -60,8 +53,6 @@ /* <Return> */ /* FreeType error code. 0 means success. */ /* */ -#ifndef FT_CONFIG_OPTION_OLD_INTERNALS - FT_LOCAL_DEF( FT_Error ) tt_face_load_hmtx( TT_Face face, FT_Stream stream, @@ -97,142 +88,6 @@ return error; } -#else /* !FT_CONFIG_OPTION_OLD_INTERNALS */ - - FT_LOCAL_DEF( FT_Error ) - tt_face_load_hmtx( TT_Face face, - FT_Stream stream, - FT_Bool vertical ) - { - FT_Error error; - FT_Memory memory = stream->memory; - - FT_ULong table_len; - FT_Long num_shorts, num_longs, num_shorts_checked; - - TT_LongMetrics* longs; - TT_ShortMetrics** shorts; - FT_Byte* p; - - - if ( vertical ) - { - void* lm = &face->vertical.long_metrics; - void** sm = &face->vertical.short_metrics; - - - error = face->goto_table( face, TTAG_vmtx, stream, &table_len ); - if ( error ) - goto Fail; - - num_longs = face->vertical.number_Of_VMetrics; - if ( (FT_ULong)num_longs > table_len / 4 ) - num_longs = (FT_Long)( table_len / 4 ); - - face->vertical.number_Of_VMetrics = 0; - - longs = (TT_LongMetrics*)lm; - shorts = (TT_ShortMetrics**)sm; - } - else - { - void* lm = &face->horizontal.long_metrics; - void** sm = &face->horizontal.short_metrics; - - - error = face->goto_table( face, TTAG_hmtx, stream, &table_len ); - if ( error ) - goto Fail; - - num_longs = face->horizontal.number_Of_HMetrics; - if ( (FT_ULong)num_longs > table_len / 4 ) - num_longs = (FT_Long)( table_len / 4 ); - - face->horizontal.number_Of_HMetrics = 0; - - longs = (TT_LongMetrics*)lm; - shorts = (TT_ShortMetrics**)sm; - } - - /* never trust derived values */ - - num_shorts = face->max_profile.numGlyphs - num_longs; - num_shorts_checked = ( table_len - num_longs * 4L ) / 2; - - if ( num_shorts < 0 ) - { - FT_TRACE0(( "tt_face_load_hmtx:" - " %cmtx has more metrics than glyphs.\n", - vertical ? 'v' : 'h' )); - - /* Adobe simply ignores this problem. So we shall do the same. */ -#if 0 - error = vertical ? SFNT_Err_Invalid_Vert_Metrics - : SFNT_Err_Invalid_Horiz_Metrics; - goto Exit; -#else - num_shorts = 0; -#endif - } - - if ( FT_QNEW_ARRAY( *longs, num_longs ) || - FT_QNEW_ARRAY( *shorts, num_shorts ) ) - goto Fail; - - if ( FT_FRAME_ENTER( table_len ) ) - goto Fail; - - p = stream->cursor; - - { - TT_LongMetrics cur = *longs; - TT_LongMetrics limit = cur + num_longs; - - - for ( ; cur < limit; cur++ ) - { - cur->advance = FT_NEXT_USHORT( p ); - cur->bearing = FT_NEXT_SHORT( p ); - } - } - - /* do we have an inconsistent number of metric values? */ - { - TT_ShortMetrics* cur = *shorts; - TT_ShortMetrics* limit = cur + - FT_MIN( num_shorts, num_shorts_checked ); - - - for ( ; cur < limit; cur++ ) - *cur = FT_NEXT_SHORT( p ); - - /* We fill up the missing left side bearings with the */ - /* last valid value. Since this will occur for buggy CJK */ - /* fonts usually only, nothing serious will happen. */ - if ( num_shorts > num_shorts_checked && num_shorts_checked > 0 ) - { - FT_Short val = (*shorts)[num_shorts_checked - 1]; - - - limit = *shorts + num_shorts; - for ( ; cur < limit; cur++ ) - *cur = val; - } - } - - FT_FRAME_EXIT(); - - if ( vertical ) - face->vertical.number_Of_VMetrics = (FT_UShort)num_longs; - else - face->horizontal.number_Of_HMetrics = (FT_UShort)num_longs; - - Fail: - return error; - } - -#endif /* !FT_CONFIG_OPTION_OLD_INTERNALS */ - /*************************************************************************/ /* */ @@ -260,7 +115,7 @@ FT_Error error; TT_HoriHeader* header; - const FT_Frame_Field metrics_header_fields[] = + static const FT_Frame_Field metrics_header_fields[] = { #undef FT_STRUCTURE #define FT_STRUCTURE TT_HoriHeader @@ -328,24 +183,25 @@ /* tt_face_get_metrics */ /* */ /* <Description> */ - /* Returns the horizontal or vertical metrics in font units for a */ - /* given glyph. The metrics are the left side bearing (resp. top */ - /* side bearing) and advance width (resp. advance height). */ + /* Return the horizontal or vertical metrics in font units for a */ + /* given glyph. The values are the left side bearing (top side */ + /* bearing for vertical metrics) and advance width (advance height */ + /* for vertical metrics). */ /* */ /* <Input> */ - /* header :: A pointer to either the horizontal or vertical metrics */ - /* structure. */ + /* face :: A pointer to the TrueType face structure. */ + /* */ + /* vertical :: If set to TRUE, get vertical metrics. */ /* */ - /* idx :: The glyph index. */ + /* gindex :: The glyph index. */ /* */ /* <Output> */ - /* bearing :: The bearing, either left side or top side. */ + /* abearing :: The bearing, either left side or top side. */ /* */ - /* advance :: The advance width resp. advance height. */ + /* aadvance :: The advance width or advance height, depending on */ + /* the `vertical' flag. */ /* */ -#ifndef FT_CONFIG_OPTION_OLD_INTERNALS - - FT_LOCAL_DEF( FT_Error ) + FT_LOCAL_DEF( void ) tt_face_get_metrics( TT_Face face, FT_Bool vertical, FT_UInt gindex, @@ -418,51 +274,7 @@ *abearing = 0; *aadvance = 0; } - - return SFNT_Err_Ok; } -#else /* !FT_CONFIG_OPTION_OLD_INTERNALS */ - - FT_LOCAL_DEF( FT_Error ) - tt_face_get_metrics( TT_Face face, - FT_Bool vertical, - FT_UInt gindex, - FT_Short* abearing, - FT_UShort* aadvance ) - { - void* v = &face->vertical; - void* h = &face->horizontal; - TT_HoriHeader* header = vertical ? (TT_HoriHeader*)v - : (TT_HoriHeader*)h; - TT_LongMetrics longs_m; - FT_UShort k = header->number_Of_HMetrics; - - - if ( k == 0 || - !header->long_metrics || - gindex >= (FT_UInt)face->max_profile.numGlyphs ) - { - *abearing = *aadvance = 0; - return SFNT_Err_Ok; - } - - if ( gindex < (FT_UInt)k ) - { - longs_m = (TT_LongMetrics)header->long_metrics + gindex; - *abearing = longs_m->bearing; - *aadvance = longs_m->advance; - } - else - { - *abearing = ((TT_ShortMetrics*)header->short_metrics)[gindex - k]; - *aadvance = ((TT_LongMetrics)header->long_metrics)[k - 1].advance; - } - - return SFNT_Err_Ok; - } - -#endif /* !FT_CONFIG_OPTION_OLD_INTERNALS */ - /* END */ diff --git a/src/sfnt/ttmtx.h b/src/sfnt/ttmtx.h index 8b91a11..fb04039 100644 --- a/src/sfnt/ttmtx.h +++ b/src/sfnt/ttmtx.h @@ -4,7 +4,7 @@ /* */ /* Load the metrics tables common to TTF and OTF fonts (specification). */ /* */ -/* Copyright 2006 by */ +/* Copyright 2006, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -40,7 +40,7 @@ FT_BEGIN_HEADER FT_Bool vertical ); - FT_LOCAL( FT_Error ) + FT_LOCAL( void ) tt_face_get_metrics( TT_Face face, FT_Bool vertical, FT_UInt gindex, diff --git a/src/sfnt/ttpost.c b/src/sfnt/ttpost.c index 6f4bb1d..99d8005 100644 --- a/src/sfnt/ttpost.c +++ b/src/sfnt/ttpost.c @@ -5,7 +5,7 @@ /* Postcript name table processing for TrueType and OpenType fonts */ /* (body). */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2006, 2007, 2008, 2009, 2010 by */ +/* Copyright 1996-2003, 2006-2010, 2013, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -64,12 +64,12 @@ #define MAC_NAME( x ) ( (FT_String*)tt_post_default_names[x] ) - /* the 258 default Mac PS glyph names */ + /* the 258 default Mac PS glyph names; see file `tools/glnames.py' */ static const FT_String* const tt_post_default_names[258] = { /* 0 */ - ".notdef", ".null", "CR", "space", "exclam", + ".notdef", ".null", "nonmarkingreturn", "space", "exclam", "quotedbl", "numbersign", "dollar", "percent", "ampersand", /* 10 */ "quotesingle", "parenleft", "parenright", "asterisk", "plus", @@ -120,7 +120,7 @@ "ae", "oslash", "questiondown", "exclamdown", "logicalnot", "radical", "florin", "approxequal", "Delta", "guillemotleft", /* 170 */ - "guillemotright", "ellipsis", "nbspace", "Agrave", "Atilde", + "guillemotright", "ellipsis", "nonbreakingspace", "Agrave", "Atilde", "Otilde", "OE", "oe", "endash", "emdash", /* 180 */ "quotedblleft", "quotedblright", "quoteleft", "quoteright", "divide", @@ -144,8 +144,8 @@ "multiply", "onesuperior", "twosuperior", "threesuperior", "onehalf", "onequarter", "threequarters", "franc", "Gbreve", "gbreve", /* 250 */ - "Idot", "Scedilla", "scedilla", "Cacute", "cacute", - "Ccaron", "ccaron", "dmacron", + "Idotaccent", "Scedilla", "scedilla", "Cacute", "cacute", + "Ccaron", "ccaron", "dcroat", }; @@ -178,7 +178,7 @@ if ( num_glyphs > face->max_profile.numGlyphs ) { - error = SFNT_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } @@ -284,7 +284,7 @@ table->glyph_indices = glyph_indices; table->glyph_names = name_strings; } - return SFNT_Err_Ok; + return FT_Err_Ok; Fail1: { @@ -325,7 +325,7 @@ /* check the number of glyphs */ if ( num_glyphs > face->max_profile.numGlyphs || num_glyphs > 258 ) { - error = SFNT_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } @@ -345,7 +345,7 @@ if ( idx < 0 || idx > num_glyphs ) { - error = SFNT_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Fail; } } @@ -360,7 +360,7 @@ table->offsets = offset_table; } - return SFNT_Err_Ok; + return FT_Err_Ok; Fail: FT_FREE( offset_table ); @@ -402,7 +402,7 @@ else if ( format == 0x00028000L ) error = load_format_25( face, stream, post_limit ); else - error = SFNT_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); face->postscript_names.loaded = 1; @@ -488,15 +488,15 @@ if ( !face ) - return SFNT_Err_Invalid_Face_Handle; + return FT_THROW( Invalid_Face_Handle ); if ( idx >= (FT_UInt)face->max_profile.numGlyphs ) - return SFNT_Err_Invalid_Glyph_Index; + return FT_THROW( Invalid_Glyph_Index ); #ifdef FT_CONFIG_OPTION_POSTSCRIPT_NAMES psnames = (FT_Service_PsCMaps)face->psnames; if ( !psnames ) - return SFNT_Err_Unimplemented_Feature; + return FT_THROW( Unimplemented_Feature ); #endif names = &face->postscript_names; @@ -556,7 +556,7 @@ /* nothing to do for format == 0x00030000L */ End: - return SFNT_Err_Ok; + return FT_Err_Ok; } diff --git a/src/sfnt/ttsbit.c b/src/sfnt/ttsbit.c index 283ba7e..c2db96c 100644 --- a/src/sfnt/ttsbit.c +++ b/src/sfnt/ttsbit.c @@ -4,10 +4,12 @@ /* */ /* TrueType and OpenType embedded bitmap support (body). */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, */ -/* 2010 by */ +/* Copyright 2005-2009, 2013, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ +/* Copyright 2013 by Google, Inc. */ +/* Google Author(s): Behdad Esfahbod. */ +/* */ /* This file is part of the FreeType project, and may only be used, */ /* modified, and distributed under the terms of the FreeType project */ /* license, LICENSE.TXT. By continuing to use, modify, or distribute */ @@ -16,29 +18,19 @@ /* */ /***************************************************************************/ -#include <ft2build.h> -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_STREAM_H -#include FT_TRUETYPE_TAGS_H - - /* - * Alas, the memory-optimized sbit loader can't be used when implementing - * the `old internals' hack - */ -#ifndef FT_CONFIG_OPTION_OLD_INTERNALS - -#include "ttsbit0.c" - -#else /* FT_CONFIG_OPTION_OLD_INTERNALS */ #include <ft2build.h> #include FT_INTERNAL_DEBUG_H #include FT_INTERNAL_STREAM_H #include FT_TRUETYPE_TAGS_H +#include FT_BITMAP_H #include "ttsbit.h" #include "sferrors.h" +#include "ttmtx.h" +#include "pngshim.h" + /*************************************************************************/ /* */ @@ -50,1398 +42,1352 @@ #define FT_COMPONENT trace_ttsbit - /*************************************************************************/ - /* */ - /* <Function> */ - /* blit_sbit */ - /* */ - /* <Description> */ - /* Blits a bitmap from an input stream into a given target. Supports */ - /* x and y offsets as well as byte padded lines. */ - /* */ - /* <Input> */ - /* target :: The target bitmap/pixmap. */ - /* */ - /* source :: The input packed bitmap data. */ - /* */ - /* line_bits :: The number of bits per line. */ - /* */ - /* byte_padded :: A flag which is true if lines are byte-padded. */ - /* */ - /* x_offset :: The horizontal offset. */ - /* */ - /* y_offset :: The vertical offset. */ - /* */ - /* <Note> */ - /* IMPORTANT: The x and y offsets are relative to the top corner of */ - /* the target bitmap (unlike the normal TrueType */ - /* convention). A positive y offset indicates a downwards */ - /* direction! */ - /* */ - static void - blit_sbit( FT_Bitmap* target, - FT_Byte* source, - FT_Int line_bits, - FT_Bool byte_padded, - FT_Int x_offset, - FT_Int y_offset, - FT_Int source_height ) + FT_LOCAL_DEF( FT_Error ) + tt_face_load_sbit( TT_Face face, + FT_Stream stream ) { - FT_Byte* line_buff; - FT_Int line_incr; - FT_Int height; + FT_Error error; + FT_ULong table_size; - FT_UShort acc; - FT_UInt loaded; + face->sbit_table = NULL; + face->sbit_table_size = 0; + face->sbit_table_type = TT_SBIT_TABLE_TYPE_NONE; + face->sbit_num_strikes = 0; - /* first of all, compute starting write position */ - line_incr = target->pitch; - line_buff = target->buffer; + error = face->goto_table( face, TTAG_CBLC, stream, &table_size ); + if ( !error ) + face->sbit_table_type = TT_SBIT_TABLE_TYPE_CBLC; + else + { + error = face->goto_table( face, TTAG_EBLC, stream, &table_size ); + if ( error ) + error = face->goto_table( face, TTAG_bloc, stream, &table_size ); + if ( !error ) + face->sbit_table_type = TT_SBIT_TABLE_TYPE_EBLC; + } + + if ( error ) + { + error = face->goto_table( face, TTAG_sbix, stream, &table_size ); + if ( !error ) + face->sbit_table_type = TT_SBIT_TABLE_TYPE_SBIX; + } + if ( error ) + goto Exit; - if ( line_incr < 0 ) - line_buff -= line_incr * ( target->rows - 1 ); + if ( table_size < 8 ) + { + FT_ERROR(( "tt_face_load_sbit_strikes: table too short\n" )); + error = FT_THROW( Invalid_File_Format ); + goto Exit; + } - line_buff += ( x_offset >> 3 ) + y_offset * line_incr; + switch ( (FT_UInt)face->sbit_table_type ) + { + case TT_SBIT_TABLE_TYPE_EBLC: + case TT_SBIT_TABLE_TYPE_CBLC: + { + FT_Byte* p; + FT_Fixed version; + FT_ULong num_strikes; + FT_UInt count; - /***********************************************************************/ - /* */ - /* We use the extra-classic `accumulator' trick to extract the bits */ - /* from the source byte stream. */ - /* */ - /* Namely, the variable `acc' is a 16-bit accumulator containing the */ - /* last `loaded' bits from the input stream. The bits are shifted to */ - /* the upmost position in `acc'. */ - /* */ - /***********************************************************************/ - acc = 0; /* clear accumulator */ - loaded = 0; /* no bits were loaded */ + if ( FT_FRAME_EXTRACT( table_size, face->sbit_table ) ) + goto Exit; - for ( height = source_height; height > 0; height-- ) - { - FT_Byte* cur = line_buff; /* current write cursor */ - FT_Int count = line_bits; /* # of bits to extract per line */ - FT_Byte shift = (FT_Byte)( x_offset & 7 ); /* current write shift */ - FT_Byte space = (FT_Byte)( 8 - shift ); + face->sbit_table_size = table_size; + p = face->sbit_table; - /* first of all, read individual source bytes */ - if ( count >= 8 ) - { - count -= 8; + version = FT_NEXT_ULONG( p ); + num_strikes = FT_NEXT_ULONG( p ); + + if ( ( version & 0xFFFF0000UL ) != 0x00020000UL ) { - do - { - FT_Byte val; - - - /* ensure that there are at least 8 bits in the accumulator */ - if ( loaded < 8 ) - { - acc |= (FT_UShort)((FT_UShort)*source++ << ( 8 - loaded )); - loaded += 8; - } - - /* now write one byte */ - val = (FT_Byte)( acc >> 8 ); - if ( shift ) - { - cur[0] |= (FT_Byte)( val >> shift ); - cur[1] |= (FT_Byte)( val << space ); - } - else - cur[0] |= val; - - cur++; - acc <<= 8; /* remove bits from accumulator */ - loaded -= 8; - count -= 8; - - } while ( count >= 0 ); + error = FT_THROW( Unknown_File_Format ); + goto Exit; + } + + if ( num_strikes >= 0x10000UL ) + { + error = FT_THROW( Invalid_File_Format ); + goto Exit; } - /* restore `count' to correct value */ - count += 8; + /* + * Count the number of strikes available in the table. We are a bit + * paranoid there and don't trust the data. + */ + count = (FT_UInt)num_strikes; + if ( 8 + 48UL * count > table_size ) + count = (FT_UInt)( ( table_size - 8 ) / 48 ); + + face->sbit_num_strikes = count; } + break; - /* now write remaining bits (count < 8) */ - if ( count > 0 ) + case TT_SBIT_TABLE_TYPE_SBIX: { - FT_Byte val; + FT_UShort version; + FT_UShort flags; + FT_ULong num_strikes; + FT_UInt count; + + + if ( FT_FRAME_ENTER( 8 ) ) + goto Exit; + version = FT_GET_USHORT(); + flags = FT_GET_USHORT(); + num_strikes = FT_GET_ULONG(); - /* ensure that there are at least `count' bits in the accumulator */ - if ( (FT_Int)loaded < count ) + FT_FRAME_EXIT(); + + if ( version < 1 ) { - acc |= (FT_UShort)((FT_UShort)*source++ << ( 8 - loaded )); - loaded += 8; + error = FT_THROW( Unknown_File_Format ); + goto Exit; } - /* now write remaining bits */ - val = (FT_Byte)( ( (FT_Byte)( acc >> 8 ) ) & ~( 0xFF >> count ) ); - cur[0] |= (FT_Byte)( val >> shift ); + /* Bit 0 must always be `1'. */ + /* Bit 1 controls the overlay of bitmaps with outlines. */ + /* All other bits should be zero. */ + if ( !( flags == 1 || flags == 3 ) || + num_strikes >= 0x10000UL ) + { + error = FT_THROW( Invalid_File_Format ); + goto Exit; + } - if ( count > space ) - cur[1] |= (FT_Byte)( val << space ); + /* we currently don't support bit 1; however, it is better to */ + /* draw at least something... */ + if ( flags == 3 ) + FT_TRACE1(( "tt_face_load_sbit_strikes:" + " sbix overlay not supported yet\n" + " " + " expect bad rendering results\n" )); + + /* + * Count the number of strikes available in the table. We are a bit + * paranoid there and don't trust the data. + */ + count = (FT_UInt)num_strikes; + if ( 8 + 4UL * count > table_size ) + count = (FT_UInt)( ( table_size - 8 ) / 4 ); + + if ( FT_STREAM_SEEK( FT_STREAM_POS() - 8 ) ) + goto Exit; - acc <<= count; - loaded -= count; - } + face->sbit_table_size = 8 + count * 4; + if ( FT_FRAME_EXTRACT( face->sbit_table_size, face->sbit_table ) ) + goto Exit; - /* now, skip to next line */ - if ( byte_padded ) - { - acc = 0; - loaded = 0; /* clear accumulator on byte-padded lines */ + face->sbit_num_strikes = count; } + break; - line_buff += line_incr; + default: + error = FT_THROW( Unknown_File_Format ); + break; } + + if ( !error ) + FT_TRACE3(( "sbit_num_strikes: %u\n", face->sbit_num_strikes )); + + return FT_Err_Ok; + + Exit: + if ( error ) + { + if ( face->sbit_table ) + FT_FRAME_RELEASE( face->sbit_table ); + face->sbit_table_size = 0; + face->sbit_table_type = TT_SBIT_TABLE_TYPE_NONE; + } + + return error; } - static const FT_Frame_Field sbit_metrics_fields[] = + FT_LOCAL_DEF( void ) + tt_face_free_sbit( TT_Face face ) { -#undef FT_STRUCTURE -#define FT_STRUCTURE TT_SBit_MetricsRec + FT_Stream stream = face->root.stream; - FT_FRAME_START( 8 ), - FT_FRAME_BYTE( height ), - FT_FRAME_BYTE( width ), - FT_FRAME_CHAR( horiBearingX ), - FT_FRAME_CHAR( horiBearingY ), - FT_FRAME_BYTE( horiAdvance ), + FT_FRAME_RELEASE( face->sbit_table ); + face->sbit_table_size = 0; + face->sbit_table_type = TT_SBIT_TABLE_TYPE_NONE; + face->sbit_num_strikes = 0; + } - FT_FRAME_CHAR( vertBearingX ), - FT_FRAME_CHAR( vertBearingY ), - FT_FRAME_BYTE( vertAdvance ), - FT_FRAME_END - }; + FT_LOCAL_DEF( FT_Error ) + tt_face_set_sbit_strike( TT_Face face, + FT_Size_Request req, + FT_ULong* astrike_index ) + { + return FT_Match_Size( (FT_Face)face, req, 0, astrike_index ); + } - /*************************************************************************/ - /* */ - /* <Function> */ - /* Load_SBit_Const_Metrics */ - /* */ - /* <Description> */ - /* Loads the metrics for `EBLC' index tables format 2 and 5. */ - /* */ - /* <Input> */ - /* range :: The target range. */ - /* */ - /* stream :: The input stream. */ - /* */ - /* <Return> */ - /* FreeType error code. 0 means success. */ - /* */ - static FT_Error - Load_SBit_Const_Metrics( TT_SBit_Range range, - FT_Stream stream ) + + FT_LOCAL_DEF( FT_Error ) + tt_face_load_strike_metrics( TT_Face face, + FT_ULong strike_index, + FT_Size_Metrics* metrics ) { - FT_Error error; + if ( strike_index >= (FT_ULong)face->sbit_num_strikes ) + return FT_THROW( Invalid_Argument ); + switch ( (FT_UInt)face->sbit_table_type ) + { + case TT_SBIT_TABLE_TYPE_EBLC: + case TT_SBIT_TABLE_TYPE_CBLC: + { + FT_Byte* strike; - if ( FT_READ_ULONG( range->image_size ) ) - return error; - return FT_STREAM_READ_FIELDS( sbit_metrics_fields, &range->metrics ); + strike = face->sbit_table + 8 + strike_index * 48; + + metrics->x_ppem = (FT_UShort)strike[44]; + metrics->y_ppem = (FT_UShort)strike[45]; + + metrics->ascender = (FT_Char)strike[16] << 6; /* hori.ascender */ + metrics->descender = (FT_Char)strike[17] << 6; /* hori.descender */ + metrics->height = metrics->ascender - metrics->descender; + + /* Is this correct? */ + metrics->max_advance = ( (FT_Char)strike[22] + /* min_origin_SB */ + strike[18] + /* max_width */ + (FT_Char)strike[23] /* min_advance_SB */ + ) << 6; + return FT_Err_Ok; + } + + case TT_SBIT_TABLE_TYPE_SBIX: + { + FT_Stream stream = face->root.stream; + FT_UInt offset, upem; + FT_UShort ppem, resolution; + TT_HoriHeader *hori; + FT_ULong table_size; + + FT_Error error; + FT_Byte* p; + + + p = face->sbit_table + 8 + 4 * strike_index; + offset = FT_NEXT_ULONG( p ); + + error = face->goto_table( face, TTAG_sbix, stream, &table_size ); + if ( error ) + return error; + + if ( offset + 4 > table_size ) + return FT_THROW( Invalid_File_Format ); + + if ( FT_STREAM_SEEK( FT_STREAM_POS() + offset ) || + FT_FRAME_ENTER( 4 ) ) + return error; + + ppem = FT_GET_USHORT(); + resolution = FT_GET_USHORT(); + + FT_UNUSED( resolution ); /* What to do with this? */ + + FT_FRAME_EXIT(); + + upem = face->header.Units_Per_EM; + hori = &face->horizontal; + + metrics->x_ppem = ppem; + metrics->y_ppem = ppem; + + metrics->ascender = ppem * hori->Ascender * 64 / upem; + metrics->descender = ppem * hori->Descender * 64 / upem; + metrics->height = ppem * ( hori->Ascender - + hori->Descender + + hori->Line_Gap ) * 64 / upem; + metrics->max_advance = ppem * hori->advance_Width_Max * 64 / upem; + + return error; + } + + default: + return FT_THROW( Unknown_File_Format ); + } } - /*************************************************************************/ - /* */ - /* <Function> */ - /* Load_SBit_Range_Codes */ - /* */ - /* <Description> */ - /* Loads the range codes for `EBLC' index tables format 4 and 5. */ - /* */ - /* <Input> */ - /* range :: The target range. */ - /* */ - /* stream :: The input stream. */ - /* */ - /* load_offsets :: A flag whether to load the glyph offset table. */ - /* */ - /* <Return> */ - /* FreeType error code. 0 means success. */ - /* */ + typedef struct TT_SBitDecoderRec_ + { + TT_Face face; + FT_Stream stream; + FT_Bitmap* bitmap; + TT_SBit_Metrics metrics; + FT_Bool metrics_loaded; + FT_Bool bitmap_allocated; + FT_Byte bit_depth; + + FT_ULong ebdt_start; + FT_ULong ebdt_size; + + FT_ULong strike_index_array; + FT_ULong strike_index_count; + FT_Byte* eblc_base; + FT_Byte* eblc_limit; + + } TT_SBitDecoderRec, *TT_SBitDecoder; + + static FT_Error - Load_SBit_Range_Codes( TT_SBit_Range range, - FT_Stream stream, - FT_Bool load_offsets ) + tt_sbit_decoder_init( TT_SBitDecoder decoder, + TT_Face face, + FT_ULong strike_index, + TT_SBit_MetricsRec* metrics ) { FT_Error error; - FT_ULong count, n, size; - FT_Memory memory = stream->memory; + FT_Stream stream = face->root.stream; + FT_ULong ebdt_size; - if ( FT_READ_ULONG( count ) ) + error = face->goto_table( face, TTAG_CBDT, stream, &ebdt_size ); + if ( error ) + error = face->goto_table( face, TTAG_EBDT, stream, &ebdt_size ); + if ( error ) + error = face->goto_table( face, TTAG_bdat, stream, &ebdt_size ); + if ( error ) goto Exit; - range->num_glyphs = count; + decoder->face = face; + decoder->stream = stream; + decoder->bitmap = &face->root.glyph->bitmap; + decoder->metrics = metrics; - /* Allocate glyph offsets table if needed */ - if ( load_offsets ) - { - if ( FT_NEW_ARRAY( range->glyph_offsets, count ) ) - goto Exit; + decoder->metrics_loaded = 0; + decoder->bitmap_allocated = 0; - size = count * 4L; - } - else - size = count * 2L; + decoder->ebdt_start = FT_STREAM_POS(); + decoder->ebdt_size = ebdt_size; - /* Allocate glyph codes table and access frame */ - if ( FT_NEW_ARRAY ( range->glyph_codes, count ) || - FT_FRAME_ENTER( size ) ) - goto Exit; + decoder->eblc_base = face->sbit_table; + decoder->eblc_limit = face->sbit_table + face->sbit_table_size; - for ( n = 0; n < count; n++ ) + /* now find the strike corresponding to the index */ { - range->glyph_codes[n] = FT_GET_USHORT(); + FT_Byte* p; - if ( load_offsets ) - range->glyph_offsets[n] = (FT_ULong)range->image_offset + - FT_GET_USHORT(); - } - FT_FRAME_EXIT(); + if ( 8 + 48 * strike_index + 3 * 4 + 34 + 1 > face->sbit_table_size ) + { + error = FT_THROW( Invalid_File_Format ); + goto Exit; + } + + p = decoder->eblc_base + 8 + 48 * strike_index; + + decoder->strike_index_array = FT_NEXT_ULONG( p ); + p += 4; + decoder->strike_index_count = FT_NEXT_ULONG( p ); + p += 34; + decoder->bit_depth = *p; + + /* decoder->strike_index_array + */ + /* 8 * decoder->strike_index_count > face->sbit_table_size ? */ + if ( decoder->strike_index_array > face->sbit_table_size || + decoder->strike_index_count > + ( face->sbit_table_size - decoder->strike_index_array ) / 8 ) + error = FT_THROW( Invalid_File_Format ); + } Exit: return error; } - /*************************************************************************/ - /* */ - /* <Function> */ - /* Load_SBit_Range */ - /* */ - /* <Description> */ - /* Loads a given `EBLC' index/range table. */ - /* */ - /* <Input> */ - /* range :: The target range. */ - /* */ - /* stream :: The input stream. */ - /* */ - /* <Return> */ - /* FreeType error code. 0 means success. */ - /* */ - static FT_Error - Load_SBit_Range( TT_SBit_Range range, - FT_Stream stream ) + static void + tt_sbit_decoder_done( TT_SBitDecoder decoder ) { - FT_Error error; - FT_Memory memory = stream->memory; - - - switch( range->index_format ) - { - case 1: /* variable metrics with 4-byte offsets */ - case 3: /* variable metrics with 2-byte offsets */ - { - FT_ULong num_glyphs, n; - FT_Int size_elem; - FT_Bool large = FT_BOOL( range->index_format == 1 ); + FT_UNUSED( decoder ); + } + static FT_Error + tt_sbit_decoder_alloc_bitmap( TT_SBitDecoder decoder ) + { + FT_Error error = FT_Err_Ok; + FT_UInt width, height; + FT_Bitmap* map = decoder->bitmap; + FT_Long size; - if ( range->last_glyph < range->first_glyph ) - { - error = SFNT_Err_Invalid_File_Format; - goto Exit; - } - num_glyphs = range->last_glyph - range->first_glyph + 1L; - range->num_glyphs = num_glyphs; - num_glyphs++; /* XXX: BEWARE - see spec */ + if ( !decoder->metrics_loaded ) + { + error = FT_THROW( Invalid_Argument ); + goto Exit; + } - size_elem = large ? 4 : 2; + width = decoder->metrics->width; + height = decoder->metrics->height; - if ( FT_NEW_ARRAY( range->glyph_offsets, num_glyphs ) || - FT_FRAME_ENTER( num_glyphs * size_elem ) ) - goto Exit; + map->width = (int)width; + map->rows = (int)height; - for ( n = 0; n < num_glyphs; n++ ) - range->glyph_offsets[n] = (FT_ULong)( range->image_offset + - ( large ? FT_GET_ULONG() - : FT_GET_USHORT() ) ); - FT_FRAME_EXIT(); - } + switch ( decoder->bit_depth ) + { + case 1: + map->pixel_mode = FT_PIXEL_MODE_MONO; + map->pitch = ( map->width + 7 ) >> 3; + map->num_grays = 2; break; - case 2: /* all glyphs have identical metrics */ - error = Load_SBit_Const_Metrics( range, stream ); + case 2: + map->pixel_mode = FT_PIXEL_MODE_GRAY2; + map->pitch = ( map->width + 3 ) >> 2; + map->num_grays = 4; break; case 4: - error = Load_SBit_Range_Codes( range, stream, 1 ); + map->pixel_mode = FT_PIXEL_MODE_GRAY4; + map->pitch = ( map->width + 1 ) >> 1; + map->num_grays = 16; break; - case 5: - error = Load_SBit_Const_Metrics( range, stream ); - if ( !error ) - error = Load_SBit_Range_Codes( range, stream, 0 ); + case 8: + map->pixel_mode = FT_PIXEL_MODE_GRAY; + map->pitch = map->width; + map->num_grays = 256; + break; + + case 32: + map->pixel_mode = FT_PIXEL_MODE_BGRA; + map->pitch = map->width * 4; + map->num_grays = 256; break; default: - error = SFNT_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); + goto Exit; } + size = map->rows * map->pitch; + + /* check that there is no empty image */ + if ( size == 0 ) + goto Exit; /* exit successfully! */ + + error = ft_glyphslot_alloc_bitmap( decoder->face->root.glyph, size ); + if ( error ) + goto Exit; + + decoder->bitmap_allocated = 1; + Exit: return error; } - /*************************************************************************/ - /* */ - /* <Function> */ - /* tt_face_load_eblc */ - /* */ - /* <Description> */ - /* Loads the table of embedded bitmap sizes for this face. */ - /* */ - /* <Input> */ - /* face :: The target face object. */ - /* */ - /* stream :: The input stream. */ - /* */ - /* <Return> */ - /* FreeType error code. 0 means success. */ - /* */ - FT_LOCAL_DEF( FT_Error ) - tt_face_load_eblc( TT_Face face, - FT_Stream stream ) + static FT_Error + tt_sbit_decoder_load_metrics( TT_SBitDecoder decoder, + FT_Byte* *pp, + FT_Byte* limit, + FT_Bool big ) { - FT_Error error = SFNT_Err_Ok; - FT_Memory memory = stream->memory; - FT_Fixed version; - FT_ULong num_strikes; - FT_ULong table_base; + FT_Byte* p = *pp; + TT_SBit_Metrics metrics = decoder->metrics; - static const FT_Frame_Field sbit_line_metrics_fields[] = - { -#undef FT_STRUCTURE -#define FT_STRUCTURE TT_SBit_LineMetricsRec - - /* no FT_FRAME_START */ - FT_FRAME_CHAR( ascender ), - FT_FRAME_CHAR( descender ), - FT_FRAME_BYTE( max_width ), - - FT_FRAME_CHAR( caret_slope_numerator ), - FT_FRAME_CHAR( caret_slope_denominator ), - FT_FRAME_CHAR( caret_offset ), - - FT_FRAME_CHAR( min_origin_SB ), - FT_FRAME_CHAR( min_advance_SB ), - FT_FRAME_CHAR( max_before_BL ), - FT_FRAME_CHAR( min_after_BL ), - FT_FRAME_CHAR( pads[0] ), - FT_FRAME_CHAR( pads[1] ), - FT_FRAME_END - }; - - static const FT_Frame_Field strike_start_fields[] = - { -#undef FT_STRUCTURE -#define FT_STRUCTURE TT_SBit_StrikeRec - - /* no FT_FRAME_START */ - FT_FRAME_ULONG( ranges_offset ), - FT_FRAME_SKIP_LONG, - FT_FRAME_ULONG( num_ranges ), - FT_FRAME_ULONG( color_ref ), - FT_FRAME_END - }; - - static const FT_Frame_Field strike_end_fields[] = - { - /* no FT_FRAME_START */ - FT_FRAME_USHORT( start_glyph ), - FT_FRAME_USHORT( end_glyph ), - FT_FRAME_BYTE ( x_ppem ), - FT_FRAME_BYTE ( y_ppem ), - FT_FRAME_BYTE ( bit_depth ), - FT_FRAME_CHAR ( flags ), - FT_FRAME_END - }; + if ( p + 5 > limit ) + goto Fail; - face->num_sbit_strikes = 0; + metrics->height = p[0]; + metrics->width = p[1]; + metrics->horiBearingX = (FT_Char)p[2]; + metrics->horiBearingY = (FT_Char)p[3]; + metrics->horiAdvance = p[4]; - /* this table is optional */ - error = face->goto_table( face, TTAG_EBLC, stream, 0 ); - if ( error ) - error = face->goto_table( face, TTAG_bloc, stream, 0 ); - if ( error ) - goto Exit; + p += 5; + if ( big ) + { + if ( p + 3 > limit ) + goto Fail; - table_base = FT_STREAM_POS(); - if ( FT_FRAME_ENTER( 8L ) ) - goto Exit; + metrics->vertBearingX = (FT_Char)p[0]; + metrics->vertBearingY = (FT_Char)p[1]; + metrics->vertAdvance = p[2]; + + p += 3; + } + else + { + /* avoid uninitialized data in case there is no vertical info -- */ + metrics->vertBearingX = 0; + metrics->vertBearingY = 0; + metrics->vertAdvance = 0; + } - version = FT_GET_LONG(); - num_strikes = FT_GET_ULONG(); + decoder->metrics_loaded = 1; + *pp = p; + return FT_Err_Ok; - FT_FRAME_EXIT(); + Fail: + FT_TRACE1(( "tt_sbit_decoder_load_metrics: broken table\n" )); + return FT_THROW( Invalid_Argument ); + } - /* check version number and strike count */ - if ( version != 0x00020000L || - num_strikes >= 0x10000L ) - { - FT_ERROR(( "tt_face_load_sbit_strikes: invalid table version\n" )); - error = SFNT_Err_Invalid_File_Format; - goto Exit; - } + /* forward declaration */ + static FT_Error + tt_sbit_decoder_load_image( TT_SBitDecoder decoder, + FT_UInt glyph_index, + FT_Int x_pos, + FT_Int y_pos ); - /* allocate the strikes table */ - if ( FT_NEW_ARRAY( face->sbit_strikes, num_strikes ) ) - goto Exit; + typedef FT_Error (*TT_SBitDecoder_LoadFunc)( TT_SBitDecoder decoder, + FT_Byte* p, + FT_Byte* plimit, + FT_Int x_pos, + FT_Int y_pos ); - face->num_sbit_strikes = num_strikes; - /* now read each strike table separately */ - { - TT_SBit_Strike strike = face->sbit_strikes; - FT_ULong count = num_strikes; + static FT_Error + tt_sbit_decoder_load_byte_aligned( TT_SBitDecoder decoder, + FT_Byte* p, + FT_Byte* limit, + FT_Int x_pos, + FT_Int y_pos ) + { + FT_Error error = FT_Err_Ok; + FT_Byte* line; + FT_Int bit_height, bit_width, pitch, width, height, line_bits, h; + FT_Bitmap* bitmap; - if ( FT_FRAME_ENTER( 48L * num_strikes ) ) - goto Exit; + /* check that we can write the glyph into the bitmap */ + bitmap = decoder->bitmap; + bit_width = bitmap->width; + bit_height = bitmap->rows; + pitch = bitmap->pitch; + line = bitmap->buffer; - while ( count > 0 ) - { - if ( FT_STREAM_READ_FIELDS( strike_start_fields, strike ) || - FT_STREAM_READ_FIELDS( sbit_line_metrics_fields, &strike->hori ) || - FT_STREAM_READ_FIELDS( sbit_line_metrics_fields, &strike->vert ) || - FT_STREAM_READ_FIELDS( strike_end_fields, strike ) ) - break; - - count--; - strike++; - } + width = decoder->metrics->width; + height = decoder->metrics->height; - FT_FRAME_EXIT(); + line_bits = width * decoder->bit_depth; + + if ( x_pos < 0 || x_pos + width > bit_width || + y_pos < 0 || y_pos + height > bit_height ) + { + FT_TRACE1(( "tt_sbit_decoder_load_byte_aligned:" + " invalid bitmap dimensions\n" )); + error = FT_THROW( Invalid_File_Format ); + goto Exit; } - /* allocate the index ranges for each strike table */ + if ( p + ( ( line_bits + 7 ) >> 3 ) * height > limit ) { - TT_SBit_Strike strike = face->sbit_strikes; - FT_ULong count = num_strikes; + FT_TRACE1(( "tt_sbit_decoder_load_byte_aligned: broken bitmap\n" )); + error = FT_THROW( Invalid_File_Format ); + goto Exit; + } + /* now do the blit */ + line += y_pos * pitch + ( x_pos >> 3 ); + x_pos &= 7; - while ( count > 0 ) + if ( x_pos == 0 ) /* the easy one */ + { + for ( h = height; h > 0; h--, line += pitch ) { - TT_SBit_Range range; - FT_ULong count2 = strike->num_ranges; + FT_Byte* pwrite = line; + FT_Int w; - /* read each range */ - if ( FT_STREAM_SEEK( table_base + strike->ranges_offset ) || - FT_FRAME_ENTER( strike->num_ranges * 8L ) ) - goto Exit; - - if ( FT_NEW_ARRAY( strike->sbit_ranges, strike->num_ranges ) ) - goto Exit; - - range = strike->sbit_ranges; - while ( count2 > 0 ) + for ( w = line_bits; w >= 8; w -= 8 ) { - range->first_glyph = FT_GET_USHORT(); - range->last_glyph = FT_GET_USHORT(); - range->table_offset = table_base + strike->ranges_offset + - FT_GET_ULONG(); - count2--; - range++; + pwrite[0] = (FT_Byte)( pwrite[0] | *p++ ); + pwrite += 1; } - FT_FRAME_EXIT(); + if ( w > 0 ) + pwrite[0] = (FT_Byte)( pwrite[0] | ( *p++ & ( 0xFF00U >> w ) ) ); + } + } + else /* x_pos > 0 */ + { + for ( h = height; h > 0; h--, line += pitch ) + { + FT_Byte* pwrite = line; + FT_Int w; + FT_UInt wval = 0; + - /* Now, read each index table */ - count2 = strike->num_ranges; - range = strike->sbit_ranges; - while ( count2 > 0 ) + for ( w = line_bits; w >= 8; w -= 8 ) { - /* Read the header */ - if ( FT_STREAM_SEEK( range->table_offset ) || - FT_FRAME_ENTER( 8L ) ) - goto Exit; + wval = (FT_UInt)( wval | *p++ ); + pwrite[0] = (FT_Byte)( pwrite[0] | ( wval >> x_pos ) ); + pwrite += 1; + wval <<= 8; + } - range->index_format = FT_GET_USHORT(); - range->image_format = FT_GET_USHORT(); - range->image_offset = FT_GET_ULONG(); + if ( w > 0 ) + wval = (FT_UInt)( wval | ( *p++ & ( 0xFF00U >> w ) ) ); - FT_FRAME_EXIT(); + /* all bits read and there are `x_pos + w' bits to be written */ - error = Load_SBit_Range( range, stream ); - if ( error ) - goto Exit; + pwrite[0] = (FT_Byte)( pwrite[0] | ( wval >> x_pos ) ); - count2--; - range++; + if ( x_pos + w > 8 ) + { + pwrite++; + wval <<= 8; + pwrite[0] = (FT_Byte)( pwrite[0] | ( wval >> x_pos ) ); } - - count--; - strike++; } } Exit: + if ( !error ) + FT_TRACE3(( "tt_sbit_decoder_load_byte_aligned: loaded\n" )); return error; } - /*************************************************************************/ - /* */ - /* <Function> */ - /* tt_face_free_eblc */ - /* */ - /* <Description> */ - /* Releases the embedded bitmap tables. */ - /* */ - /* <Input> */ - /* face :: The target face object. */ - /* */ - FT_LOCAL_DEF( void ) - tt_face_free_eblc( TT_Face face ) - { - FT_Memory memory = face->root.memory; - TT_SBit_Strike strike = face->sbit_strikes; - TT_SBit_Strike strike_limit = strike + face->num_sbit_strikes; - - - if ( strike ) - { - for ( ; strike < strike_limit; strike++ ) - { - TT_SBit_Range range = strike->sbit_ranges; - TT_SBit_Range range_limit = range + strike->num_ranges; - - - if ( range ) - { - for ( ; range < range_limit; range++ ) - { - /* release the glyph offsets and codes tables */ - /* where appropriate */ - FT_FREE( range->glyph_offsets ); - FT_FREE( range->glyph_codes ); - } - } - FT_FREE( strike->sbit_ranges ); - strike->num_ranges = 0; - } - FT_FREE( face->sbit_strikes ); - } - face->num_sbit_strikes = 0; - } - + /* + * Load a bit-aligned bitmap (with pointer `p') into a line-aligned bitmap + * (with pointer `pwrite'). In the example below, the width is 3 pixel, + * and `x_pos' is 1 pixel. + * + * p p+1 + * | | | + * | 7 6 5 4 3 2 1 0 | 7 6 5 4 3 2 1 0 |... + * | | | + * +-------+ +-------+ +-------+ ... + * . . . + * . . . + * v . . + * +-------+ . . + * | | . + * | 7 6 5 4 3 2 1 0 | . + * | | . + * pwrite . . + * . . + * v . + * +-------+ . + * | | + * | 7 6 5 4 3 2 1 0 | + * | | + * pwrite+1 . + * . + * v + * +-------+ + * | | + * | 7 6 5 4 3 2 1 0 | + * | | + * pwrite+2 + * + */ - FT_LOCAL_DEF( FT_Error ) - tt_face_set_sbit_strike( TT_Face face, - FT_Size_Request req, - FT_ULong* astrike_index ) + static FT_Error + tt_sbit_decoder_load_bit_aligned( TT_SBitDecoder decoder, + FT_Byte* p, + FT_Byte* limit, + FT_Int x_pos, + FT_Int y_pos ) { - return FT_Match_Size( (FT_Face)face, req, 0, astrike_index ); - } + FT_Error error = FT_Err_Ok; + FT_Byte* line; + FT_Int bit_height, bit_width, pitch, width, height, line_bits, h, nbits; + FT_Bitmap* bitmap; + FT_UShort rval; - FT_LOCAL_DEF( FT_Error ) - tt_face_load_strike_metrics( TT_Face face, - FT_ULong strike_index, - FT_Size_Metrics* metrics ) - { - TT_SBit_Strike strike; + /* check that we can write the glyph into the bitmap */ + bitmap = decoder->bitmap; + bit_width = bitmap->width; + bit_height = bitmap->rows; + pitch = bitmap->pitch; + line = bitmap->buffer; + width = decoder->metrics->width; + height = decoder->metrics->height; - if ( strike_index >= face->num_sbit_strikes ) - return SFNT_Err_Invalid_Argument; + line_bits = width * decoder->bit_depth; - strike = face->sbit_strikes + strike_index; + if ( x_pos < 0 || x_pos + width > bit_width || + y_pos < 0 || y_pos + height > bit_height ) + { + FT_TRACE1(( "tt_sbit_decoder_load_bit_aligned:" + " invalid bitmap dimensions\n" )); + error = FT_THROW( Invalid_File_Format ); + goto Exit; + } - metrics->x_ppem = strike->x_ppem; - metrics->y_ppem = strike->y_ppem; + if ( p + ( ( line_bits * height + 7 ) >> 3 ) > limit ) + { + FT_TRACE1(( "tt_sbit_decoder_load_bit_aligned: broken bitmap\n" )); + error = FT_THROW( Invalid_File_Format ); + goto Exit; + } - metrics->ascender = strike->hori.ascender << 6; - metrics->descender = strike->hori.descender << 6; + /* now do the blit */ - /* XXX: Is this correct? */ - metrics->max_advance = ( strike->hori.min_origin_SB + - strike->hori.max_width + - strike->hori.min_advance_SB ) << 6; + /* adjust `line' to point to the first byte of the bitmap */ + line += y_pos * pitch + ( x_pos >> 3 ); + x_pos &= 7; - metrics->height = metrics->ascender - metrics->descender; + /* the higher byte of `rval' is used as a buffer */ + rval = 0; + nbits = 0; - return SFNT_Err_Ok; - } + for ( h = height; h > 0; h--, line += pitch ) + { + FT_Byte* pwrite = line; + FT_Int w = line_bits; - /*************************************************************************/ - /* */ - /* <Function> */ - /* find_sbit_range */ - /* */ - /* <Description> */ - /* Scans a given strike's ranges and return, for a given glyph */ - /* index, the corresponding sbit range, and `EBDT' offset. */ - /* */ - /* <Input> */ - /* glyph_index :: The glyph index. */ - /* */ - /* strike :: The source/current sbit strike. */ - /* */ - /* <Output> */ - /* arange :: The sbit range containing the glyph index. */ - /* */ - /* aglyph_offset :: The offset of the glyph data in `EBDT' table. */ - /* */ - /* <Return> */ - /* FreeType error code. 0 means the glyph index was found. */ - /* */ - static FT_Error - find_sbit_range( FT_UInt glyph_index, - TT_SBit_Strike strike, - TT_SBit_Range *arange, - FT_ULong *aglyph_offset ) - { - TT_SBit_RangeRec *range, *range_limit; + /* handle initial byte (in target bitmap) specially if necessary */ + if ( x_pos ) + { + w = ( line_bits < 8 - x_pos ) ? line_bits : 8 - x_pos; + if ( h == height ) + { + rval = *p++; + nbits = x_pos; + } + else if ( nbits < w ) + { + if ( p < limit ) + rval |= *p++; + nbits += 8 - w; + } + else + { + rval >>= 8; + nbits -= w; + } - /* check whether the glyph index is within this strike's */ - /* glyph range */ - if ( glyph_index < (FT_UInt)strike->start_glyph || - glyph_index > (FT_UInt)strike->end_glyph ) - goto Fail; + *pwrite++ |= ( ( rval >> nbits ) & 0xFF ) & + ( ~( 0xFF << w ) << ( 8 - w - x_pos ) ); + rval <<= 8; - /* scan all ranges in strike */ - range = strike->sbit_ranges; - range_limit = range + strike->num_ranges; - if ( !range ) - goto Fail; + w = line_bits - w; + } - for ( ; range < range_limit; range++ ) - { - if ( glyph_index >= (FT_UInt)range->first_glyph && - glyph_index <= (FT_UInt)range->last_glyph ) + /* handle medial bytes */ + for ( ; w >= 8; w -= 8 ) { - FT_UShort delta = (FT_UShort)( glyph_index - range->first_glyph ); + rval |= *p++; + *pwrite++ |= ( rval >> nbits ) & 0xFF; + rval <<= 8; + } - switch ( range->index_format ) + /* handle final byte if necessary */ + if ( w > 0 ) + { + if ( nbits < w ) { - case 1: - case 3: - *aglyph_offset = range->glyph_offsets[delta]; - break; - - case 2: - *aglyph_offset = range->image_offset + - range->image_size * delta; - break; - - case 4: - case 5: - { - FT_ULong n; - - - for ( n = 0; n < range->num_glyphs; n++ ) - { - if ( (FT_UInt)range->glyph_codes[n] == glyph_index ) - { - if ( range->index_format == 4 ) - *aglyph_offset = range->glyph_offsets[n]; - else - *aglyph_offset = range->image_offset + - n * range->image_size; - goto Found; - } - } - } + if ( p < limit ) + rval |= *p++; + *pwrite |= ( ( rval >> nbits ) & 0xFF ) & ( 0xFF00U >> w ); + nbits += 8 - w; - /* fall-through */ - default: - goto Fail; + rval <<= 8; + } + else + { + *pwrite |= ( ( rval >> nbits ) & 0xFF ) & ( 0xFF00U >> w ); + nbits -= w; } - - Found: - /* return successfully! */ - *arange = range; - return SFNT_Err_Ok; } } - Fail: - *arange = 0; - *aglyph_offset = 0; - - return SFNT_Err_Invalid_Argument; + Exit: + if ( !error ) + FT_TRACE3(( "tt_sbit_decoder_load_bit_aligned: loaded\n" )); + return error; } - /*************************************************************************/ - /* */ - /* <Function> */ - /* tt_find_sbit_image */ - /* */ - /* <Description> */ - /* Checks whether an embedded bitmap (an `sbit') exists for a given */ - /* glyph, at a given strike. */ - /* */ - /* <Input> */ - /* face :: The target face object. */ - /* */ - /* glyph_index :: The glyph index. */ - /* */ - /* strike_index :: The current strike index. */ - /* */ - /* <Output> */ - /* arange :: The SBit range containing the glyph index. */ - /* */ - /* astrike :: The SBit strike containing the glyph index. */ - /* */ - /* aglyph_offset :: The offset of the glyph data in `EBDT' table. */ - /* */ - /* <Return> */ - /* FreeType error code. 0 means success. Returns */ - /* SFNT_Err_Invalid_Argument if no sbit exists for the requested */ - /* glyph. */ - /* */ - FT_LOCAL( FT_Error ) - tt_find_sbit_image( TT_Face face, - FT_UInt glyph_index, - FT_ULong strike_index, - TT_SBit_Range *arange, - TT_SBit_Strike *astrike, - FT_ULong *aglyph_offset ) + static FT_Error + tt_sbit_decoder_load_compound( TT_SBitDecoder decoder, + FT_Byte* p, + FT_Byte* limit, + FT_Int x_pos, + FT_Int y_pos ) { - FT_Error error; - TT_SBit_Strike strike; + FT_Error error = FT_Err_Ok; + FT_UInt num_components, nn; + + FT_Char horiBearingX = (FT_Char)decoder->metrics->horiBearingX; + FT_Char horiBearingY = (FT_Char)decoder->metrics->horiBearingY; + FT_Byte horiAdvance = (FT_Byte)decoder->metrics->horiAdvance; + FT_Char vertBearingX = (FT_Char)decoder->metrics->vertBearingX; + FT_Char vertBearingY = (FT_Char)decoder->metrics->vertBearingY; + FT_Byte vertAdvance = (FT_Byte)decoder->metrics->vertAdvance; - if ( !face->sbit_strikes || - ( face->num_sbit_strikes <= strike_index ) ) + if ( p + 2 > limit ) + goto Fail; + + num_components = FT_NEXT_USHORT( p ); + if ( p + 4 * num_components > limit ) + { + FT_TRACE1(( "tt_sbit_decoder_load_compound: broken table\n" )); goto Fail; + } + + FT_TRACE3(( "tt_sbit_decoder_load_compound: loading %d components\n", + num_components )); + + for ( nn = 0; nn < num_components; nn++ ) + { + FT_UInt gindex = FT_NEXT_USHORT( p ); + FT_Byte dx = FT_NEXT_BYTE( p ); + FT_Byte dy = FT_NEXT_BYTE( p ); + - strike = &face->sbit_strikes[strike_index]; + /* NB: a recursive call */ + error = tt_sbit_decoder_load_image( decoder, gindex, + x_pos + dx, y_pos + dy ); + if ( error ) + break; + } - error = find_sbit_range( glyph_index, strike, - arange, aglyph_offset ); - if ( error ) - goto Fail; + FT_TRACE3(( "tt_sbit_decoder_load_compound: done\n" )); - *astrike = strike; + decoder->metrics->horiBearingX = horiBearingX; + decoder->metrics->horiBearingY = horiBearingY; + decoder->metrics->horiAdvance = horiAdvance; + decoder->metrics->vertBearingX = vertBearingX; + decoder->metrics->vertBearingY = vertBearingY; + decoder->metrics->vertAdvance = vertAdvance; + decoder->metrics->width = (FT_Byte)decoder->bitmap->width; + decoder->metrics->height = (FT_Byte)decoder->bitmap->rows; - return SFNT_Err_Ok; + Exit: + return error; Fail: - /* no embedded bitmap for this glyph in face */ - *arange = 0; - *astrike = 0; - *aglyph_offset = 0; - - return SFNT_Err_Invalid_Argument; + error = FT_THROW( Invalid_File_Format ); + goto Exit; } - /*************************************************************************/ - /* */ - /* <Function> */ - /* tt_load_sbit_metrics */ - /* */ - /* <Description> */ - /* Gets the big metrics for a given SBit. */ - /* */ - /* <Input> */ - /* stream :: The input stream. */ - /* */ - /* range :: The SBit range containing the glyph. */ - /* */ - /* <Output> */ - /* big_metrics :: A big SBit metrics structure for the glyph. */ - /* */ - /* <Return> */ - /* FreeType error code. 0 means success. */ - /* */ - /* <Note> */ - /* The stream cursor must be positioned at the glyph's offset within */ - /* the `EBDT' table before the call. */ - /* */ - /* If the image format uses variable metrics, the stream cursor is */ - /* positioned just after the metrics header in the `EBDT' table on */ - /* function exit. */ - /* */ - FT_LOCAL( FT_Error ) - tt_load_sbit_metrics( FT_Stream stream, - TT_SBit_Range range, - TT_SBit_Metrics metrics ) +#ifdef FT_CONFIG_OPTION_USE_PNG + + static FT_Error + tt_sbit_decoder_load_png( TT_SBitDecoder decoder, + FT_Byte* p, + FT_Byte* limit, + FT_Int x_pos, + FT_Int y_pos ) { - FT_Error error = SFNT_Err_Ok; + FT_Error error = FT_Err_Ok; + FT_ULong png_len; - switch ( range->image_format ) + if ( limit - p < 4 ) { - case 1: - case 2: - case 8: - /* variable small metrics */ - { - TT_SBit_SmallMetricsRec smetrics; + FT_TRACE1(( "tt_sbit_decoder_load_png: broken bitmap\n" )); + error = FT_THROW( Invalid_File_Format ); + goto Exit; + } - static const FT_Frame_Field sbit_small_metrics_fields[] = - { -#undef FT_STRUCTURE -#define FT_STRUCTURE TT_SBit_SmallMetricsRec + png_len = FT_NEXT_ULONG( p ); + if ( (FT_ULong)( limit - p ) < png_len ) + { + FT_TRACE1(( "tt_sbit_decoder_load_png: broken bitmap\n" )); + error = FT_THROW( Invalid_File_Format ); + goto Exit; + } + + error = Load_SBit_Png( decoder->face->root.glyph, + x_pos, + y_pos, + decoder->bit_depth, + decoder->metrics, + decoder->stream->memory, + p, + png_len, + FALSE ); + + Exit: + if ( !error ) + FT_TRACE3(( "tt_sbit_decoder_load_png: loaded\n" )); + return error; + } - FT_FRAME_START( 5 ), - FT_FRAME_BYTE( height ), - FT_FRAME_BYTE( width ), - FT_FRAME_CHAR( bearingX ), - FT_FRAME_CHAR( bearingY ), - FT_FRAME_BYTE( advance ), - FT_FRAME_END - }; +#endif /* FT_CONFIG_OPTION_USE_PNG */ - /* read small metrics */ - if ( FT_STREAM_READ_FIELDS( sbit_small_metrics_fields, &smetrics ) ) - goto Exit; + static FT_Error + tt_sbit_decoder_load_bitmap( TT_SBitDecoder decoder, + FT_UInt glyph_format, + FT_ULong glyph_start, + FT_ULong glyph_size, + FT_Int x_pos, + FT_Int y_pos ) + { + FT_Error error; + FT_Stream stream = decoder->stream; + FT_Byte* p; + FT_Byte* p_limit; + FT_Byte* data; - /* convert it to a big metrics */ - metrics->height = smetrics.height; - metrics->width = smetrics.width; - metrics->horiBearingX = smetrics.bearingX; - metrics->horiBearingY = smetrics.bearingY; - metrics->horiAdvance = smetrics.advance; - - /* these metrics are made up at a higher level when */ - /* needed. */ - metrics->vertBearingX = 0; - metrics->vertBearingY = 0; - metrics->vertAdvance = 0; - } + + /* seek into the EBDT table now */ + if ( glyph_start + glyph_size > decoder->ebdt_size ) + { + error = FT_THROW( Invalid_Argument ); + goto Exit; + } + + if ( FT_STREAM_SEEK( decoder->ebdt_start + glyph_start ) || + FT_FRAME_EXTRACT( glyph_size, data ) ) + goto Exit; + + p = data; + p_limit = p + glyph_size; + + /* read the data, depending on the glyph format */ + switch ( glyph_format ) + { + case 1: + case 2: + case 8: + case 17: + error = tt_sbit_decoder_load_metrics( decoder, &p, p_limit, 0 ); break; case 6: case 7: case 9: - /* variable big metrics */ - if ( FT_STREAM_READ_FIELDS( sbit_metrics_fields, metrics ) ) - goto Exit; + case 18: + error = tt_sbit_decoder_load_metrics( decoder, &p, p_limit, 1 ); break; - case 5: - default: /* constant metrics */ - if ( range->index_format == 2 || range->index_format == 5 ) - *metrics = range->metrics; - else - return SFNT_Err_Invalid_File_Format; - } - - Exit: - return error; - } + default: + error = FT_Err_Ok; + } + if ( error ) + goto Fail; - /*************************************************************************/ - /* */ - /* <Function> */ - /* crop_bitmap */ - /* */ - /* <Description> */ - /* Crops a bitmap to its tightest bounding box, and adjusts its */ - /* metrics. */ - /* */ - /* <InOut> */ - /* map :: The bitmap. */ - /* */ - /* metrics :: The corresponding metrics structure. */ - /* */ - static void - crop_bitmap( FT_Bitmap* map, - TT_SBit_Metrics metrics ) - { - /***********************************************************************/ - /* */ - /* In this situation, some bounding boxes of embedded bitmaps are too */ - /* large. We need to crop it to a reasonable size. */ - /* */ - /* --------- */ - /* | | ----- */ - /* | *** | |***| */ - /* | * | | * | */ - /* | * | ------> | * | */ - /* | * | | * | */ - /* | * | | * | */ - /* | *** | |***| */ - /* --------- ----- */ - /* */ - /***********************************************************************/ - - FT_Int rows, count; - FT_Long line_len; - FT_Byte* line; - - - /***********************************************************************/ - /* */ - /* first of all, check the top-most lines of the bitmap, and remove */ - /* them if they're empty. */ - /* */ { - line = (FT_Byte*)map->buffer; - rows = map->rows; - line_len = map->pitch; + TT_SBitDecoder_LoadFunc loader; - for ( count = 0; count < rows; count++ ) + switch ( glyph_format ) { - FT_Byte* cur = line; - FT_Byte* limit = line + line_len; + case 1: + case 6: + loader = tt_sbit_decoder_load_byte_aligned; + break; + case 2: + case 7: + { + /* Don't trust `glyph_format'. For example, Apple's main Korean */ + /* system font, `AppleMyungJo.ttf' (version 7.0d2e6), uses glyph */ + /* format 7, but the data is format 6. We check whether we have */ + /* an excessive number of bytes in the image: If it is equal to */ + /* the value for a byte-aligned glyph, use the other loading */ + /* routine. */ + /* */ + /* Note that for some (width,height) combinations, where the */ + /* width is not a multiple of 8, the sizes for bit- and */ + /* byte-aligned data are equal, for example (7,7) or (15,6). We */ + /* then prefer what `glyph_format' specifies. */ + + FT_UInt width = decoder->metrics->width; + FT_UInt height = decoder->metrics->height; + + FT_UInt bit_size = ( width * height + 7 ) >> 3; + FT_UInt byte_size = height * ( ( width + 7 ) >> 3 ); + + + if ( bit_size < byte_size && + byte_size == (FT_UInt)( p_limit - p ) ) + loader = tt_sbit_decoder_load_byte_aligned; + else + loader = tt_sbit_decoder_load_bit_aligned; + } + break; - for ( ; cur < limit; cur++ ) - if ( cur[0] ) - goto Found_Top; + case 5: + loader = tt_sbit_decoder_load_bit_aligned; + break; - /* the current line was empty - skip to next one */ - line = limit; - } + case 8: + if ( p + 1 > p_limit ) + goto Fail; - Found_Top: - /* check that we have at least one filled line */ - if ( count >= rows ) - goto Empty_Bitmap; + p += 1; /* skip padding */ + /* fall-through */ - /* now, crop the empty upper lines */ - if ( count > 0 ) - { - line = (FT_Byte*)map->buffer; + case 9: + loader = tt_sbit_decoder_load_compound; + break; - FT_MEM_MOVE( line, line + count * line_len, - ( rows - count ) * line_len ); + case 17: /* small metrics, PNG image data */ + case 18: /* big metrics, PNG image data */ + case 19: /* metrics in EBLC, PNG image data */ +#ifdef FT_CONFIG_OPTION_USE_PNG + loader = tt_sbit_decoder_load_png; + break; +#else + error = FT_THROW( Unimplemented_Feature ); + goto Fail; +#endif /* FT_CONFIG_OPTION_USE_PNG */ - metrics->height = (FT_Byte)( metrics->height - count ); - metrics->horiBearingY = (FT_Char)( metrics->horiBearingY - count ); - metrics->vertBearingY = (FT_Char)( metrics->vertBearingY - count ); + default: + error = FT_THROW( Invalid_Table ); + goto Fail; + } - map->rows -= count; - rows -= count; + if ( !decoder->bitmap_allocated ) + { + error = tt_sbit_decoder_alloc_bitmap( decoder ); + if ( error ) + goto Fail; } + + error = loader( decoder, p, p_limit, x_pos, y_pos ); } - /***********************************************************************/ - /* */ - /* second, crop the lower lines */ - /* */ - { - line = (FT_Byte*)map->buffer + ( rows - 1 ) * line_len; + Fail: + FT_FRAME_RELEASE( data ); - for ( count = 0; count < rows; count++ ) - { - FT_Byte* cur = line; - FT_Byte* limit = line + line_len; + Exit: + return error; + } - for ( ; cur < limit; cur++ ) - if ( cur[0] ) - goto Found_Bottom; + static FT_Error + tt_sbit_decoder_load_image( TT_SBitDecoder decoder, + FT_UInt glyph_index, + FT_Int x_pos, + FT_Int y_pos ) + { + /* + * First, we find the correct strike range that applies to this + * glyph index. + */ - /* the current line was empty - skip to previous one */ - line -= line_len; - } + FT_Byte* p = decoder->eblc_base + decoder->strike_index_array; + FT_Byte* p_limit = decoder->eblc_limit; + FT_ULong num_ranges = decoder->strike_index_count; + FT_UInt start, end, index_format, image_format; + FT_ULong image_start = 0, image_end = 0, image_offset; - Found_Bottom: - if ( count > 0 ) - { - metrics->height = (FT_Byte)( metrics->height - count ); - rows -= count; - map->rows -= count; - } - } - /***********************************************************************/ - /* */ - /* third, get rid of the space on the left side of the glyph */ - /* */ - do + for ( ; num_ranges > 0; num_ranges-- ) { - FT_Byte* limit; + start = FT_NEXT_USHORT( p ); + end = FT_NEXT_USHORT( p ); + + if ( glyph_index >= start && glyph_index <= end ) + goto FoundRange; + + p += 4; /* ignore index offset */ + } + goto NoBitmap; + FoundRange: + image_offset = FT_NEXT_ULONG( p ); - line = (FT_Byte*)map->buffer; - limit = line + rows * line_len; + /* overflow check */ + p = decoder->eblc_base + decoder->strike_index_array; + if ( image_offset > (FT_ULong)( p_limit - p ) ) + goto Failure; + + p += image_offset; + if ( p + 8 > p_limit ) + goto NoBitmap; + + /* now find the glyph's location and extend within the ebdt table */ + index_format = FT_NEXT_USHORT( p ); + image_format = FT_NEXT_USHORT( p ); + image_offset = FT_NEXT_ULONG ( p ); + + switch ( index_format ) + { + case 1: /* 4-byte offsets relative to `image_offset' */ + p += 4 * ( glyph_index - start ); + if ( p + 8 > p_limit ) + goto NoBitmap; - for ( ; line < limit; line += line_len ) - if ( line[0] & 0x80 ) - goto Found_Left; + image_start = FT_NEXT_ULONG( p ); + image_end = FT_NEXT_ULONG( p ); - /* shift the whole glyph one pixel to the left */ - line = (FT_Byte*)map->buffer; - limit = line + rows * line_len; + if ( image_start == image_end ) /* missing glyph */ + goto NoBitmap; + break; - for ( ; line < limit; line += line_len ) + case 2: /* big metrics, constant image size */ { - FT_Int n, width = map->width; - FT_Byte old; - FT_Byte* cur = line; + FT_ULong image_size; - old = (FT_Byte)(cur[0] << 1); - for ( n = 8; n < width; n += 8 ) - { - FT_Byte val; + if ( p + 12 > p_limit ) + goto NoBitmap; + image_size = FT_NEXT_ULONG( p ); - val = cur[1]; - cur[0] = (FT_Byte)( old | ( val >> 7 ) ); - old = (FT_Byte)( val << 1 ); - cur++; - } - cur[0] = old; + if ( tt_sbit_decoder_load_metrics( decoder, &p, p_limit, 1 ) ) + goto NoBitmap; + + image_start = image_size * ( glyph_index - start ); + image_end = image_start + image_size; } + break; - map->width--; - metrics->horiBearingX++; - metrics->vertBearingX++; - metrics->width--; + case 3: /* 2-byte offsets relative to 'image_offset' */ + p += 2 * ( glyph_index - start ); + if ( p + 4 > p_limit ) + goto NoBitmap; - } while ( map->width > 0 ); + image_start = FT_NEXT_USHORT( p ); + image_end = FT_NEXT_USHORT( p ); - Found_Left: + if ( image_start == image_end ) /* missing glyph */ + goto NoBitmap; + break; - /***********************************************************************/ - /* */ - /* finally, crop the bitmap width to get rid of the space on the right */ - /* side of the glyph. */ - /* */ - do - { - FT_Int right = map->width - 1; - FT_Byte* limit; - FT_Byte mask; + case 4: /* sparse glyph array with (glyph,offset) pairs */ + { + FT_ULong mm, num_glyphs; - line = (FT_Byte*)map->buffer + ( right >> 3 ); - limit = line + rows * line_len; - mask = (FT_Byte)( 0x80 >> ( right & 7 ) ); + if ( p + 4 > p_limit ) + goto NoBitmap; - for ( ; line < limit; line += line_len ) - if ( line[0] & mask ) - goto Found_Right; + num_glyphs = FT_NEXT_ULONG( p ); - /* crop the whole glyph to the right */ - map->width--; - metrics->width--; + /* overflow check for p + ( num_glyphs + 1 ) * 4 */ + if ( p + 4 > p_limit || + num_glyphs > (FT_ULong)( ( ( p_limit - p ) >> 2 ) - 1 ) ) + goto NoBitmap; - } while ( map->width > 0 ); + for ( mm = 0; mm < num_glyphs; mm++ ) + { + FT_UInt gindex = FT_NEXT_USHORT( p ); - Found_Right: - /* all right, the bitmap was cropped */ - return; - Empty_Bitmap: - map->width = 0; - map->rows = 0; - map->pitch = 0; - map->pixel_mode = FT_PIXEL_MODE_MONO; - } + if ( gindex == glyph_index ) + { + image_start = FT_NEXT_USHORT( p ); + p += 2; + image_end = FT_PEEK_USHORT( p ); + break; + } + p += 2; + } + + if ( mm >= num_glyphs ) + goto NoBitmap; + } + break; + case 5: /* constant metrics with sparse glyph codes */ + case 19: + { + FT_ULong image_size, mm, num_glyphs; - static FT_Error - Load_SBit_Single( FT_Bitmap* map, - FT_Int x_offset, - FT_Int y_offset, - FT_Int pix_bits, - FT_UShort image_format, - TT_SBit_Metrics metrics, - FT_Stream stream ) - { - FT_Error error; + if ( p + 16 > p_limit ) + goto NoBitmap; - /* check that the source bitmap fits into the target pixmap */ - if ( x_offset < 0 || x_offset + metrics->width > map->width || - y_offset < 0 || y_offset + metrics->height > map->rows ) - { - error = SFNT_Err_Invalid_Argument; + image_size = FT_NEXT_ULONG( p ); - goto Exit; - } + if ( tt_sbit_decoder_load_metrics( decoder, &p, p_limit, 1 ) ) + goto NoBitmap; - { - FT_Int glyph_width = metrics->width; - FT_Int glyph_height = metrics->height; - FT_Int glyph_size; - FT_Int line_bits = pix_bits * glyph_width; - FT_Bool pad_bytes = 0; + num_glyphs = FT_NEXT_ULONG( p ); + /* overflow check for p + 2 * num_glyphs */ + if ( num_glyphs > (FT_ULong)( ( p_limit - p ) >> 1 ) ) + goto NoBitmap; - /* compute size of glyph image */ - switch ( image_format ) - { - case 1: /* byte-padded formats */ - case 6: + for ( mm = 0; mm < num_glyphs; mm++ ) { - FT_Int line_length; + FT_UInt gindex = FT_NEXT_USHORT( p ); - switch ( pix_bits ) - { - case 1: - line_length = ( glyph_width + 7 ) >> 3; + if ( gindex == glyph_index ) break; - case 2: - line_length = ( glyph_width + 3 ) >> 2; - break; - case 4: - line_length = ( glyph_width + 1 ) >> 1; - break; - default: - line_length = glyph_width; - } - - glyph_size = glyph_height * line_length; - pad_bytes = 1; } - break; - case 2: - case 5: - case 7: - line_bits = glyph_width * pix_bits; - glyph_size = ( glyph_height * line_bits + 7 ) >> 3; - break; + if ( mm >= num_glyphs ) + goto NoBitmap; - default: /* invalid format */ - return SFNT_Err_Invalid_File_Format; + image_start = image_size * mm; + image_end = image_start + image_size; } + break; - /* Now read data and draw glyph into target pixmap */ - if ( FT_FRAME_ENTER( glyph_size ) ) - goto Exit; + default: + goto NoBitmap; + } - /* don't forget to multiply `x_offset' by `map->pix_bits' as */ - /* the sbit blitter doesn't make a difference between pixmap */ - /* depths. */ - blit_sbit( map, (FT_Byte*)stream->cursor, line_bits, pad_bytes, - x_offset * pix_bits, y_offset, metrics->height ); + if ( image_start > image_end ) + goto NoBitmap; - FT_FRAME_EXIT(); - } + image_end -= image_start; + image_start = image_offset + image_start; - Exit: - return error; + FT_TRACE3(( "tt_sbit_decoder_load_image:" + " found sbit (format %d) for glyph index %d\n", + image_format, glyph_index )); + + return tt_sbit_decoder_load_bitmap( decoder, + image_format, + image_start, + image_end, + x_pos, + y_pos ); + + Failure: + return FT_THROW( Invalid_Table ); + + NoBitmap: + FT_TRACE4(( "tt_sbit_decoder_load_image:" + " no sbit found for glyph index %d\n", glyph_index )); + + return FT_THROW( Invalid_Argument ); } static FT_Error - Load_SBit_Image( TT_SBit_Strike strike, - TT_SBit_Range range, - FT_ULong ebdt_pos, - FT_ULong glyph_offset, - FT_GlyphSlot slot, - FT_Int x_offset, - FT_Int y_offset, - FT_Stream stream, - TT_SBit_Metrics metrics, - FT_Int depth ) + tt_face_load_sbix_image( TT_Face face, + FT_ULong strike_index, + FT_UInt glyph_index, + FT_Stream stream, + FT_Bitmap *map, + TT_SBit_MetricsRec *metrics ) { - FT_Memory memory = stream->memory; - FT_Bitmap* map = &slot->bitmap; - FT_Error error; + FT_UInt sbix_pos, strike_offset, glyph_start, glyph_end; + FT_ULong table_size; + FT_Int originOffsetX, originOffsetY; + FT_Tag graphicType; + FT_Int recurse_depth = 0; + FT_Error error; + FT_Byte* p; - /* place stream at beginning of glyph data and read metrics */ - if ( FT_STREAM_SEEK( ebdt_pos + glyph_offset ) ) - goto Exit; + FT_UNUSED( map ); - error = tt_load_sbit_metrics( stream, range, metrics ); - if ( error ) - goto Exit; - /* This function is recursive. At the top-level call, we */ - /* compute the dimensions of the higher-level glyph to */ - /* allocate the final pixmap buffer. */ - if ( depth == 0 ) - { - FT_Long size; + metrics->width = 0; + metrics->height = 0; + p = face->sbit_table + 8 + 4 * strike_index; + strike_offset = FT_NEXT_ULONG( p ); - map->width = metrics->width; - map->rows = metrics->height; + error = face->goto_table( face, TTAG_sbix, stream, &table_size ); + if ( error ) + return error; + sbix_pos = FT_STREAM_POS(); - switch ( strike->bit_depth ) - { - case 1: - map->pixel_mode = FT_PIXEL_MODE_MONO; - map->pitch = ( map->width + 7 ) >> 3; - break; + retry: + if ( glyph_index > (FT_UInt)face->root.num_glyphs ) + return FT_THROW( Invalid_Argument ); - case 2: - map->pixel_mode = FT_PIXEL_MODE_GRAY2; - map->pitch = ( map->width + 3 ) >> 2; - break; + if ( strike_offset >= table_size || + table_size - strike_offset < 4 + glyph_index * 4 + 8 ) + return FT_THROW( Invalid_File_Format ); - case 4: - map->pixel_mode = FT_PIXEL_MODE_GRAY4; - map->pitch = ( map->width + 1 ) >> 1; - break; + if ( FT_STREAM_SEEK( sbix_pos + strike_offset + 4 + glyph_index * 4 ) || + FT_FRAME_ENTER( 8 ) ) + return error; - case 8: - map->pixel_mode = FT_PIXEL_MODE_GRAY; - map->pitch = map->width; - break; + glyph_start = FT_GET_ULONG(); + glyph_end = FT_GET_ULONG(); - default: - return SFNT_Err_Invalid_File_Format; - } + FT_FRAME_EXIT(); - size = map->rows * map->pitch; + if ( glyph_start == glyph_end ) + return FT_THROW( Invalid_Argument ); + if ( glyph_start > glyph_end || + glyph_end - glyph_start < 8 || + table_size - strike_offset < glyph_end ) + return FT_THROW( Invalid_File_Format ); - /* check that there is no empty image */ - if ( size == 0 ) - goto Exit; /* exit successfully! */ + if ( FT_STREAM_SEEK( sbix_pos + strike_offset + glyph_start ) || + FT_FRAME_ENTER( glyph_end - glyph_start ) ) + return error; - error = ft_glyphslot_alloc_bitmap( slot, size ); - if (error) - goto Exit; - } + originOffsetX = FT_GET_SHORT(); + originOffsetY = FT_GET_SHORT(); - switch ( range->image_format ) - { - case 1: /* single sbit image - load it */ - case 2: - case 5: - case 6: - case 7: - return Load_SBit_Single( map, x_offset, y_offset, strike->bit_depth, - range->image_format, metrics, stream ); + graphicType = FT_GET_TAG4(); - case 8: /* compound format */ - if ( FT_STREAM_SKIP( 1L ) ) + switch ( graphicType ) + { + case FT_MAKE_TAG( 'd', 'u', 'p', 'e' ): + if ( recurse_depth < 4 ) { - error = SFNT_Err_Invalid_Stream_Skip; - goto Exit; + glyph_index = FT_GET_USHORT(); + FT_FRAME_EXIT(); + recurse_depth++; + goto retry; } - /* fallthrough */ - - case 9: + error = FT_THROW( Invalid_File_Format ); break; - default: /* invalid image format */ - return SFNT_Err_Invalid_File_Format; - } - - /* All right, we have a compound format. First of all, read */ - /* the array of elements. */ - { - TT_SBit_Component components = NULL; - TT_SBit_Component comp; - FT_UShort num_components, count; - - - if ( FT_READ_USHORT( num_components ) || - FT_NEW_ARRAY( components, num_components ) ) - goto Exit; - - count = num_components; + case FT_MAKE_TAG( 'p', 'n', 'g', ' ' ): +#ifdef FT_CONFIG_OPTION_USE_PNG + error = Load_SBit_Png( face->root.glyph, + 0, + 0, + 32, + metrics, + stream->memory, + stream->cursor, + glyph_end - glyph_start - 8, + TRUE ); +#else + error = FT_THROW( Unimplemented_Feature ); +#endif + break; - if ( FT_FRAME_ENTER( 4L * num_components ) ) - goto Fail_Memory; + case FT_MAKE_TAG( 'j', 'p', 'g', ' ' ): + case FT_MAKE_TAG( 't', 'i', 'f', 'f' ): + case FT_MAKE_TAG( 'r', 'g', 'b', 'l' ): /* used on iOS 7.1 */ + error = FT_THROW( Unknown_File_Format ); + break; - for ( comp = components; count > 0; count--, comp++ ) - { - comp->glyph_code = FT_GET_USHORT(); - comp->x_offset = FT_GET_CHAR(); - comp->y_offset = FT_GET_CHAR(); - } + default: + error = FT_THROW( Unimplemented_Feature ); + break; + } - FT_FRAME_EXIT(); + FT_FRAME_EXIT(); - /* Now recursively load each element glyph */ - count = num_components; - comp = components; - for ( ; count > 0; count--, comp++ ) - { - TT_SBit_Range elem_range; - TT_SBit_MetricsRec elem_metrics; - FT_ULong elem_offset; + if ( !error ) + { + FT_Short abearing; + FT_UShort aadvance; - /* find the range for this element */ - error = find_sbit_range( comp->glyph_code, - strike, - &elem_range, - &elem_offset ); - if ( error ) - goto Fail_Memory; - - /* now load the element, recursively */ - error = Load_SBit_Image( strike, - elem_range, - ebdt_pos, - elem_offset, - slot, - x_offset + comp->x_offset, - y_offset + comp->y_offset, - stream, - &elem_metrics, - depth + 1 ); - if ( error ) - goto Fail_Memory; - } + tt_face_get_metrics( face, FALSE, glyph_index, &abearing, &aadvance ); - Fail_Memory: - FT_FREE( components ); + metrics->horiBearingX = (FT_Short)originOffsetX; + metrics->horiBearingY = (FT_Short)( -originOffsetY + metrics->height ); + metrics->horiAdvance = (FT_Short)( aadvance * + face->root.size->metrics.x_ppem / + face->header.Units_Per_EM ); } - Exit: return error; } - - /*************************************************************************/ - /* */ - /* <Function> */ - /* tt_face_load_sbit_image */ - /* */ - /* <Description> */ - /* Loads a given glyph sbit image from the font resource. This also */ - /* returns its metrics. */ - /* */ - /* <Input> */ - /* face :: The target face object. */ - /* */ - /* strike_index :: The current strike index. */ - /* */ - /* glyph_index :: The current glyph index. */ - /* */ - /* load_flags :: The glyph load flags (the code checks for the flag */ - /* FT_LOAD_CROP_BITMAP). */ - /* */ - /* stream :: The input stream. */ - /* */ - /* <Output> */ - /* map :: The target pixmap. */ - /* */ - /* metrics :: A big sbit metrics structure for the glyph image. */ - /* */ - /* <Return> */ - /* FreeType error code. 0 means success. Returns an error if no */ - /* glyph sbit exists for the index. */ - /* */ - /* <Note> */ - /* The `map.buffer' field is always freed before the glyph is loaded. */ - /* */ - FT_LOCAL_DEF( FT_Error ) + FT_LOCAL( FT_Error ) tt_face_load_sbit_image( TT_Face face, FT_ULong strike_index, FT_UInt glyph_index, @@ -1450,59 +1396,71 @@ FT_Bitmap *map, TT_SBit_MetricsRec *metrics ) { - FT_Error error; - FT_ULong ebdt_pos, glyph_offset; + FT_Error error = FT_Err_Ok; - TT_SBit_Strike strike; - TT_SBit_Range range; + switch ( (FT_UInt)face->sbit_table_type ) + { + case TT_SBIT_TABLE_TYPE_EBLC: + case TT_SBIT_TABLE_TYPE_CBLC: + { + TT_SBitDecoderRec decoder[1]; - /* Check whether there is a glyph sbit for the current index */ - error = tt_find_sbit_image( face, glyph_index, strike_index, - &range, &strike, &glyph_offset ); - if ( error ) - goto Exit; - /* now, find the location of the `EBDT' table in */ - /* the font file */ - error = face->goto_table( face, TTAG_EBDT, stream, 0 ); - if ( error ) - error = face->goto_table( face, TTAG_bdat, stream, 0 ); - if ( error ) - goto Exit; + error = tt_sbit_decoder_init( decoder, face, strike_index, metrics ); + if ( !error ) + { + error = tt_sbit_decoder_load_image( decoder, + glyph_index, + 0, + 0 ); + tt_sbit_decoder_done( decoder ); + } + } + break; - ebdt_pos = FT_STREAM_POS(); + case TT_SBIT_TABLE_TYPE_SBIX: + error = tt_face_load_sbix_image( face, + strike_index, + glyph_index, + stream, + map, + metrics ); + break; - error = Load_SBit_Image( strike, range, ebdt_pos, glyph_offset, - face->root.glyph, 0, 0, stream, metrics, 0 ); - if ( error ) - goto Exit; + default: + error = FT_THROW( Unknown_File_Format ); + break; + } - /* setup vertical metrics if needed */ - if ( strike->flags & 1 ) + /* Flatten color bitmaps if color was not requested. */ + if ( !error && + !( load_flags & FT_LOAD_COLOR ) && + map->pixel_mode == FT_PIXEL_MODE_BGRA ) { - /* in case of a horizontal strike only */ - FT_Int advance; + FT_Bitmap new_map; + FT_Library library = face->root.glyph->library; - advance = strike->hori.ascender - strike->hori.descender; + FT_Bitmap_New( &new_map ); - /* some heuristic values */ + /* Convert to 8bit grayscale. */ + error = FT_Bitmap_Convert( library, map, &new_map, 1 ); + if ( error ) + FT_Bitmap_Done( library, &new_map ); + else + { + map->pixel_mode = new_map.pixel_mode; + map->pitch = new_map.pitch; + map->num_grays = new_map.num_grays; - metrics->vertBearingX = (FT_Char)(-metrics->width / 2 ); - metrics->vertBearingY = (FT_Char)( ( advance - metrics->height ) / 2 ); - metrics->vertAdvance = (FT_Char)( advance * 12 / 10 ); + ft_glyphslot_set_bitmap( face->root.glyph, new_map.buffer ); + face->root.glyph->internal->flags |= FT_GLYPH_OWN_BITMAP; + } } - /* Crop the bitmap now, unless specified otherwise */ - if ( load_flags & FT_LOAD_CROP_BITMAP ) - crop_bitmap( map, metrics ); - - Exit: return error; } -#endif /* FT_CONFIG_OPTION_OLD_INTERNALS */ - -/* END */ +/* EOF */ diff --git a/src/sfnt/ttsbit.h b/src/sfnt/ttsbit.h index 7ea2af1..695d0d8 100644 --- a/src/sfnt/ttsbit.h +++ b/src/sfnt/ttsbit.h @@ -4,7 +4,7 @@ /* */ /* TrueType and OpenType embedded bitmap support (specification). */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 by */ +/* Copyright 1996-2008, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -28,11 +28,11 @@ FT_BEGIN_HEADER FT_LOCAL( FT_Error ) - tt_face_load_eblc( TT_Face face, + tt_face_load_sbit( TT_Face face, FT_Stream stream ); FT_LOCAL( void ) - tt_face_free_eblc( TT_Face face ); + tt_face_free_sbit( TT_Face face ); FT_LOCAL( FT_Error ) @@ -45,22 +45,6 @@ FT_BEGIN_HEADER FT_ULong strike_index, FT_Size_Metrics* metrics ); -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS - FT_LOCAL( FT_Error ) - tt_find_sbit_image( TT_Face face, - FT_UInt glyph_index, - FT_ULong strike_index, - TT_SBit_Range *arange, - TT_SBit_Strike *astrike, - FT_ULong *aglyph_offset ); - - FT_LOCAL( FT_Error ) - tt_load_sbit_metrics( FT_Stream stream, - TT_SBit_Range range, - TT_SBit_Metrics metrics ); - -#endif /* FT_CONFIG_OPTION_OLD_INTERNALS */ - FT_LOCAL( FT_Error ) tt_face_load_sbit_image( TT_Face face, FT_ULong strike_index, diff --git a/src/sfnt/ttsbit0.c b/src/sfnt/ttsbit0.c deleted file mode 100644 index 38bcf21..0000000 --- a/src/sfnt/ttsbit0.c +++ /dev/null @@ -1,1011 +0,0 @@ -/***************************************************************************/ -/* */ -/* ttsbit0.c */ -/* */ -/* TrueType and OpenType embedded bitmap support (body). */ -/* This is a heap-optimized version. */ -/* */ -/* Copyright 2005, 2006, 2007, 2008, 2009 by */ -/* David Turner, Robert Wilhelm, and Werner Lemberg. */ -/* */ -/* This file is part of the FreeType project, and may only be used, */ -/* modified, and distributed under the terms of the FreeType project */ -/* license, LICENSE.TXT. By continuing to use, modify, or distribute */ -/* this file you indicate that you have read the license and */ -/* understand and accept it fully. */ -/* */ -/***************************************************************************/ - - -/* This file is included by ttsbit.c */ - - -#include <ft2build.h> -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_STREAM_H -#include FT_TRUETYPE_TAGS_H -#include "ttsbit.h" - -#include "sferrors.h" - - - /*************************************************************************/ - /* */ - /* The macro FT_COMPONENT is used in trace mode. It is an implicit */ - /* parameter of the FT_TRACE() and FT_ERROR() macros, used to print/log */ - /* messages during execution. */ - /* */ -#undef FT_COMPONENT -#define FT_COMPONENT trace_ttsbit - - - FT_LOCAL_DEF( FT_Error ) - tt_face_load_eblc( TT_Face face, - FT_Stream stream ) - { - FT_Error error = SFNT_Err_Ok; - FT_Fixed version; - FT_ULong num_strikes, table_size; - FT_Byte* p; - FT_Byte* p_limit; - FT_UInt count; - - - face->sbit_num_strikes = 0; - - /* this table is optional */ - error = face->goto_table( face, TTAG_EBLC, stream, &table_size ); - if ( error ) - error = face->goto_table( face, TTAG_bloc, stream, &table_size ); - if ( error ) - goto Exit; - - if ( table_size < 8 ) - { - FT_ERROR(( "tt_face_load_sbit_strikes: table too short\n" )); - error = SFNT_Err_Invalid_File_Format; - goto Exit; - } - - if ( FT_FRAME_EXTRACT( table_size, face->sbit_table ) ) - goto Exit; - - face->sbit_table_size = table_size; - - p = face->sbit_table; - p_limit = p + table_size; - - version = FT_NEXT_ULONG( p ); - num_strikes = FT_NEXT_ULONG( p ); - - if ( version != 0x00020000UL || num_strikes >= 0x10000UL ) - { - FT_ERROR(( "tt_face_load_sbit_strikes: invalid table version\n" )); - error = SFNT_Err_Invalid_File_Format; - goto Fail; - } - - /* - * Count the number of strikes available in the table. We are a bit - * paranoid there and don't trust the data. - */ - count = (FT_UInt)num_strikes; - if ( 8 + 48UL * count > table_size ) - count = (FT_UInt)( ( p_limit - p ) / 48 ); - - face->sbit_num_strikes = count; - - FT_TRACE3(( "sbit_num_strikes: %u\n", count )); - Exit: - return error; - - Fail: - FT_FRAME_RELEASE( face->sbit_table ); - face->sbit_table_size = 0; - goto Exit; - } - - - FT_LOCAL_DEF( void ) - tt_face_free_eblc( TT_Face face ) - { - FT_Stream stream = face->root.stream; - - - FT_FRAME_RELEASE( face->sbit_table ); - face->sbit_table_size = 0; - face->sbit_num_strikes = 0; - } - - - FT_LOCAL_DEF( FT_Error ) - tt_face_set_sbit_strike( TT_Face face, - FT_Size_Request req, - FT_ULong* astrike_index ) - { - return FT_Match_Size( (FT_Face)face, req, 0, astrike_index ); - } - - - FT_LOCAL_DEF( FT_Error ) - tt_face_load_strike_metrics( TT_Face face, - FT_ULong strike_index, - FT_Size_Metrics* metrics ) - { - FT_Byte* strike; - - - if ( strike_index >= (FT_ULong)face->sbit_num_strikes ) - return SFNT_Err_Invalid_Argument; - - strike = face->sbit_table + 8 + strike_index * 48; - - metrics->x_ppem = (FT_UShort)strike[44]; - metrics->y_ppem = (FT_UShort)strike[45]; - - metrics->ascender = (FT_Char)strike[16] << 6; /* hori.ascender */ - metrics->descender = (FT_Char)strike[17] << 6; /* hori.descender */ - metrics->height = metrics->ascender - metrics->descender; - - /* XXX: Is this correct? */ - metrics->max_advance = ( (FT_Char)strike[22] + /* min_origin_SB */ - strike[18] + /* max_width */ - (FT_Char)strike[23] /* min_advance_SB */ - ) << 6; - - return SFNT_Err_Ok; - } - - - typedef struct TT_SBitDecoderRec_ - { - TT_Face face; - FT_Stream stream; - FT_Bitmap* bitmap; - TT_SBit_Metrics metrics; - FT_Bool metrics_loaded; - FT_Bool bitmap_allocated; - FT_Byte bit_depth; - - FT_ULong ebdt_start; - FT_ULong ebdt_size; - - FT_ULong strike_index_array; - FT_ULong strike_index_count; - FT_Byte* eblc_base; - FT_Byte* eblc_limit; - - } TT_SBitDecoderRec, *TT_SBitDecoder; - - - static FT_Error - tt_sbit_decoder_init( TT_SBitDecoder decoder, - TT_Face face, - FT_ULong strike_index, - TT_SBit_MetricsRec* metrics ) - { - FT_Error error; - FT_Stream stream = face->root.stream; - FT_ULong ebdt_size; - - - error = face->goto_table( face, TTAG_EBDT, stream, &ebdt_size ); - if ( error ) - error = face->goto_table( face, TTAG_bdat, stream, &ebdt_size ); - if ( error ) - goto Exit; - - decoder->face = face; - decoder->stream = stream; - decoder->bitmap = &face->root.glyph->bitmap; - decoder->metrics = metrics; - - decoder->metrics_loaded = 0; - decoder->bitmap_allocated = 0; - - decoder->ebdt_start = FT_STREAM_POS(); - decoder->ebdt_size = ebdt_size; - - decoder->eblc_base = face->sbit_table; - decoder->eblc_limit = face->sbit_table + face->sbit_table_size; - - /* now find the strike corresponding to the index */ - { - FT_Byte* p; - - - if ( 8 + 48 * strike_index + 3 * 4 + 34 + 1 > face->sbit_table_size ) - { - error = SFNT_Err_Invalid_File_Format; - goto Exit; - } - - p = decoder->eblc_base + 8 + 48 * strike_index; - - decoder->strike_index_array = FT_NEXT_ULONG( p ); - p += 4; - decoder->strike_index_count = FT_NEXT_ULONG( p ); - p += 34; - decoder->bit_depth = *p; - - if ( decoder->strike_index_array > face->sbit_table_size || - decoder->strike_index_array + 8 * decoder->strike_index_count > - face->sbit_table_size ) - error = SFNT_Err_Invalid_File_Format; - } - - Exit: - return error; - } - - - static void - tt_sbit_decoder_done( TT_SBitDecoder decoder ) - { - FT_UNUSED( decoder ); - } - - - static FT_Error - tt_sbit_decoder_alloc_bitmap( TT_SBitDecoder decoder ) - { - FT_Error error = SFNT_Err_Ok; - FT_UInt width, height; - FT_Bitmap* map = decoder->bitmap; - FT_Long size; - - - if ( !decoder->metrics_loaded ) - { - error = SFNT_Err_Invalid_Argument; - goto Exit; - } - - width = decoder->metrics->width; - height = decoder->metrics->height; - - map->width = (int)width; - map->rows = (int)height; - - switch ( decoder->bit_depth ) - { - case 1: - map->pixel_mode = FT_PIXEL_MODE_MONO; - map->pitch = ( map->width + 7 ) >> 3; - break; - - case 2: - map->pixel_mode = FT_PIXEL_MODE_GRAY2; - map->pitch = ( map->width + 3 ) >> 2; - break; - - case 4: - map->pixel_mode = FT_PIXEL_MODE_GRAY4; - map->pitch = ( map->width + 1 ) >> 1; - break; - - case 8: - map->pixel_mode = FT_PIXEL_MODE_GRAY; - map->pitch = map->width; - break; - - default: - error = SFNT_Err_Invalid_File_Format; - goto Exit; - } - - size = map->rows * map->pitch; - - /* check that there is no empty image */ - if ( size == 0 ) - goto Exit; /* exit successfully! */ - - error = ft_glyphslot_alloc_bitmap( decoder->face->root.glyph, size ); - if ( error ) - goto Exit; - - decoder->bitmap_allocated = 1; - - Exit: - return error; - } - - - static FT_Error - tt_sbit_decoder_load_metrics( TT_SBitDecoder decoder, - FT_Byte* *pp, - FT_Byte* limit, - FT_Bool big ) - { - FT_Byte* p = *pp; - TT_SBit_Metrics metrics = decoder->metrics; - - - if ( p + 5 > limit ) - goto Fail; - - metrics->height = p[0]; - metrics->width = p[1]; - metrics->horiBearingX = (FT_Char)p[2]; - metrics->horiBearingY = (FT_Char)p[3]; - metrics->horiAdvance = p[4]; - - p += 5; - if ( big ) - { - if ( p + 3 > limit ) - goto Fail; - - metrics->vertBearingX = (FT_Char)p[0]; - metrics->vertBearingY = (FT_Char)p[1]; - metrics->vertAdvance = p[2]; - - p += 3; - } - - decoder->metrics_loaded = 1; - *pp = p; - return SFNT_Err_Ok; - - Fail: - return SFNT_Err_Invalid_Argument; - } - - - /* forward declaration */ - static FT_Error - tt_sbit_decoder_load_image( TT_SBitDecoder decoder, - FT_UInt glyph_index, - FT_Int x_pos, - FT_Int y_pos ); - - typedef FT_Error (*TT_SBitDecoder_LoadFunc)( TT_SBitDecoder decoder, - FT_Byte* p, - FT_Byte* plimit, - FT_Int x_pos, - FT_Int y_pos ); - - - static FT_Error - tt_sbit_decoder_load_byte_aligned( TT_SBitDecoder decoder, - FT_Byte* p, - FT_Byte* limit, - FT_Int x_pos, - FT_Int y_pos ) - { - FT_Error error = SFNT_Err_Ok; - FT_Byte* line; - FT_Int bit_height, bit_width, pitch, width, height, h; - FT_Bitmap* bitmap; - - - if ( !decoder->bitmap_allocated ) - { - error = tt_sbit_decoder_alloc_bitmap( decoder ); - if ( error ) - goto Exit; - } - - /* check that we can write the glyph into the bitmap */ - bitmap = decoder->bitmap; - bit_width = bitmap->width; - bit_height = bitmap->rows; - pitch = bitmap->pitch; - line = bitmap->buffer; - - width = decoder->metrics->width; - height = decoder->metrics->height; - - if ( x_pos < 0 || x_pos + width > bit_width || - y_pos < 0 || y_pos + height > bit_height ) - { - error = SFNT_Err_Invalid_File_Format; - goto Exit; - } - - if ( p + ( ( width + 7 ) >> 3 ) * height > limit ) - { - error = SFNT_Err_Invalid_File_Format; - goto Exit; - } - - /* now do the blit */ - line += y_pos * pitch + ( x_pos >> 3 ); - x_pos &= 7; - - if ( x_pos == 0 ) /* the easy one */ - { - for ( h = height; h > 0; h--, line += pitch ) - { - FT_Byte* write = line; - FT_Int w; - - - for ( w = width; w >= 8; w -= 8 ) - { - write[0] = (FT_Byte)( write[0] | *p++ ); - write += 1; - } - - if ( w > 0 ) - write[0] = (FT_Byte)( write[0] | ( *p++ & ( 0xFF00U >> w ) ) ); - } - } - else /* x_pos > 0 */ - { - for ( h = height; h > 0; h--, line += pitch ) - { - FT_Byte* write = line; - FT_Int w; - FT_UInt wval = 0; - - - for ( w = width; w >= 8; w -= 8 ) - { - wval = (FT_UInt)( wval | *p++ ); - write[0] = (FT_Byte)( write[0] | ( wval >> x_pos ) ); - write += 1; - wval <<= 8; - } - - if ( w > 0 ) - wval = (FT_UInt)( wval | ( *p++ & ( 0xFF00U >> w ) ) ); - - /* all bits read and there are `x_pos + w' bits to be written */ - - write[0] = (FT_Byte)( write[0] | ( wval >> x_pos ) ); - - if ( x_pos + w > 8 ) - { - write++; - wval <<= 8; - write[0] = (FT_Byte)( write[0] | ( wval >> x_pos ) ); - } - } - } - - Exit: - return error; - } - - - /* - * Load a bit-aligned bitmap (with pointer `p') into a line-aligned bitmap - * (with pointer `write'). In the example below, the width is 3 pixel, - * and `x_pos' is 1 pixel. - * - * p p+1 - * | | | - * | 7 6 5 4 3 2 1 0 | 7 6 5 4 3 2 1 0 |... - * | | | - * +-------+ +-------+ +-------+ ... - * . . . - * . . . - * v . . - * +-------+ . . - * | | . - * | 7 6 5 4 3 2 1 0 | . - * | | . - * write . . - * . . - * v . - * +-------+ . - * | | - * | 7 6 5 4 3 2 1 0 | - * | | - * write+1 . - * . - * v - * +-------+ - * | | - * | 7 6 5 4 3 2 1 0 | - * | | - * write+2 - * - */ - - static FT_Error - tt_sbit_decoder_load_bit_aligned( TT_SBitDecoder decoder, - FT_Byte* p, - FT_Byte* limit, - FT_Int x_pos, - FT_Int y_pos ) - { - FT_Error error = SFNT_Err_Ok; - FT_Byte* line; - FT_Int bit_height, bit_width, pitch, width, height, h, nbits; - FT_Bitmap* bitmap; - FT_UShort rval; - - - if ( !decoder->bitmap_allocated ) - { - error = tt_sbit_decoder_alloc_bitmap( decoder ); - if ( error ) - goto Exit; - } - - /* check that we can write the glyph into the bitmap */ - bitmap = decoder->bitmap; - bit_width = bitmap->width; - bit_height = bitmap->rows; - pitch = bitmap->pitch; - line = bitmap->buffer; - - width = decoder->metrics->width; - height = decoder->metrics->height; - - if ( x_pos < 0 || x_pos + width > bit_width || - y_pos < 0 || y_pos + height > bit_height ) - { - error = SFNT_Err_Invalid_File_Format; - goto Exit; - } - - if ( p + ( ( width * height + 7 ) >> 3 ) > limit ) - { - error = SFNT_Err_Invalid_File_Format; - goto Exit; - } - - /* now do the blit */ - - /* adjust `line' to point to the first byte of the bitmap */ - line += y_pos * pitch + ( x_pos >> 3 ); - x_pos &= 7; - - /* the higher byte of `rval' is used as a buffer */ - rval = 0; - nbits = 0; - - for ( h = height; h > 0; h--, line += pitch ) - { - FT_Byte* write = line; - FT_Int w = width; - - - /* handle initial byte (in target bitmap) specially if necessary */ - if ( x_pos ) - { - w = ( width < 8 - x_pos ) ? width : 8 - x_pos; - - if ( h == height ) - { - rval = *p++; - nbits = x_pos; - } - else if ( nbits < w ) - { - if ( p < limit ) - rval |= *p++; - nbits += 8 - w; - } - else - { - rval >>= 8; - nbits -= w; - } - - *write++ |= ( ( rval >> nbits ) & 0xFF ) & - ( ~( 0xFF << w ) << ( 8 - w - x_pos ) ); - rval <<= 8; - - w = width - w; - } - - /* handle medial bytes */ - for ( ; w >= 8; w -= 8 ) - { - rval |= *p++; - *write++ |= ( rval >> nbits ) & 0xFF; - - rval <<= 8; - } - - /* handle final byte if necessary */ - if ( w > 0 ) - { - if ( nbits < w ) - { - if ( p < limit ) - rval |= *p++; - *write |= ( ( rval >> nbits ) & 0xFF ) & ( 0xFF00U >> w ); - nbits += 8 - w; - - rval <<= 8; - } - else - { - *write |= ( ( rval >> nbits ) & 0xFF ) & ( 0xFF00U >> w ); - nbits -= w; - } - } - } - - Exit: - return error; - } - - - static FT_Error - tt_sbit_decoder_load_compound( TT_SBitDecoder decoder, - FT_Byte* p, - FT_Byte* limit, - FT_Int x_pos, - FT_Int y_pos ) - { - FT_Error error = SFNT_Err_Ok; - FT_UInt num_components, nn; - - FT_Char horiBearingX = decoder->metrics->horiBearingX; - FT_Char horiBearingY = decoder->metrics->horiBearingY; - FT_Byte horiAdvance = decoder->metrics->horiAdvance; - FT_Char vertBearingX = decoder->metrics->vertBearingX; - FT_Char vertBearingY = decoder->metrics->vertBearingY; - FT_Byte vertAdvance = decoder->metrics->vertAdvance; - - - if ( p + 2 > limit ) - goto Fail; - - num_components = FT_NEXT_USHORT( p ); - if ( p + 4 * num_components > limit ) - goto Fail; - - if ( !decoder->bitmap_allocated ) - { - error = tt_sbit_decoder_alloc_bitmap( decoder ); - if ( error ) - goto Exit; - } - - for ( nn = 0; nn < num_components; nn++ ) - { - FT_UInt gindex = FT_NEXT_USHORT( p ); - FT_Byte dx = FT_NEXT_BYTE( p ); - FT_Byte dy = FT_NEXT_BYTE( p ); - - - /* NB: a recursive call */ - error = tt_sbit_decoder_load_image( decoder, gindex, - x_pos + dx, y_pos + dy ); - if ( error ) - break; - } - - decoder->metrics->horiBearingX = horiBearingX; - decoder->metrics->horiBearingY = horiBearingY; - decoder->metrics->horiAdvance = horiAdvance; - decoder->metrics->vertBearingX = vertBearingX; - decoder->metrics->vertBearingY = vertBearingY; - decoder->metrics->vertAdvance = vertAdvance; - decoder->metrics->width = (FT_UInt)decoder->bitmap->width; - decoder->metrics->height = (FT_UInt)decoder->bitmap->rows; - - Exit: - return error; - - Fail: - error = SFNT_Err_Invalid_File_Format; - goto Exit; - } - - - static FT_Error - tt_sbit_decoder_load_bitmap( TT_SBitDecoder decoder, - FT_UInt glyph_format, - FT_ULong glyph_start, - FT_ULong glyph_size, - FT_Int x_pos, - FT_Int y_pos ) - { - FT_Error error; - FT_Stream stream = decoder->stream; - FT_Byte* p; - FT_Byte* p_limit; - FT_Byte* data; - - - /* seek into the EBDT table now */ - if ( glyph_start + glyph_size > decoder->ebdt_size ) - { - error = SFNT_Err_Invalid_Argument; - goto Exit; - } - - if ( FT_STREAM_SEEK( decoder->ebdt_start + glyph_start ) || - FT_FRAME_EXTRACT( glyph_size, data ) ) - goto Exit; - - p = data; - p_limit = p + glyph_size; - - /* read the data, depending on the glyph format */ - switch ( glyph_format ) - { - case 1: - case 2: - case 8: - error = tt_sbit_decoder_load_metrics( decoder, &p, p_limit, 0 ); - break; - - case 6: - case 7: - case 9: - error = tt_sbit_decoder_load_metrics( decoder, &p, p_limit, 1 ); - break; - - default: - error = SFNT_Err_Ok; - } - - if ( error ) - goto Fail; - - { - TT_SBitDecoder_LoadFunc loader; - - - switch ( glyph_format ) - { - case 1: - case 6: - loader = tt_sbit_decoder_load_byte_aligned; - break; - - case 2: - case 5: - case 7: - loader = tt_sbit_decoder_load_bit_aligned; - break; - - case 8: - if ( p + 1 > p_limit ) - goto Fail; - - p += 1; /* skip padding */ - /* fall-through */ - - case 9: - loader = tt_sbit_decoder_load_compound; - break; - - default: - goto Fail; - } - - error = loader( decoder, p, p_limit, x_pos, y_pos ); - } - - Fail: - FT_FRAME_RELEASE( data ); - - Exit: - return error; - } - - - static FT_Error - tt_sbit_decoder_load_image( TT_SBitDecoder decoder, - FT_UInt glyph_index, - FT_Int x_pos, - FT_Int y_pos ) - { - /* - * First, we find the correct strike range that applies to this - * glyph index. - */ - - FT_Byte* p = decoder->eblc_base + decoder->strike_index_array; - FT_Byte* p_limit = decoder->eblc_limit; - FT_ULong num_ranges = decoder->strike_index_count; - FT_UInt start, end, index_format, image_format; - FT_ULong image_start = 0, image_end = 0, image_offset; - - - for ( ; num_ranges > 0; num_ranges-- ) - { - start = FT_NEXT_USHORT( p ); - end = FT_NEXT_USHORT( p ); - - if ( glyph_index >= start && glyph_index <= end ) - goto FoundRange; - - p += 4; /* ignore index offset */ - } - goto NoBitmap; - - FoundRange: - image_offset = FT_NEXT_ULONG( p ); - - /* overflow check */ - if ( decoder->eblc_base + decoder->strike_index_array + image_offset < - decoder->eblc_base ) - goto Failure; - - p = decoder->eblc_base + decoder->strike_index_array + image_offset; - if ( p + 8 > p_limit ) - goto NoBitmap; - - /* now find the glyph's location and extend within the ebdt table */ - index_format = FT_NEXT_USHORT( p ); - image_format = FT_NEXT_USHORT( p ); - image_offset = FT_NEXT_ULONG ( p ); - - switch ( index_format ) - { - case 1: /* 4-byte offsets relative to `image_offset' */ - { - p += 4 * ( glyph_index - start ); - if ( p + 8 > p_limit ) - goto NoBitmap; - - image_start = FT_NEXT_ULONG( p ); - image_end = FT_NEXT_ULONG( p ); - - if ( image_start == image_end ) /* missing glyph */ - goto NoBitmap; - } - break; - - case 2: /* big metrics, constant image size */ - { - FT_ULong image_size; - - - if ( p + 12 > p_limit ) - goto NoBitmap; - - image_size = FT_NEXT_ULONG( p ); - - if ( tt_sbit_decoder_load_metrics( decoder, &p, p_limit, 1 ) ) - goto NoBitmap; - - image_start = image_size * ( glyph_index - start ); - image_end = image_start + image_size; - } - break; - - case 3: /* 2-byte offsets relative to 'image_offset' */ - { - p += 2 * ( glyph_index - start ); - if ( p + 4 > p_limit ) - goto NoBitmap; - - image_start = FT_NEXT_USHORT( p ); - image_end = FT_NEXT_USHORT( p ); - - if ( image_start == image_end ) /* missing glyph */ - goto NoBitmap; - } - break; - - case 4: /* sparse glyph array with (glyph,offset) pairs */ - { - FT_ULong mm, num_glyphs; - - - if ( p + 4 > p_limit ) - goto NoBitmap; - - num_glyphs = FT_NEXT_ULONG( p ); - - /* overflow check */ - if ( p + ( num_glyphs + 1 ) * 4 < p ) - goto Failure; - - if ( p + ( num_glyphs + 1 ) * 4 > p_limit ) - goto NoBitmap; - - for ( mm = 0; mm < num_glyphs; mm++ ) - { - FT_UInt gindex = FT_NEXT_USHORT( p ); - - - if ( gindex == glyph_index ) - { - image_start = FT_NEXT_USHORT( p ); - p += 2; - image_end = FT_PEEK_USHORT( p ); - break; - } - p += 2; - } - - if ( mm >= num_glyphs ) - goto NoBitmap; - } - break; - - case 5: /* constant metrics with sparse glyph codes */ - { - FT_ULong image_size, mm, num_glyphs; - - - if ( p + 16 > p_limit ) - goto NoBitmap; - - image_size = FT_NEXT_ULONG( p ); - - if ( tt_sbit_decoder_load_metrics( decoder, &p, p_limit, 1 ) ) - goto NoBitmap; - - num_glyphs = FT_NEXT_ULONG( p ); - - /* overflow check */ - if ( p + 2 * num_glyphs < p ) - goto Failure; - - if ( p + 2 * num_glyphs > p_limit ) - goto NoBitmap; - - for ( mm = 0; mm < num_glyphs; mm++ ) - { - FT_UInt gindex = FT_NEXT_USHORT( p ); - - - if ( gindex == glyph_index ) - break; - } - - if ( mm >= num_glyphs ) - goto NoBitmap; - - image_start = image_size * mm; - image_end = image_start + image_size; - } - break; - - default: - goto NoBitmap; - } - - if ( image_start > image_end ) - goto NoBitmap; - - image_end -= image_start; - image_start = image_offset + image_start; - - return tt_sbit_decoder_load_bitmap( decoder, - image_format, - image_start, - image_end, - x_pos, - y_pos ); - - Failure: - return SFNT_Err_Invalid_Table; - - NoBitmap: - return SFNT_Err_Invalid_Argument; - } - - - FT_LOCAL( FT_Error ) - tt_face_load_sbit_image( TT_Face face, - FT_ULong strike_index, - FT_UInt glyph_index, - FT_UInt load_flags, - FT_Stream stream, - FT_Bitmap *map, - TT_SBit_MetricsRec *metrics ) - { - TT_SBitDecoderRec decoder[1]; - FT_Error error; - - FT_UNUSED( load_flags ); - FT_UNUSED( stream ); - FT_UNUSED( map ); - - - error = tt_sbit_decoder_init( decoder, face, strike_index, metrics ); - if ( !error ) - { - error = tt_sbit_decoder_load_image( decoder, glyph_index, 0, 0 ); - tt_sbit_decoder_done( decoder ); - } - - return error; - } - -/* EOF */ diff --git a/src/smooth/ftgrays.c b/src/smooth/ftgrays.c index 4c0eea5..131ad27 100644 --- a/src/smooth/ftgrays.c +++ b/src/smooth/ftgrays.c @@ -4,7 +4,7 @@ /* */ /* A new `perfect' anti-aliasing renderer (body). */ /* */ -/* Copyright 2000-2003, 2005-2012 by */ +/* Copyright 2000-2003, 2005-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -24,8 +24,8 @@ /* */ /* - copy `src/smooth/ftgrays.c' (this file) to your current directory */ /* */ - /* - copy `include/freetype/ftimage.h' and `src/smooth/ftgrays.h' to the */ - /* same directory */ + /* - copy `include/ftimage.h' and `src/smooth/ftgrays.h' to the same */ + /* directory */ /* */ /* - compile `ftgrays' with the _STANDALONE_ macro defined, as in */ /* */ @@ -94,6 +94,14 @@ #ifdef _STANDALONE_ + /* Auxiliary macros for token concatenation. */ +#define FT_ERR_XCAT( x, y ) x ## y +#define FT_ERR_CAT( x, y ) FT_ERR_XCAT( x, y ) + +#define FT_BEGIN_STMNT do { +#define FT_END_STMNT } while ( 0 ) + + /* define this to dump debugging information */ /* #define FT_DEBUG_LEVEL_TRACE */ @@ -154,6 +162,21 @@ typedef ptrdiff_t FT_PtrDist; va_end( ap ); } + + /* empty function useful for setting a breakpoint to catch errors */ + int + FT_Throw( int error, + int line, + const char* file ) + { + FT_UNUSED( error ); + FT_UNUSED( line ); + FT_UNUSED( file ); + + return 0; + } + + /* we don't handle tracing levels in stand-alone mode; */ #ifndef FT_TRACE5 #define FT_TRACE5( varformat ) FT_Message varformat @@ -165,11 +188,19 @@ typedef ptrdiff_t FT_PtrDist; #define FT_ERROR( varformat ) FT_Message varformat #endif +#define FT_THROW( e ) \ + ( FT_Throw( FT_ERR_CAT( ErrRaster, e ), \ + __LINE__, \ + __FILE__ ) | \ + FT_ERR_CAT( ErrRaster, e ) ) + #else /* !FT_DEBUG_LEVEL_TRACE */ #define FT_TRACE5( x ) do { } while ( 0 ) /* nothing */ #define FT_TRACE7( x ) do { } while ( 0 ) /* nothing */ #define FT_ERROR( x ) do { } while ( 0 ) /* nothing */ +#define FT_THROW( e ) FT_ERR_CAT( ErrRaster_, e ) + #endif /* !FT_DEBUG_LEVEL_TRACE */ @@ -202,6 +233,7 @@ typedef ptrdiff_t FT_PtrDist; raster_done_ \ }; + #else /* !_STANDALONE_ */ @@ -215,13 +247,14 @@ typedef ptrdiff_t FT_PtrDist; #include "ftspic.h" -#define ErrRaster_Invalid_Mode Smooth_Err_Cannot_Render_Glyph -#define ErrRaster_Invalid_Outline Smooth_Err_Invalid_Outline +#define Smooth_Err_Invalid_Mode Smooth_Err_Cannot_Render_Glyph +#define Smooth_Err_Memory_Overflow Smooth_Err_Out_Of_Memory #define ErrRaster_Memory_Overflow Smooth_Err_Out_Of_Memory -#define ErrRaster_Invalid_Argument Smooth_Err_Invalid_Argument + #endif /* !_STANDALONE_ */ + #ifndef FT_MEM_SET #define FT_MEM_SET( d, s, c ) ft_memset( d, s, c ) #endif @@ -280,6 +313,40 @@ typedef ptrdiff_t FT_PtrDist; #endif + /* Compute `dividend / divisor' and return both its quotient and */ + /* remainder, cast to a specific type. This macro also ensures that */ + /* the remainder is always positive. */ +#define FT_DIV_MOD( type, dividend, divisor, quotient, remainder ) \ + FT_BEGIN_STMNT \ + (quotient) = (type)( (dividend) / (divisor) ); \ + (remainder) = (type)( (dividend) % (divisor) ); \ + if ( (remainder) < 0 ) \ + { \ + (quotient)--; \ + (remainder) += (type)(divisor); \ + } \ + FT_END_STMNT + +#ifdef __arm__ + /* Work around a bug specific to GCC which make the compiler fail to */ + /* optimize a division and modulo operation on the same parameters */ + /* into a single call to `__aeabi_idivmod'. See */ + /* */ + /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43721 */ +#undef FT_DIV_MOD +#define FT_DIV_MOD( type, dividend, divisor, quotient, remainder ) \ + FT_BEGIN_STMNT \ + (quotient) = (type)( (dividend) / (divisor) ); \ + (remainder) = (type)( (dividend) - (quotient) * (divisor) ); \ + if ( (remainder) < 0 ) \ + { \ + (quotient)--; \ + (remainder) += (type)(divisor); \ + } \ + FT_END_STMNT +#endif /* __arm__ */ + + /*************************************************************************/ /* */ /* TYPE DEFINITIONS */ @@ -312,7 +379,7 @@ typedef ptrdiff_t FT_PtrDist; #endif /* PIXEL_BITS >= 8 */ - /* maximal number of gray spans in a call to the span callback */ + /* maximum number of gray spans in a call to the span callback */ #define FT_MAX_GRAY_SPANS 32 @@ -328,8 +395,18 @@ typedef ptrdiff_t FT_PtrDist; } TCell; +#if defined( _MSC_VER ) /* Visual C++ (and Intel C++) */ + /* We disable the warning `structure was padded due to */ + /* __declspec(align())' in order to compile cleanly with */ + /* the maximum level of warnings. */ +#pragma warning( push ) +#pragma warning( disable : 4324 ) +#endif /* _MSC_VER */ + typedef struct gray_TWorker_ { + ft_jmp_buf jump_buffer; + TCoord ex, ey; TPos min_ex, max_ex; TPos min_ey, max_ey; @@ -365,8 +442,6 @@ typedef ptrdiff_t FT_PtrDist; int band_size; int band_shoot; - ft_jmp_buf jump_buffer; - void* buffer; long buffer_size; @@ -375,6 +450,10 @@ typedef ptrdiff_t FT_PtrDist; } gray_TWorker, *gray_PWorker; +#if defined( _MSC_VER ) +#pragma warning( pop ) +#endif + #ifndef FT_STATIC_RASTER #define ras (*worker) @@ -506,7 +585,7 @@ typedef ptrdiff_t FT_PtrDist; static void gray_record_cell( RAS_ARG ) { - if ( !ras.invalid && ( ras.area | ras.cover ) ) + if ( ras.area | ras.cover ) { PCell cell = gray_find_cell( RAS_VAR ); @@ -555,10 +634,10 @@ typedef ptrdiff_t FT_PtrDist; ras.area = 0; ras.cover = 0; + ras.ex = ex; + ras.ey = ey; } - ras.ex = ex; - ras.ey = ey; ras.invalid = ( (unsigned)ey >= (unsigned)ras.count_ey || ex >= ras.count_ex ); } @@ -600,7 +679,7 @@ typedef ptrdiff_t FT_PtrDist; TPos x2, TCoord y2 ) { - TCoord ex1, ex2, fx1, fx2, delta, mod, lift, rem; + TCoord ex1, ex2, fx1, fx2, delta, mod; long p, first, dx; int incr; @@ -644,13 +723,7 @@ typedef ptrdiff_t FT_PtrDist; dx = -dx; } - delta = (TCoord)( p / dx ); - mod = (TCoord)( p % dx ); - if ( mod < 0 ) - { - delta--; - mod += (TCoord)dx; - } + FT_DIV_MOD( TCoord, p, dx, delta, mod ); ras.area += (TArea)(( fx1 + first ) * delta); ras.cover += delta; @@ -661,14 +734,11 @@ typedef ptrdiff_t FT_PtrDist; if ( ex1 != ex2 ) { - p = ONE_PIXEL * ( y2 - y1 + delta ); - lift = (TCoord)( p / dx ); - rem = (TCoord)( p % dx ); - if ( rem < 0 ) - { - lift--; - rem += (TCoord)dx; - } + TCoord lift, rem; + + + p = ONE_PIXEL * ( y2 - y1 + delta ); + FT_DIV_MOD( TCoord, p, dx, lift, rem ); mod -= (int)dx; @@ -718,9 +788,6 @@ typedef ptrdiff_t FT_PtrDist; dx = to_x - ras.x; dy = to_y - ras.y; - /* XXX: we should do something about the trivial case where dx == 0, */ - /* as it happens very often! */ - /* perform vertical clipping */ { TCoord min, max; @@ -799,13 +866,7 @@ typedef ptrdiff_t FT_PtrDist; dy = -dy; } - delta = (int)( p / dy ); - mod = (int)( p % dy ); - if ( mod < 0 ) - { - delta--; - mod += (TCoord)dy; - } + FT_DIV_MOD( int, p, dy, delta, mod ); x = ras.x + delta; gray_render_scanline( RAS_VAR_ ey1, ras.x, fy1, x, (TCoord)first ); @@ -816,13 +877,7 @@ typedef ptrdiff_t FT_PtrDist; if ( ey1 != ey2 ) { p = ONE_PIXEL * dx; - lift = (int)( p / dy ); - rem = (int)( p % dy ); - if ( rem < 0 ) - { - lift--; - rem += (int)dy; - } + FT_DIV_MOD( int, p, dy, lift, rem ); mod -= (int)dy; while ( ey1 != ey2 ) @@ -1036,37 +1091,10 @@ typedef ptrdiff_t FT_PtrDist; /* dx and dy are x and y components of the P0-P3 chord vector. */ - dx = arc[3].x - arc[0].x; - dy = arc[3].y - arc[0].y; - - /* L is an (under)estimate of the Euclidean distance P0-P3. */ - /* */ - /* If dx >= dy, then r = sqrt(dx^2 + dy^2) can be overestimated */ - /* with least maximum error by */ - /* */ - /* r_upperbound = dx + (sqrt(2) - 1) * dy , */ - /* */ - /* where sqrt(2) - 1 can be (over)estimated by 107/256, giving an */ - /* error of no more than 8.4%. */ - /* */ - /* Similarly, some elementary calculus shows that r can be */ - /* underestimated with least maximum error by */ - /* */ - /* r_lowerbound = sqrt(2 + sqrt(2)) / 2 * dx */ - /* + sqrt(2 - sqrt(2)) / 2 * dy . */ - /* */ - /* 236/256 and 97/256 are (under)estimates of the two algebraic */ - /* numbers, giving an error of no more than 8.1%. */ - - dx_ = FT_ABS( dx ); - dy_ = FT_ABS( dy ); - - /* This is the same as */ - /* */ - /* L = ( 236 * FT_MAX( dx_, dy_ ) */ - /* + 97 * FT_MIN( dx_, dy_ ) ) >> 8; */ - L = ( dx_ > dy_ ? 236 * dx_ + 97 * dy_ - : 97 * dx_ + 236 * dy_ ) >> 8; + dx = dx_ = arc[3].x - arc[0].x; + dy = dy_ = arc[3].y - arc[0].y; + + L = FT_HYPOT( dx_, dy_ ); /* Avoid possible arithmetic overflow below by splitting. */ if ( L > 32767 ) @@ -1091,11 +1119,11 @@ typedef ptrdiff_t FT_PtrDist; if ( s > s_limit ) goto Split; - /* If P1 or P2 is outside P0-P3, split the curve. */ - if ( dy * dy1 + dx * dx1 < 0 || - dy * dy2 + dx * dx2 < 0 || - dy * (arc[3].y - arc[1].y) + dx * (arc[3].x - arc[1].x) < 0 || - dy * (arc[3].y - arc[2].y) + dx * (arc[3].x - arc[2].x) < 0 ) + /* Split super curvy segments where the off points are so far + from the chord that the angles P0-P1-P3 or P0-P2-P3 become + acute as detected by appropriate dot products. */ + if ( dx1 * ( dx1 - dx ) + dy1 * ( dy1 - dy ) > 0 || + dx2 * ( dx2 - dx ) + dy2 * ( dy2 - dy ) > 0 ) goto Split; /* No reason to split. */ @@ -1126,7 +1154,8 @@ typedef ptrdiff_t FT_PtrDist; /* record current cell, if any */ - gray_record_cell( RAS_VAR ); + if ( !ras.invalid ) + gray_record_cell( RAS_VAR ); /* start to a new position */ x = UPSCALE( to->x ); @@ -1227,9 +1256,7 @@ typedef ptrdiff_t FT_PtrDist; TPos area, TCoord acount ) { - FT_Span* span; - int count; - int coverage; + int coverage; /* compute the coverage line's coverage, depending on the */ @@ -1271,6 +1298,10 @@ typedef ptrdiff_t FT_PtrDist; if ( coverage ) { + FT_Span* span; + int count; + + /* see whether we can add this span to the current list */ count = ras.num_gray_spans; span = ras.gray_spans + count - 1; @@ -1309,7 +1340,6 @@ typedef ptrdiff_t FT_PtrDist; ras.num_gray_spans = 0; ras.span_y = (int)y; - count = 0; span = ras.gray_spans; } else @@ -1400,7 +1430,26 @@ typedef ptrdiff_t FT_PtrDist; ras.render_span( ras.span_y, ras.num_gray_spans, ras.gray_spans, ras.render_span_data ); +#ifdef FT_DEBUG_LEVEL_TRACE + + if ( ras.num_gray_spans > 0 ) + { + FT_Span* span; + int n; + + + FT_TRACE7(( "y = %3d ", ras.span_y )); + span = ras.gray_spans; + for ( n = 0; n < ras.num_gray_spans; n++, span++ ) + FT_TRACE7(( "[%d..%d]:%02x ", + span->x, span->x + span->len - 1, span->coverage )); + FT_TRACE7(( "\n" )); + } + FT_TRACE7(( "gray_sweep: end\n" )); + +#endif /* FT_DEBUG_LEVEL_TRACE */ + } @@ -1466,8 +1515,11 @@ typedef ptrdiff_t FT_PtrDist; TPos delta; - if ( !outline || !func_interface ) - return ErrRaster_Invalid_Argument; + if ( !outline ) + return FT_THROW( Invalid_Outline ); + + if ( !func_interface ) + return FT_THROW( Invalid_Argument ); shift = func_interface->shift; delta = func_interface->delta; @@ -1680,7 +1732,7 @@ typedef ptrdiff_t FT_PtrDist; return error; Invalid_Outline: - return ErrRaster_Invalid_Outline; + return FT_THROW( Invalid_Outline ); } #endif /* _STANDALONE_ */ @@ -1715,10 +1767,11 @@ typedef ptrdiff_t FT_PtrDist; if ( ft_setjmp( ras.jump_buffer ) == 0 ) { error = FT_Outline_Decompose( &ras.outline, &func_interface, &ras ); - gray_record_cell( RAS_VAR ); + if ( !ras.invalid ) + gray_record_cell( RAS_VAR ); } else - error = ErrRaster_Memory_Overflow; + error = FT_THROW( Memory_Overflow ); return error; } @@ -1871,21 +1924,21 @@ typedef ptrdiff_t FT_PtrDist; if ( !raster || !raster->buffer || !raster->buffer_size ) - return ErrRaster_Invalid_Argument; + return FT_THROW( Invalid_Argument ); if ( !outline ) - return ErrRaster_Invalid_Outline; + return FT_THROW( Invalid_Outline ); /* return immediately if the outline is empty */ if ( outline->n_points == 0 || outline->n_contours <= 0 ) return 0; if ( !outline->contours || !outline->points ) - return ErrRaster_Invalid_Outline; + return FT_THROW( Invalid_Outline ); if ( outline->n_points != outline->contours[outline->n_contours - 1] + 1 ) - return ErrRaster_Invalid_Outline; + return FT_THROW( Invalid_Outline ); worker = raster->worker; @@ -1893,19 +1946,19 @@ typedef ptrdiff_t FT_PtrDist; if ( !( params->flags & FT_RASTER_FLAG_DIRECT ) ) { if ( !target_map ) - return ErrRaster_Invalid_Argument; + return FT_THROW( Invalid_Argument ); /* nothing to do */ if ( !target_map->width || !target_map->rows ) return 0; if ( !target_map->buffer ) - return ErrRaster_Invalid_Argument; + return FT_THROW( Invalid_Argument ); } /* this version does not support monochrome rendering */ if ( !( params->flags & FT_RASTER_FLAG_AA ) ) - return ErrRaster_Invalid_Mode; + return FT_THROW( Invalid_Mode ); /* compute clipping box */ if ( !( params->flags & FT_RASTER_FLAG_DIRECT ) ) @@ -2047,12 +2100,26 @@ typedef ptrdiff_t FT_PtrDist; } + static int + gray_raster_set_mode( FT_Raster raster, + unsigned long mode, + void* args ) + { + FT_UNUSED( raster ); + FT_UNUSED( mode ); + FT_UNUSED( args ); + + + return 0; /* nothing to do */ + } + + FT_DEFINE_RASTER_FUNCS(ft_grays_raster, FT_GLYPH_FORMAT_OUTLINE, (FT_Raster_New_Func) gray_raster_new, (FT_Raster_Reset_Func) gray_raster_reset, - (FT_Raster_Set_Mode_Func)0, + (FT_Raster_Set_Mode_Func)gray_raster_set_mode, (FT_Raster_Render_Func) gray_raster_render, (FT_Raster_Done_Func) gray_raster_done ) diff --git a/src/smooth/ftsmooth.c b/src/smooth/ftsmooth.c index 00499cc..4e2dee5 100644 --- a/src/smooth/ftsmooth.c +++ b/src/smooth/ftsmooth.c @@ -4,7 +4,7 @@ /* */ /* Anti-aliasing renderer interface (body). */ /* */ -/* Copyright 2000-2006, 2009-2012 by */ +/* Copyright 2000-2006, 2009-2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -61,12 +61,12 @@ const FT_Matrix* matrix, const FT_Vector* delta ) { - FT_Error error = Smooth_Err_Ok; + FT_Error error = FT_Err_Ok; if ( slot->format != render->glyph_format ) { - error = Smooth_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Exit; } @@ -103,97 +103,79 @@ FT_Render_Mode required_mode ) { FT_Error error; - FT_Outline* outline = NULL; + FT_Outline* outline = &slot->outline; + FT_Bitmap* bitmap = &slot->bitmap; + FT_Memory memory = render->root.memory; FT_BBox cbox; + FT_Pos x_shift = 0; + FT_Pos y_shift = 0; + FT_Pos x_left, y_top; FT_Pos width, height, pitch; #ifndef FT_CONFIG_OPTION_SUBPIXEL_RENDERING FT_Pos height_org, width_org; #endif - FT_Bitmap* bitmap; - FT_Memory memory; - FT_Int hmul = mode == FT_RENDER_MODE_LCD; - FT_Int vmul = mode == FT_RENDER_MODE_LCD_V; - FT_Pos x_shift, y_shift, x_left, y_top; + FT_Int hmul = mode == FT_RENDER_MODE_LCD; + FT_Int vmul = mode == FT_RENDER_MODE_LCD_V; FT_Raster_Params params; + FT_Bool have_outline_shifted = FALSE; + FT_Bool have_buffer = FALSE; + /* check glyph image format */ if ( slot->format != render->glyph_format ) { - error = Smooth_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Exit; } /* check mode */ if ( mode != required_mode ) - return Smooth_Err_Cannot_Render_Glyph; - - outline = &slot->outline; + { + error = FT_THROW( Cannot_Render_Glyph ); + goto Exit; + } - /* translate the outline to the new origin if needed */ if ( origin ) - FT_Outline_Translate( outline, origin->x, origin->y ); + { + x_shift = origin->x; + y_shift = origin->y; + } /* compute the control box, and grid fit it */ + /* taking into account the origin shift */ FT_Outline_Get_CBox( outline, &cbox ); - cbox.xMin = FT_PIX_FLOOR( cbox.xMin ); - cbox.yMin = FT_PIX_FLOOR( cbox.yMin ); - cbox.xMax = FT_PIX_CEIL( cbox.xMax ); - cbox.yMax = FT_PIX_CEIL( cbox.yMax ); + cbox.xMin = FT_PIX_FLOOR( cbox.xMin + x_shift ); + cbox.yMin = FT_PIX_FLOOR( cbox.yMin + y_shift ); + cbox.xMax = FT_PIX_CEIL( cbox.xMax + x_shift ); + cbox.yMax = FT_PIX_CEIL( cbox.yMax + y_shift ); - if ( cbox.xMin < 0 && cbox.xMax > FT_INT_MAX + cbox.xMin ) - { - FT_ERROR(( "ft_smooth_render_generic: glyph too large:" - " xMin = %d, xMax = %d\n", - cbox.xMin >> 6, cbox.xMax >> 6 )); - return Smooth_Err_Raster_Overflow; - } - else - width = ( cbox.xMax - cbox.xMin ) >> 6; + x_shift -= cbox.xMin; + y_shift -= cbox.yMin; - if ( cbox.yMin < 0 && cbox.yMax > FT_INT_MAX + cbox.yMin ) - { - FT_ERROR(( "ft_smooth_render_generic: glyph too large:" - " yMin = %d, yMax = %d\n", - cbox.yMin >> 6, cbox.yMax >> 6 )); - return Smooth_Err_Raster_Overflow; - } - else - height = ( cbox.yMax - cbox.yMin ) >> 6; + x_left = cbox.xMin >> 6; + y_top = cbox.yMax >> 6; - bitmap = &slot->bitmap; - memory = render->root.memory; + width = (FT_ULong)( cbox.xMax - cbox.xMin ) >> 6; + height = (FT_ULong)( cbox.yMax - cbox.yMin ) >> 6; #ifndef FT_CONFIG_OPTION_SUBPIXEL_RENDERING width_org = width; height_org = height; #endif - /* release old bitmap buffer */ - if ( slot->internal->flags & FT_GLYPH_OWN_BITMAP ) - { - FT_FREE( bitmap->buffer ); - slot->internal->flags &= ~FT_GLYPH_OWN_BITMAP; - } - - /* allocate new one */ pitch = width; if ( hmul ) { - width = width * 3; - pitch = FT_PAD_CEIL( width, 4 ); + width *= 3; + pitch = FT_PAD_CEIL( width, 4 ); } if ( vmul ) height *= 3; - x_shift = (FT_Int) cbox.xMin; - y_shift = (FT_Int) cbox.yMin; - x_left = (FT_Int)( cbox.xMin >> 6 ); - y_top = (FT_Int)( cbox.yMax >> 6 ); - #ifdef FT_CONFIG_OPTION_SUBPIXEL_RENDERING if ( slot->library->lcd_filter_func ) @@ -203,34 +185,61 @@ if ( hmul ) { - x_shift -= 64 * ( extra >> 1 ); + x_shift += 64 * ( extra >> 1 ); + x_left -= extra >> 1; width += 3 * extra; pitch = FT_PAD_CEIL( width, 4 ); - x_left -= extra >> 1; } if ( vmul ) { - y_shift -= 64 * ( extra >> 1 ); - height += 3 * extra; + y_shift += 64 * ( extra >> 1 ); y_top += extra >> 1; + height += 3 * extra; } } #endif -#if FT_UINT_MAX > 0xFFFFU + /* + * XXX: on 16bit system, we return an error for huge bitmap + * to prevent an overflow. + */ + if ( x_left > FT_INT_MAX || y_top > FT_INT_MAX || + x_left < FT_INT_MIN || y_top < FT_INT_MIN ) + { + error = FT_THROW( Invalid_Pixel_Size ); + goto Exit; + } - /* Required check is ( pitch * height < FT_ULONG_MAX ), */ - /* but we care realistic cases only. Always pitch <= width. */ + /* Required check is (pitch * height < FT_ULONG_MAX), */ + /* but we care realistic cases only. Always pitch <= width. */ if ( width > 0x7FFF || height > 0x7FFF ) { FT_ERROR(( "ft_smooth_render_generic: glyph too large: %u x %u\n", width, height )); - return Smooth_Err_Raster_Overflow; + error = FT_THROW( Raster_Overflow ); + goto Exit; } -#endif + /* release old bitmap buffer */ + if ( slot->internal->flags & FT_GLYPH_OWN_BITMAP ) + { + FT_FREE( bitmap->buffer ); + slot->internal->flags &= ~FT_GLYPH_OWN_BITMAP; + } + + /* allocate new one */ + if ( FT_ALLOC( bitmap->buffer, (FT_ULong)pitch * height ) ) + goto Exit; + else + have_buffer = TRUE; + + slot->internal->flags |= FT_GLYPH_OWN_BITMAP; + + slot->format = FT_GLYPH_FORMAT_BITMAP; + slot->bitmap_left = (FT_Int)x_left; + slot->bitmap_top = (FT_Int)y_top; bitmap->pixel_mode = FT_PIXEL_MODE_GRAY; bitmap->num_grays = 256; @@ -239,12 +248,11 @@ bitmap->pitch = pitch; /* translate outline to render it into the bitmap */ - FT_Outline_Translate( outline, -x_shift, -y_shift ); - - if ( FT_ALLOC( bitmap->buffer, (FT_ULong)pitch * height ) ) - goto Exit; - - slot->internal->flags |= FT_GLYPH_OWN_BITMAP; + if ( x_shift || y_shift ) + { + FT_Outline_Translate( outline, x_shift, y_shift ); + have_outline_shifted = TRUE; + } /* set up parameters */ params.target = bitmap; @@ -288,6 +296,9 @@ vec->y /= 3; } + if ( error ) + goto Exit; + if ( slot->library->lcd_filter_func ) slot->library->lcd_filter_func( bitmap, mode, slot->library ); @@ -295,6 +306,8 @@ /* render outline into bitmap */ error = render->raster_render( render->raster, ¶ms ); + if ( error ) + goto Exit; /* expand it horizontally */ if ( hmul ) @@ -346,25 +359,19 @@ #endif /* !FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ - FT_Outline_Translate( outline, x_shift, y_shift ); + /* everything is fine; don't deallocate buffer */ + have_buffer = FALSE; - /* - * XXX: on 16bit system, we return an error for huge bitmap - * to prevent an overflow. - */ - if ( x_left > FT_INT_MAX || y_top > FT_INT_MAX ) - return Smooth_Err_Invalid_Pixel_Size; - - if ( error ) - goto Exit; - - slot->format = FT_GLYPH_FORMAT_BITMAP; - slot->bitmap_left = (FT_Int)x_left; - slot->bitmap_top = (FT_Int)y_top; + error = FT_Err_Ok; Exit: - if ( outline && origin ) - FT_Outline_Translate( outline, -origin->x, -origin->y ); + if ( have_outline_shifted ) + FT_Outline_Translate( outline, -x_shift, -y_shift ); + if ( have_buffer ) + { + FT_FREE( bitmap->buffer ); + slot->internal->flags &= ~FT_GLYPH_OWN_BITMAP; + } return error; } diff --git a/src/smooth/ftspic.c b/src/smooth/ftspic.c index 601bcf9..67a2b83 100644 --- a/src/smooth/ftspic.c +++ b/src/smooth/ftspic.c @@ -4,7 +4,7 @@ /* */ /* The FreeType position independent code services for smooth module. */ /* */ -/* Copyright 2009, 2010 by */ +/* Copyright 2009, 2010, 2012, 2013 by */ /* Oran Agra and Mickey Gabel. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -22,17 +22,19 @@ #include "ftspic.h" #include "ftsmerrs.h" + #ifdef FT_CONFIG_OPTION_PIC /* forward declaration of PIC init functions from ftgrays.c */ void FT_Init_Class_ft_grays_raster( FT_Raster_Funcs* funcs ); + void ft_smooth_renderer_class_pic_free( FT_Library library ) { FT_PIC_Container* pic_container = &library->pic_container; - FT_Memory memory = library->memory; + FT_Memory memory = library->memory; if ( pic_container->smooth ) @@ -42,6 +44,7 @@ if ( --container->ref_count ) return; + FT_FREE( container ); pic_container->smooth = NULL; } @@ -52,8 +55,8 @@ ft_smooth_renderer_class_pic_init( FT_Library library ) { FT_PIC_Container* pic_container = &library->pic_container; - FT_Error error = Smooth_Err_Ok; - SmoothPIC* container; + FT_Error error = FT_Err_Ok; + SmoothPIC* container = NULL; FT_Memory memory = library->memory; @@ -66,37 +69,45 @@ } /* allocate pointer, clear and set global container pointer */ - if ( FT_ALLOC ( container, sizeof ( *container ) ) ) + if ( FT_ALLOC( container, sizeof ( *container ) ) ) return error; FT_MEM_SET( container, 0, sizeof ( *container ) ); pic_container->smooth = container; + container->ref_count = 1; - /* initialize pointer table - this is how the module usually expects this data */ + /* initialize pointer table - */ + /* this is how the module usually expects this data */ FT_Init_Class_ft_grays_raster( &container->ft_grays_raster ); -/*Exit:*/ - if ( error ) - ft_smooth_renderer_class_pic_free( library ); + return error; } + /* re-route these init and free functions to the above functions */ - FT_Error ft_smooth_lcd_renderer_class_pic_init( FT_Library library ) + FT_Error + ft_smooth_lcd_renderer_class_pic_init( FT_Library library ) { return ft_smooth_renderer_class_pic_init( library ); } - void ft_smooth_lcd_renderer_class_pic_free( FT_Library library ) + + void + ft_smooth_lcd_renderer_class_pic_free( FT_Library library ) { ft_smooth_renderer_class_pic_free( library ); } - FT_Error ft_smooth_lcdv_renderer_class_pic_init( FT_Library library ) + + FT_Error + ft_smooth_lcdv_renderer_class_pic_init( FT_Library library ) { return ft_smooth_renderer_class_pic_init( library ); } - void ft_smooth_lcdv_renderer_class_pic_free( FT_Library library ) + + void + ft_smooth_lcdv_renderer_class_pic_free( FT_Library library ) { ft_smooth_renderer_class_pic_free( library ); } diff --git a/src/smooth/ftspic.h b/src/smooth/ftspic.h index 4686f5e..334b51c 100644 --- a/src/smooth/ftspic.h +++ b/src/smooth/ftspic.h @@ -25,18 +25,23 @@ FT_BEGIN_HEADER #include FT_INTERNAL_PIC_H #ifndef FT_CONFIG_OPTION_PIC -#define FT_GRAYS_RASTER_GET ft_grays_raster + +#define FT_GRAYS_RASTER_GET ft_grays_raster #else /* FT_CONFIG_OPTION_PIC */ - typedef struct SmoothPIC_ + typedef struct SmoothPIC_ { - int ref_count; - FT_Raster_Funcs ft_grays_raster; + int ref_count; + FT_Raster_Funcs ft_grays_raster; + } SmoothPIC; -#define GET_PIC(lib) ((SmoothPIC*)((lib)->pic_container.smooth)) -#define FT_GRAYS_RASTER_GET (GET_PIC(library)->ft_grays_raster) + +#define GET_PIC( lib ) \ + ( (SmoothPIC*)( (lib)->pic_container.smooth ) ) +#define FT_GRAYS_RASTER_GET ( GET_PIC( library )->ft_grays_raster ) + /* see ftspic.c for the implementation */ void diff --git a/src/tools/afblue.pl b/src/tools/afblue.pl new file mode 100644 index 0000000..60fe696 --- /dev/null +++ b/src/tools/afblue.pl @@ -0,0 +1,548 @@ +#! /usr/bin/perl -w +# -*- Perl -*- +# +# afblue.pl +# +# Process a blue zone character data file. +# +# Copyright 2013, 2014 by +# David Turner, Robert Wilhelm, and Werner Lemberg. +# +# This file is part of the FreeType project, and may only be used, +# modified, and distributed under the terms of the FreeType project +# license, LICENSE.TXT. By continuing to use, modify, or distribute +# this file you indicate that you have read the license and +# understand and accept it fully. + +use strict; +use warnings; +use English '-no_match_vars'; +use open ':std', ':encoding(UTF-8)'; + + +my $prog = $PROGRAM_NAME; +$prog =~ s| .* / ||x; # Remove path. + +die "usage: $prog datafile < infile > outfile\n" if $#ARGV != 0; + + +my $datafile = $ARGV[0]; + +my %diversions; # The extracted and massaged data from `datafile'. +my @else_stack; # Booleans to track else-clauses. +my @name_stack; # Stack of integers used for names of aux. variables. + +my $curr_enum; # Name of the current enumeration. +my $curr_array; # Name of the current array. +my $curr_max; # Name of the current maximum value. + +my $curr_enum_element; # Name of the current enumeration element. +my $curr_offset; # The offset relative to current aux. variable. +my $curr_elem_size; # The size of the current string or block. + +my $have_sections = 0; # Boolean; set if start of a section has been seen. +my $have_strings; # Boolean; set if current section contains strings. +my $have_blocks; # Boolean; set if current section contains blocks. + +my $have_enum_element; # Boolean; set if we have an enumeration element. +my $in_string; # Boolean; set if a string has been parsed. + +my $num_sections = 0; # Number of sections seen so far. + +my $last_aux; # Name of last auxiliary variable. + + +# Regular expressions. + +# [<ws>] <enum_name> <ws> <array_name> <ws> <max_name> [<ws>] ':' [<ws>] '\n' +my $section_re = qr/ ^ \s* (\S+) \s+ (\S+) \s+ (\S+) \s* : \s* $ /x; + +# [<ws>] <enum_element_name> [<ws>] '\n' +my $enum_element_re = qr/ ^ \s* ( [A-Za-z0-9_]+ ) \s* $ /x; + +# '#' <preprocessor directive> '\n' +my $preprocessor_re = qr/ ^ \# /x; + +# [<ws>] '/' '/' <comment> '\n' +my $comment_re = qr| ^ \s* // |x; + +# empty line +my $whitespace_only_re = qr/ ^ \s* $ /x; + +# [<ws>] '"' <string> '"' [<ws>] '\n' (<string> doesn't contain newlines) +my $string_re = qr/ ^ \s* + " ( (?> (?: (?> [^"\\]+ ) | \\. )* ) ) " + \s* $ /x; + +# [<ws>] '{' <block> '}' [<ws>] '\n' (<block> can contain newlines) +my $block_start_re = qr/ ^ \s* \{ /x; + +# We need the capturing group for `split' to make it return the separator +# tokens (i.e., the opening and closing brace) also. +my $brace_re = qr/ ( [{}] ) /x; + + +sub Warn +{ + my $message = shift; + warn "$datafile:$INPUT_LINE_NUMBER: warning: $message\n"; +} + + +sub Die +{ + my $message = shift; + die "$datafile:$INPUT_LINE_NUMBER: error: $message\n"; +} + + +my $warned_before = 0; + +sub warn_before +{ + Warn("data before first section gets ignored") unless $warned_before; + $warned_before = 1; +} + + +sub strip_newline +{ + chomp; + s/ \x0D $ //x; +} + + +sub end_curr_string +{ + # Append final null byte to string. + if ($have_strings) + { + push @{$diversions{$curr_array}}, " '\\0',\n" if $in_string; + + $curr_offset++; + $in_string = 0; + } +} + + +sub update_max_elem_size +{ + if ($curr_elem_size) + { + my $max = pop @{$diversions{$curr_max}}; + $max = $curr_elem_size if $curr_elem_size > $max; + push @{$diversions{$curr_max}}, $max; + } +} + + +sub convert_non_ascii_char +{ + # A UTF-8 character outside of the printable ASCII range, with possibly a + # leading backslash character. + my $s = shift; + + # Here we count characters, not bytes. + $curr_elem_size += length $s; + + utf8::encode($s); + $s = uc unpack 'H*', $s; + + $curr_offset += $s =~ s/\G(..)/'\\x$1', /sg; + + return $s; +} + + +sub convert_ascii_chars +{ + # A series of ASCII characters in the printable range. + my $s = shift; + + # We ignore spaces. + $s =~ s/ //g; + + my $count = $s =~ s/\G(.)/'$1', /g; + $curr_offset += $count; + $curr_elem_size += $count; + + return $s; +} + + +sub convert_literal +{ + my $s = shift; + my $orig = $s; + + # ASCII printables and space + my $safe_re = '\x20-\x7E'; + # ASCII printables and space, no backslash + my $safe_no_backslash_re = '\x20-\x5B\x5D-\x7E'; + + $s =~ s{ + (?: \\? ( [^$safe_re] ) + | ( (?: [$safe_no_backslash_re] + | \\ [$safe_re] )+ ) ) + } + { + defined($1) ? convert_non_ascii_char($1) + : convert_ascii_chars($2) + }egx; + + # We assume that `$orig' doesn't contain `*/' + return $s . " /* $orig */"; +} + + +sub aux_name +{ + return "af_blue_" . $num_sections. "_" . join('_', @name_stack); +} + + +sub aux_name_next +{ + $name_stack[$#name_stack]++; + my $name = aux_name(); + $name_stack[$#name_stack]--; + + return $name; +} + + +sub enum_val_string +{ + # Build string that holds code to save the current offset in an + # enumeration element. + my $aux = shift; + + my $add = ($last_aux eq "af_blue_" . $num_sections . "_0" ) + ? "" + : "$last_aux + "; + + return " $aux = $add$curr_offset,\n"; +} + + + +# Process data file. + +open(DATA, $datafile) || die "$prog: can't open \`$datafile': $OS_ERROR\n"; + +while (<DATA>) +{ + strip_newline(); + + next if /$comment_re/; + next if /$whitespace_only_re/; + + if (/$section_re/) + { + Warn("previous section is empty") if ($have_sections + && !$have_strings + && !$have_blocks); + + end_curr_string(); + update_max_elem_size(); + + # Save captured groups from `section_re'. + $curr_enum = $1; + $curr_array = $2; + $curr_max = $3; + + $curr_enum_element = ""; + $curr_offset = 0; + + Warn("overwriting already defined enumeration \`$curr_enum'") + if exists($diversions{$curr_enum}); + Warn("overwriting already defined array \`$curr_array'") + if exists($diversions{$curr_array}); + Warn("overwriting already defined maximum value \`$curr_max'") + if exists($diversions{$curr_max}); + + $diversions{$curr_enum} = []; + $diversions{$curr_array} = []; + $diversions{$curr_max} = []; + + push @{$diversions{$curr_max}}, 0; + + @name_stack = (); + push @name_stack, 0; + + $have_sections = 1; + $have_strings = 0; + $have_blocks = 0; + + $have_enum_element = 0; + $in_string = 0; + + $num_sections++; + $curr_elem_size = 0; + + $last_aux = aux_name(); + + next; + } + + if (/$preprocessor_re/) + { + if ($have_sections) + { + # Having preprocessor conditionals complicates the computation of + # correct offset values. We have to introduce auxiliary enumeration + # elements with the name `af_blue_<s>_<n1>_<n2>_...' that store + # offsets to be used in conditional clauses. `<s>' is the number of + # sections seen so far, `<n1>' is the number of `#if' and `#endif' + # conditionals seen so far in the topmost level, `<n2>' the number of + # `#if' and `#endif' conditionals seen so far one level deeper, etc. + # As a consequence, uneven values are used within a clause, and even + # values after a clause, since the C standard doesn't allow the + # redefinition of an enumeration value. For example, the name + # `af_blue_5_1_6' is used to construct enumeration values in the fifth + # section after the third (second-level) if-clause within the first + # (top-level) if-clause. After the first top-level clause has + # finished, `af_blue_5_2' is used. The current offset is then + # relative to the value stored in the current auxiliary element. + + if (/ ^ \# \s* if /x) + { + push @else_stack, 0; + + $name_stack[$#name_stack]++; + + push @{$diversions{$curr_enum}}, enum_val_string(aux_name()); + $last_aux = aux_name(); + + push @name_stack, 0; + + $curr_offset = 0; + } + elsif (/ ^ \# \s* elif /x) + { + Die("unbalanced #elif") unless @else_stack; + + pop @name_stack; + + push @{$diversions{$curr_enum}}, enum_val_string(aux_name_next()); + $last_aux = aux_name(); + + push @name_stack, 0; + + $curr_offset = 0; + } + elsif (/ ^ \# \s* else /x) + { + my $prev_else = pop @else_stack; + Die("unbalanced #else") unless defined($prev_else); + Die("#else already seen") if $prev_else; + push @else_stack, 1; + + pop @name_stack; + + push @{$diversions{$curr_enum}}, enum_val_string(aux_name_next()); + $last_aux = aux_name(); + + push @name_stack, 0; + + $curr_offset = 0; + } + elsif (/ ^ (\# \s*) endif /x) + { + my $prev_else = pop @else_stack; + Die("unbalanced #endif") unless defined($prev_else); + + pop @name_stack; + + # If there is no else-clause for an if-clause, we add one. This is + # necessary to have correct offsets. + if (!$prev_else) + { + # Use amount of whitespace from `endif'. + push @{$diversions{$curr_enum}}, enum_val_string(aux_name_next()) + . $1 . "else\n"; + $last_aux = aux_name(); + + $curr_offset = 0; + } + + $name_stack[$#name_stack]++; + + push @{$diversions{$curr_enum}}, enum_val_string(aux_name()); + $last_aux = aux_name(); + + $curr_offset = 0; + } + + # Handle (probably continued) preprocessor lines. + CONTINUED_LOOP: + { + do + { + strip_newline(); + + push @{$diversions{$curr_enum}}, $ARG . "\n"; + push @{$diversions{$curr_array}}, $ARG . "\n"; + + last CONTINUED_LOOP unless / \\ $ /x; + + } while (<DATA>); + } + } + else + { + warn_before(); + } + + next; + } + + if (/$enum_element_re/) + { + end_curr_string(); + update_max_elem_size(); + + $curr_enum_element = $1; + $have_enum_element = 1; + $curr_elem_size = 0; + + next; + } + + if (/$string_re/) + { + if ($have_sections) + { + Die("strings and blocks can't be mixed in a section") if $have_blocks; + + # Save captured group from `string_re'. + my $string = $1; + + if ($have_enum_element) + { + push @{$diversions{$curr_enum}}, enum_val_string($curr_enum_element); + $have_enum_element = 0; + } + + $string = convert_literal($string); + + push @{$diversions{$curr_array}}, " $string\n"; + + $have_strings = 1; + $in_string = 1; + } + else + { + warn_before(); + } + + next; + } + + if (/$block_start_re/) + { + if ($have_sections) + { + Die("strings and blocks can't be mixed in a section") if $have_strings; + + my $depth = 0; + my $block = ""; + my $block_end = 0; + + # Count braces while getting the block. + BRACE_LOOP: + { + do + { + strip_newline(); + + foreach my $substring (split(/$brace_re/)) + { + if ($block_end) + { + Die("invalid data after last matching closing brace") + if $substring !~ /$whitespace_only_re/; + } + + $block .= $substring; + + if ($substring eq '{') + { + $depth++; + } + elsif ($substring eq '}') + { + $depth--; + + $block_end = 1 if $depth == 0; + } + } + + # If we are here, we have run out of substrings, so get next line + # or exit. + last BRACE_LOOP if $block_end; + + $block .= "\n"; + + } while (<DATA>); + } + + if ($have_enum_element) + { + push @{$diversions{$curr_enum}}, enum_val_string($curr_enum_element); + $have_enum_element = 0; + } + + push @{$diversions{$curr_array}}, $block . ",\n"; + + $curr_offset++; + $curr_elem_size++; + + $have_blocks = 1; + } + else + { + warn_before(); + } + + next; + } + + # Garbage. We weren't able to parse the data. + Die("syntax error"); +} + +# Finalize data. +end_curr_string(); +update_max_elem_size(); + + +# Filter stdin to stdout, replacing `@...@' templates. + +sub emit_diversion +{ + my $diversion_name = shift; + return (exists($diversions{$1})) ? "@{$diversions{$1}}" + : "@" . $diversion_name . "@"; +} + + +$LIST_SEPARATOR = ''; + +my $s1 = "This file has been generated by the Perl script \`$prog',"; +my $s1len = length $s1; +my $s2 = "using data from file \`$datafile'."; +my $s2len = length $s2; +my $slen = ($s1len > $s2len) ? $s1len : $s2len; + +print "/* " . $s1 . " " x ($slen - $s1len) . " */\n" + . "/* " . $s2 . " " x ($slen - $s2len) . " */\n" + . "\n"; + +while (<STDIN>) +{ + s/ @ ( [A-Za-z0-9_]+? ) @ / emit_diversion($1) /egx; + print; +} + +# EOF diff --git a/src/tools/apinames.c b/src/tools/apinames.c index 3dc6559..c85df72 100644 --- a/src/tools/apinames.c +++ b/src/tools/apinames.c @@ -10,7 +10,7 @@ * accepted if you are using GCC for compilation (and probably by * other compilers too). * - * Author: David Turner, 2005, 2006, 2008-2012 + * Author: David Turner, 2005, 2006, 2008-2013 * * This code is explicitly placed into the public domain. * @@ -22,7 +22,7 @@ #include <ctype.h> #define PROGRAM_NAME "apinames" -#define PROGRAM_VERSION "0.1" +#define PROGRAM_VERSION "0.2" #define LINEBUFF_SIZE 1024 @@ -31,7 +31,8 @@ typedef enum OutputFormat_ OUTPUT_LIST = 0, /* output the list of names, one per line */ OUTPUT_WINDOWS_DEF, /* output a Windows .DEF file for Visual C++ or Mingw */ OUTPUT_BORLAND_DEF, /* output a Windows .DEF file for Borland C++ */ - OUTPUT_WATCOM_LBC /* output a Watcom Linker Command File */ + OUTPUT_WATCOM_LBC, /* output a Watcom Linker Command File */ + OUTPUT_NETWARE_IMP /* output a NetWare ImportFile */ } OutputFormat; @@ -154,8 +155,6 @@ names_dump( FILE* out, case OUTPUT_WATCOM_LBC: { - /* we must omit the .dll suffix from the library name */ - char temp[512]; const char* dot; @@ -166,10 +165,12 @@ names_dump( FILE* out, exit( 4 ); } + /* we must omit the .dll suffix from the library name */ dot = strchr( dll_name, '.' ); if ( dot != NULL ) { - int len = dot - dll_name; + char temp[512]; + int len = dot - dll_name; if ( len > (int)( sizeof ( temp ) - 1 ) ) @@ -187,6 +188,16 @@ names_dump( FILE* out, } break; + case OUTPUT_NETWARE_IMP: + { + if ( dll_name != NULL ) + fprintf( out, " (%s)\n", dll_name ); + for ( nn = 0; nn < num_names - 1; nn++ ) + fprintf( out, " %s,\n", the_names[nn].name ); + fprintf( out, " %s\n", the_names[num_names - 1].name ); + } + break; + default: /* LIST */ for ( nn = 0; nn < num_names; nn++ ) fprintf( out, "%s\n", the_names[nn].name ); @@ -311,6 +322,7 @@ usage( void ) " -w : output .DEF file for Visual C++ and Mingw\n" " -wB : output .DEF file for Borland C++\n" " -wW : output Watcom Linker Response File\n" + " -wN : output NetWare Import File\n" "\n"; fprintf( stderr, @@ -394,6 +406,10 @@ int main( int argc, const char* const* argv ) format = OUTPUT_WATCOM_LBC; break; + case 'N': + format = OUTPUT_NETWARE_IMP; + break; + case 0: break; diff --git a/src/tools/chktrcmp.py b/src/tools/chktrcmp.py index d0f342e..ce6500c 100755 --- a/src/tools/chktrcmp.py +++ b/src/tools/chktrcmp.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # # Check trace components in FreeType 2 source. -# Author: suzuki toshiya, 2009 +# Author: suzuki toshiya, 2009, 2013 # # This code is explicitly into the public domain. @@ -15,7 +15,7 @@ USED_COMPONENT = {} KNOWN_COMPONENT = {} SRC_FILE_DIRS = [ "src" ] -TRACE_DEF_FILES = [ "include/freetype/internal/fttrace.h" ] +TRACE_DEF_FILES = [ "include/internal/fttrace.h" ] # -------------------------------------------------------------- diff --git a/src/tools/cordic.py b/src/tools/cordic.py index 3f80c5f..6742c90 100644 --- a/src/tools/cordic.py +++ b/src/tools/cordic.py @@ -2,65 +2,20 @@ import sys, math #units = 64*65536.0 # don't change !! -units = 256 +units = 180 * 2**16 scale = units/math.pi shrink = 1.0 comma = "" -def calc_val( x ): - global units, shrink - angle = math.atan(x) - shrink = shrink * math.cos(angle) - return angle/math.pi * units - -def print_val( n, x ): - global comma - - lo = int(x) - hi = lo + 1 - alo = math.atan(lo) - ahi = math.atan(hi) - ax = math.atan(2.0**n) - - errlo = abs( alo - ax ) - errhi = abs( ahi - ax ) - - if ( errlo < errhi ): - hi = lo - - sys.stdout.write( comma + repr( int(hi) ) ) - comma = ", " - - print "" print "table of arctan( 1/2^n ) for PI = " + repr(units/65536.0) + " units" -# compute range of "i" -r = [-1] -r = r + range(32) - -for n in r: - - if n >= 0: - x = 1.0/(2.0**n) # tangent value - else: - x = 2.0**(-n) +for n in range(1,32): - angle = math.atan(x) # arctangent - angle2 = angle*scale # arctangent in FT_Angle units + x = 0.5**n # tangent value - # determine which integer value for angle gives the best tangent - lo = int(angle2) - hi = lo + 1 - tlo = math.tan(lo/scale) - thi = math.tan(hi/scale) - - errlo = abs( tlo - x ) - errhi = abs( thi - x ) - - angle2 = hi - if errlo < errhi: - angle2 = lo + angle = math.atan(x) # arctangent + angle2 = round(angle*scale) # arctangent in FT_Angle units if angle2 <= 0: break @@ -68,12 +23,11 @@ for n in r: sys.stdout.write( comma + repr( int(angle2) ) ) comma = ", " - shrink = shrink * math.cos( angle2/scale) - + shrink /= math.sqrt( 1 + x*x ) print print "shrink factor = " + repr( shrink ) -print "shrink factor 2 = " + repr( shrink * (2.0**32) ) -print "expansion factor = " + repr(1/shrink) +print "shrink factor 2 = " + repr( int( shrink * (2**32) ) ) +print "expansion factor = " + repr( 1/shrink ) print "" diff --git a/src/tools/docmaker/content.py b/src/tools/docmaker/content.py index b398955..adea6f1 100644 --- a/src/tools/docmaker/content.py +++ b/src/tools/docmaker/content.py @@ -1,57 +1,81 @@ -# Content (c) 2002, 2004, 2006, 2007, 2008, 2009 -# David Turner <david@freetype.org> # -# This file contains routines used to parse the content of documentation -# comment blocks and build more structured objects out of them. +# content.py # +# Parse comment blocks to build content blocks (library file). +# +# Copyright 2002, 2004, 2006-2009, 2012-2014 by +# David Turner. +# +# This file is part of the FreeType project, and may only be used, +# modified, and distributed under the terms of the FreeType project +# license, LICENSE.TXT. By continuing to use, modify, or distribute +# this file you indicate that you have read the license and +# understand and accept it fully. + +# +# This file contains routines to parse documentation comment blocks, +# building more structured objects out of them. +# + from sources import * -from utils import * +from utils import * + import string, re -# this regular expression is used to detect code sequences. these -# are simply code fragments embedded in '{' and '}' like in: # -# { -# x = y + z; -# if ( zookoo == 2 ) -# { -# foobar(); -# } -# } +# Regular expressions to detect code sequences. `Code sequences' are simply +# code fragments embedded in '{' and '}', as demonstrated in the following +# example. +# +# { +# x = y + z; +# if ( zookoo == 2 ) +# { +# foobar(); +# } +# } # -# note that indentation of the starting and ending accolades must be -# exactly the same. the code sequence can contain accolades at greater -# indentation +# Note that the indentation of the first opening brace and the last closing +# brace must be exactly the same. The code sequence itself should have a +# larger indentation than the surrounding braces. # re_code_start = re.compile( r"(\s*){\s*$" ) re_code_end = re.compile( r"(\s*)}\s*$" ) -# this regular expression is used to isolate identifiers from -# other text # -re_identifier = re.compile( r'(\w*)' ) - - -# we collect macros ending in `_H'; while outputting the object data, we use -# this info together with the object's file location to emit the appropriate -# header file macro and name before the object itself +# A regular expression to isolate identifiers from other text. # -re_header_macro = re.compile( r'^#define\s{1,}(\w{1,}_H)\s{1,}<(.*)>' ) +re_identifier = re.compile( r'((?:\w|-)*)' ) -############################################################################# # -# The DocCode class is used to store source code lines. +# We collect macro names ending in `_H' (group 1), as defined in +# `config/ftheader.h'. While outputting the object data, we use this info +# together with the object's file location (group 2) to emit the appropriate +# header file macro and its associated file name before the object itself. # -# 'self.lines' contains a set of source code lines that will be dumped as -# HTML in a <PRE> tag. +# Example: # -# The object is filled line by line by the parser; it strips the leading -# "margin" space from each input line before storing it in 'self.lines'. +# #define FT_FREETYPE_H <freetype.h> # +re_header_macro = re.compile( r'^#define\s{1,}(\w{1,}_H)\s{1,}<(.*)>' ) + + +################################################################ +## +## DOC CODE CLASS +## +## The `DocCode' class is used to store source code lines. +## +## `self.lines' contains a set of source code lines that will be dumped as +## HTML in a <PRE> tag. +## +## The object is filled line by line by the parser; it strips the leading +## `margin' space from each input line before storing it in `self.lines'. +## class DocCode: def __init__( self, margin, lines ): @@ -77,12 +101,14 @@ class DocCode: -############################################################################# -# -# The DocPara class is used to store "normal" text paragraph. -# -# 'self.words' contains the list of words that make up the paragraph -# +################################################################ +## +## DOC PARA CLASS +## +## `Normal' text paragraphs are stored in the `DocPara' class. +## +## `self.words' contains the list of words that make up the paragraph. +## class DocPara: def __init__( self, lines ): @@ -123,17 +149,18 @@ class DocPara: return result - -############################################################################# -# -# The DocField class is used to store a list containing either DocPara or -# DocCode objects. Each DocField also has an optional "name" which is used -# when the object corresponds to a field or value definition -# +################################################################ +## +## DOC FIELD CLASS +## +## The `DocField' class stores a list containing either `DocPara' or +## `DocCode' objects. Each DocField object also has an optional `name' +## that is used when the object corresponds to a field or value definition. +## class DocField: def __init__( self, name, lines ): - self.name = name # can be None for normal paragraphs/sources + self.name = name # can be `None' for normal paragraphs/sources self.items = [] # list of items mode_none = 0 # start parsing mode @@ -143,14 +170,14 @@ class DocField: margin = -1 # current code sequence indentation cur_lines = [] - # now analyze the markup lines to see if they contain paragraphs, - # code sequences or fields definitions + # analyze the markup lines to check whether they contain paragraphs, + # code sequences, or fields definitions # start = 0 mode = mode_none for l in lines: - # are we parsing a code sequence ? + # are we parsing a code sequence? if mode == mode_code: m = re_code_end.match( l ) if m and len( m.group( 1 ) ) <= margin: @@ -161,10 +188,10 @@ class DocField: cur_lines = [] mode = mode_none else: - # nope, continue the code sequence + # otherwise continue the code sequence cur_lines.append( l[margin:] ) else: - # start of code sequence ? + # start of code sequence? m = re_code_start.match( l ) if m: # save current lines @@ -222,13 +249,29 @@ class DocField: return result - -# this regular expression is used to detect field definitions # -re_field = re.compile( r"\s*(\w*|\w(\w|\.)*\w)\s*::" ) - - - +# A regular expression to detect field definitions. +# +# Examples: +# +# foo :: +# foo.bar :: +# +re_field = re.compile( r""" + \s* + ( + \w* + | + \w (\w | \.)* \w + ) + \s* :: + """, re.VERBOSE ) + + +################################################################ +## +## DOC MARKUP CLASS +## class DocMarkup: def __init__( self, tag, lines ): @@ -242,7 +285,7 @@ class DocMarkup: for l in lines: m = re_field.match( l ) if m: - # we detected the start of a new field definition + # We detected the start of a new field definition. # first, save the current one if cur_lines: @@ -268,15 +311,6 @@ class DocMarkup: except: return None - def get_start( self ): - try: - result = "" - for word in self.fields[0].items[0].words: - result = result + " " + word - return result[1:] - except: - return "ERROR" - def dump( self, margin ): print " " * margin + "<" + self.tag + ">" for f in self.fields: @@ -284,7 +318,10 @@ class DocMarkup: print " " * margin + "</" + self.tag + ">" - +################################################################ +## +## DOC CHAPTER CLASS +## class DocChapter: def __init__( self, block ): @@ -300,7 +337,10 @@ class DocChapter: self.order = [] - +################################################################ +## +## DOC SECTION CLASS +## class DocSection: def __init__( self, name = "Other" ): @@ -329,18 +369,21 @@ class DocSection: self.title = title self.abstract = block.get_markup_words( "abstract" ) self.description = block.get_markup_items( "description" ) - self.order = block.get_markup_words( "order" ) + self.order = block.get_markup_words_all( "order" ) return def reorder( self ): self.block_names = sort_order_list( self.block_names, self.order ) - +################################################################ +## +## CONTENT PROCESSOR CLASS +## class ContentProcessor: def __init__( self ): - """initialize a block content processor""" + """Initialize a block content processor.""" self.reset() self.sections = {} # dictionary of documentation sections @@ -351,8 +394,8 @@ class ContentProcessor: self.headers = {} # dictionary of header macros def set_section( self, section_name ): - """set current section during parsing""" - if not self.sections.has_key( section_name ): + """Set current section during parsing.""" + if not section_name in self.sections: section = DocSection( section_name ) self.sections[section_name] = section self.section = section @@ -363,15 +406,14 @@ class ContentProcessor: chapter = DocChapter( block ) self.chapters.append( chapter ) - def reset( self ): - """reset the content processor for a new block""" + """Reset the content processor for a new block.""" self.markups = [] self.markup = None self.markup_lines = [] def add_markup( self ): - """add a new markup section""" + """Add a new markup section.""" if self.markup and self.markup_lines: # get rid of last line of markup if it's empty @@ -387,8 +429,8 @@ class ContentProcessor: self.markup_lines = [] def process_content( self, content ): - """process a block content and return a list of DocMarkup objects - corresponding to it""" + """Process a block content and return a list of DocMarkup objects + corresponding to it.""" markup = None markup_lines = [] first = 1 @@ -446,7 +488,7 @@ class ContentProcessor: # listed there for chap in self.chapters: for sec in chap.order: - if self.sections.has_key( sec ): + if sec in self.sections: section = self.sections[sec] section.chapter = chap section.reorder() @@ -461,6 +503,7 @@ class ContentProcessor: others = [] for sec in self.sections.values(): if not sec.chapter: + sec.reorder() others.append( sec ) # create a new special chapter for all remaining sections @@ -472,7 +515,10 @@ class ContentProcessor: self.chapters.append( chap ) - +################################################################ +## +## DOC BLOCK CLASS +## class DocBlock: def __init__( self, source, follow, processor ): @@ -549,24 +595,31 @@ class DocBlock: return self.source.location() def get_markup( self, tag_name ): - """return the DocMarkup corresponding to a given tag in a block""" + """Return the DocMarkup corresponding to a given tag in a block.""" for m in self.markups: if m.tag == string.lower( tag_name ): return m return None - def get_markup_name( self, tag_name ): - """return the name of a given primary markup in a block""" + def get_markup_words( self, tag_name ): try: m = self.get_markup( tag_name ) - return m.get_name() + return m.fields[0].items[0].words except: - return None + return [] - def get_markup_words( self, tag_name ): + def get_markup_words_all( self, tag_name ): try: m = self.get_markup( tag_name ) - return m.fields[0].items[0].words + words = [] + for item in m.fields[0].items: + # We honour empty lines in an `<Order>' section element by + # adding the sentinel `/empty/'. The formatter should then + # convert it to an appropriate representation in the + # `section_enter' function. + words += item.words + words.append( "/empty/" ) + return words except: return [] diff --git a/src/tools/docmaker/docmaker.py b/src/tools/docmaker/docmaker.py index 1d9de9f..4fb1abf 100644 --- a/src/tools/docmaker/docmaker.py +++ b/src/tools/docmaker/docmaker.py @@ -1,16 +1,26 @@ #!/usr/bin/env python # -# DocMaker (c) 2002, 2004, 2008 David Turner <david@freetype.org> +# docmaker.py # -# This program is a re-write of the original DocMaker took used -# to generate the API Reference of the FreeType font engine -# by converting in-source comments into structured HTML. +# Convert source code markup to HTML documentation. # -# This new version is capable of outputting XML data, as well -# as accepts more liberal formatting options. +# Copyright 2002, 2004, 2008, 2013, 2014 by +# David Turner. # -# It also uses regular expression matching and substitution -# to speed things significantly. +# This file is part of the FreeType project, and may only be used, +# modified, and distributed under the terms of the FreeType project +# license, LICENSE.TXT. By continuing to use, modify, or distribute +# this file you indicate that you have read the license and +# understand and accept it fully. + +# +# This program is a re-write of the original DocMaker tool used to generate +# the API Reference of the FreeType font rendering engine by converting +# in-source comments into structured HTML. +# +# This new version is capable of outputting XML data as well as accepting +# more liberal formatting options. It also uses regular expression matching +# and substitution to speed up operation significantly. # from sources import * @@ -39,13 +49,13 @@ def usage(): def main( argv ): - """main program loop""" + """Main program loop.""" global output_dir try: - opts, args = getopt.getopt( sys.argv[1:], \ - "ht:o:p:", \ + opts, args = getopt.getopt( sys.argv[1:], + "ht:o:p:", ["help", "title=", "output=", "prefix="] ) except getopt.GetoptError: usage() @@ -56,7 +66,6 @@ def main( argv ): sys.exit( 1 ) # process options - # project_title = "Project" project_prefix = None output_dir = None @@ -90,7 +99,9 @@ def main( argv ): # process sections content_processor.finish() - formatter = HtmlFormatter( content_processor, project_title, project_prefix ) + formatter = HtmlFormatter( content_processor, + project_title, + project_prefix ) formatter.toc_dump() formatter.index_dump() @@ -98,9 +109,7 @@ def main( argv ): # if called from the command line -# if __name__ == '__main__': main( sys.argv ) - # eof diff --git a/src/tools/docmaker/formatter.py b/src/tools/docmaker/formatter.py index f62ce67..7152c01 100644 --- a/src/tools/docmaker/formatter.py +++ b/src/tools/docmaker/formatter.py @@ -1,19 +1,37 @@ -# Formatter (c) 2002, 2004, 2007, 2008 David Turner <david@freetype.org> # +# formatter.py +# +# Convert parsed content blocks to a structured document (library file). +# +# Copyright 2002, 2004, 2007, 2008, 2014 by +# David Turner. +# +# This file is part of the FreeType project, and may only be used, +# modified, and distributed under the terms of the FreeType project +# license, LICENSE.TXT. By continuing to use, modify, or distribute +# this file you indicate that you have read the license and +# understand and accept it fully. + +# +# This is the base Formatter class. Its purpose is to convert a content +# processor's data into specific documents (i.e., table of contents, global +# index, and individual API reference indices). +# +# You need to sub-class it to output anything sensible. For example, the +# file `tohtml.py' contains the definition of the `HtmlFormatter' sub-class +# to output HTML. +# + from sources import * from content import * from utils import * -# This is the base Formatter class. Its purpose is to convert -# a content processor's data into specific documents (i.e., table of -# contents, global index, and individual API reference indices). -# -# You need to sub-class it to output anything sensible. For example, -# the file tohtml.py contains the definition of the HtmlFormatter sub-class -# used to output -- you guessed it -- HTML. -# +################################################################ +## +## FORMATTER CLASS +## class Formatter: def __init__( self, processor ): @@ -36,20 +54,22 @@ class Formatter: self.add_identifier( field.name, block ) self.block_index = self.identifiers.keys() - self.block_index.sort( index_sort ) + self.block_index.sort( key = index_key ) def add_identifier( self, name, block ): - if self.identifiers.has_key( name ): + if name in self.identifiers: # duplicate name! - sys.stderr.write( \ - "WARNING: duplicate definition for '" + name + "' in " + \ - block.location() + ", previous definition in " + \ - self.identifiers[name].location() + "\n" ) + sys.stderr.write( "WARNING: duplicate definition for" + + " '" + name + "' " + + "in " + block.location() + ", " + + "previous definition in " + + self.identifiers[name].location() + + "\n" ) else: self.identifiers[name] = block # - # Formatting the table of contents + # formatting the table of contents # def toc_enter( self ): pass @@ -97,7 +117,7 @@ class Formatter: close_output( output ) # - # Formatting the index + # formatting the index # def index_enter( self ): pass @@ -128,7 +148,7 @@ class Formatter: close_output( output ) # - # Formatting a section + # formatting a section # def section_enter( self, section ): pass @@ -162,7 +182,22 @@ class Formatter: self.section_enter( section ) for name in section.block_names: - block = self.identifiers[name] + skip_entry = 0 + try: + block = self.identifiers[name] + # `block_names' can contain field names also, + # which we filter out + for markup in block.markups: + if markup.tag == 'values': + for field in markup.fields: + if field.name == name: + skip_entry = 1 + except: + skip_entry = 1 # this happens e.g. for `/empty/' entries + + if skip_entry: + continue + self.block_enter( block ) for markup in block.markups[1:]: # always ignore first markup! diff --git a/src/tools/docmaker/sources.py b/src/tools/docmaker/sources.py index 7b68c07..61ecc22 100644 --- a/src/tools/docmaker/sources.py +++ b/src/tools/docmaker/sources.py @@ -1,62 +1,70 @@ -# Sources (c) 2002, 2003, 2004, 2006, 2007, 2008, 2009 -# David Turner <david@freetype.org> # +# sources.py # -# this file contains definitions of classes needed to decompose -# C sources files into a series of multi-line "blocks". There are -# two kinds of blocks: +# Convert source code comments to multi-line blocks (library file). # -# - normal blocks, which contain source code or ordinary comments +# Copyright 2002-2004, 2006-2009, 2012-2014 by +# David Turner. # -# - documentation blocks, which have restricted formatting, and -# whose text always start with a documentation markup tag like -# "<Function>", "<Type>", etc.. +# This file is part of the FreeType project, and may only be used, +# modified, and distributed under the terms of the FreeType project +# license, LICENSE.TXT. By continuing to use, modify, or distribute +# this file you indicate that you have read the license and +# understand and accept it fully. + +# +# This library file contains definitions of classes needed to decompose C +# source code files into a series of multi-line `blocks'. There are two +# kinds of blocks. # -# the routines used to process the content of documentation blocks -# are not contained here, but in "content.py" +# - Normal blocks, which contain source code or ordinary comments. # -# the classes and methods found here only deal with text parsing -# and basic documentation block extraction +# - Documentation blocks, which have restricted formatting, and whose text +# always start with a documentation markup tag like `<Function>', +# `<Type>', etc. +# +# The routines to process the content of documentation blocks are contained +# in file `content.py'; the classes and methods found here only deal with +# text parsing and basic documentation block extraction. # -import fileinput, re, sys, os, string +import fileinput, re, sys, os, string ################################################################ ## -## BLOCK FORMAT PATTERN +## SOURCE BLOCK FORMAT CLASS +## +## A simple class containing compiled regular expressions to detect +## potential documentation format block comments within C source code. ## -## A simple class containing compiled regular expressions used -## to detect potential documentation format block comments within -## C source code +## The `column' pattern must contain a group to `unbox' the content of +## documentation comment blocks. ## -## note that the 'column' pattern must contain a group that will -## be used to "unbox" the content of documentation comment blocks +## Later on, paragraphs are converted to long lines, which simplifies the +## regular expressions that act upon the text. ## class SourceBlockFormat: def __init__( self, id, start, column, end ): - """create a block pattern, used to recognize special documentation blocks""" + """Create a block pattern, used to recognize special documentation + blocks.""" self.id = id self.start = re.compile( start, re.VERBOSE ) self.column = re.compile( column, re.VERBOSE ) self.end = re.compile( end, re.VERBOSE ) - # -# format 1 documentation comment blocks look like the following: +# Format 1 documentation comment blocks. # -# /************************************/ +# /************************************/ (at least 2 asterisks) # /* */ # /* */ # /* */ -# /************************************/ +# /************************************/ (at least 2 asterisks) # -# we define a few regular expressions here to detect them -# - start = r''' \s* # any number of whitespace /\*{2,}/ # followed by '/' and at least two asterisks then '/' @@ -75,16 +83,13 @@ re_source_block_format1 = SourceBlockFormat( 1, start, column, start ) # -# format 2 documentation comment blocks look like the following: +# Format 2 documentation comment blocks. # # /************************************ (at least 2 asterisks) # * +# * (1 asterisk) # * -# * -# * -# **/ (1 or more asterisks at the end) -# -# we define a few regular expressions here to detect them +# */ (1 or more asterisks) # start = r''' \s* # any number of whitespace @@ -93,9 +98,9 @@ start = r''' ''' column = r''' - \s* # any number of whitespace - \*{1}(?!/) # followed by precisely one asterisk not followed by `/' - (.*) # then anything (group1) + \s* # any number of whitespace + \*{1}(?![*/]) # followed by precisely one asterisk not followed by `/' + (.*) # then anything (group1) ''' end = r''' @@ -107,51 +112,101 @@ re_source_block_format2 = SourceBlockFormat( 2, start, column, end ) # -# the list of supported documentation block formats, we could add new ones -# relatively easily +# The list of supported documentation block formats. We could add new ones +# quite easily. # re_source_block_formats = [re_source_block_format1, re_source_block_format2] # -# the following regular expressions corresponds to markup tags -# within the documentation comment blocks. they're equivalent -# despite their different syntax +# The following regular expressions correspond to markup tags within the +# documentation comment blocks. They are equivalent despite their different +# syntax. +# +# A markup tag consists of letters or character `-', to be found in group 1. # -# notice how each markup tag _must_ begin a new line +# Notice that a markup tag _must_ begin a new paragraph. # -re_markup_tag1 = re.compile( r'''\s*<(\w*)>''' ) # <xxxx> format -re_markup_tag2 = re.compile( r'''\s*@(\w*):''' ) # @xxxx: format +re_markup_tag1 = re.compile( r'''\s*<((?:\w|-)*)>''' ) # <xxxx> format +re_markup_tag2 = re.compile( r'''\s*@((?:\w|-)*):''' ) # @xxxx: format # -# the list of supported markup tags, we could add new ones relatively -# easily +# The list of supported markup tags. We could add new ones quite easily. # re_markup_tags = [re_markup_tag1, re_markup_tag2] + +# +# A regular expression to detect a cross reference, after markup tags have +# been stripped off. Group 1 is the reference, group 2 the rest of the +# line. # -# used to detect a cross-reference, after markup tags have been stripped +# A cross reference consists of letters, digits, or characters `-' and `_'. # -re_crossref = re.compile( r'@(\w*)(.*)' ) +re_crossref = re.compile( r'@((?:\w|-)*)(.*)' ) # @foo # -# used to detect italic and bold styles in paragraph text +# Two regular expressions to detect italic and bold markup, respectively. +# Group 1 is the markup, group 2 the rest of the line. # -re_italic = re.compile( r"_(\w(\w|')*)_(.*)" ) # _italic_ -re_bold = re.compile( r"\*(\w(\w|')*)\*(.*)" ) # *bold* +# Note that the markup is limited to words consisting of letters, digits, +# the character `_', or an apostrophe (but not as the first character). +# +re_italic = re.compile( r"_(\w(?:\w|')*)_(.*)" ) # _italic_ +re_bold = re.compile( r"\*(\w(?:\w|')*)\*(.*)" ) # *bold* # -# used to detect the end of commented source lines +# This regular expression code to identify an URL has been taken from +# +# http://mail.python.org/pipermail/tutor/2002-September/017228.html # -re_source_sep = re.compile( r'\s*/\*\s*\*/' ) +# (with slight modifications). +# +urls = r'(?:https?|telnet|gopher|file|wais|ftp)' +ltrs = r'\w' +gunk = r'/#~:.?+=&%@!\-' +punc = r'.:?\-' +any = "%(ltrs)s%(gunk)s%(punc)s" % { 'ltrs' : ltrs, + 'gunk' : gunk, + 'punc' : punc } +url = r""" + ( + \b # start at word boundary + %(urls)s : # need resource and a colon + [%(any)s] +? # followed by one or more of any valid + # character, but be conservative and + # take only what you need to... + (?= # [look-ahead non-consumptive assertion] + [%(punc)s]* # either 0 or more punctuation + (?: # [non-grouping parentheses] + [^%(any)s] | $ # followed by a non-url char + # or end of the string + ) + ) + ) + """ % {'urls' : urls, + 'any' : any, + 'punc' : punc } + +re_url = re.compile( url, re.VERBOSE | re.MULTILINE ) # -# used to perform cross-reference within source output +# A regular expression that stops collection of comments for the current +# block. +# +re_source_sep = re.compile( r'\s*/\*\s*\*/' ) # /* */ + +# +# A regular expression to find possible C identifiers while outputting +# source code verbatim, covering things like `*foo' or `(bar'. Group 1 is +# the prefix, group 2 the identifier -- since we scan lines from left to +# right, sequentially splitting the source code into prefix and identifier +# is fully sufficient for our purposes. # re_source_crossref = re.compile( r'(\W*)(\w*)' ) # -# a list of reserved source keywords +# A regular expression that matches a list of reserved C source keywords. # re_source_keywords = re.compile( '''\\b ( typedef | struct | @@ -179,24 +234,16 @@ re_source_keywords = re.compile( '''\\b ( typedef | ## ## SOURCE BLOCK CLASS ## -## A SourceProcessor is in charge of reading a C source file -## and decomposing it into a series of different "SourceBlocks". -## each one of these blocks can be made of the following data: -## -## - A documentation comment block that starts with "/**" and -## whose exact format will be discussed later +## There are two important fields in a `SourceBlock' object. ## -## - normal sources lines, including comments +## self.lines +## A list of text lines for the corresponding block. ## -## the important fields in a text block are the following ones: -## -## self.lines : a list of text lines for the corresponding block -## -## self.content : for documentation comment blocks only, this is the -## block content that has been "unboxed" from its -## decoration. This is None for all other blocks -## (i.e. sources or ordinary comments with no starting -## markup tag) +## self.content +## For documentation comment blocks only, this is the block content +## that has been `unboxed' from its decoration. This is `None' for all +## other blocks (i.e., sources or ordinary comments with no starting +## markup tag) ## class SourceBlock: @@ -233,7 +280,7 @@ class SourceBlock: def location( self ): return "(" + self.filename + ":" + repr( self.lineno ) + ")" - # debugging only - not used in normal operations + # debugging only -- not used in normal operations def dump( self ): if self.content: print "{{{content start---" @@ -250,39 +297,38 @@ class SourceBlock: print line - ################################################################ ## ## SOURCE PROCESSOR CLASS ## -## The SourceProcessor is in charge of reading a C source file -## and decomposing it into a series of different "SourceBlock" -## objects. +## The `SourceProcessor' is in charge of reading a C source file and +## decomposing it into a series of different `SourceBlock' objects. ## -## each one of these blocks can be made of the following data: +## A SourceBlock object consists of the following data. ## -## - A documentation comment block that starts with "/**" and -## whose exact format will be discussed later +## - A documentation comment block using one of the layouts above. Its +## exact format will be discussed later. ## -## - normal sources lines, include comments +## - Normal sources lines, including comments. ## ## class SourceProcessor: def __init__( self ): - """initialize a source processor""" + """Initialize a source processor.""" self.blocks = [] self.filename = None self.format = None self.lines = [] def reset( self ): - """reset a block processor, clean all its blocks""" + """Reset a block processor and clean up all its blocks.""" self.blocks = [] self.format = None def parse_file( self, filename ): - """parse a C source file, and add its blocks to the processor's list""" + """Parse a C source file and add its blocks to the processor's + list.""" self.reset() self.filename = filename @@ -301,16 +347,16 @@ class SourceProcessor: self.process_normal_line( line ) else: if self.format.end.match( line ): - # that's a normal block end, add it to 'lines' and - # create a new block + # A normal block end. Add it to `lines' and create a + # new block self.lines.append( line ) self.add_block_lines() elif self.format.column.match( line ): - # that's a normal column line, add it to 'lines' + # A normal column line. Add it to `lines'. self.lines.append( line ) else: - # humm.. this is an unexpected block end, - # create a new block, but don't process the line + # An unexpected block end. Create a new block, but + # don't process the line. self.add_block_lines() # we need to process the line again @@ -320,7 +366,8 @@ class SourceProcessor: self.add_block_lines() def process_normal_line( self, line ): - """process a normal line and check whether it is the start of a new block""" + """Process a normal line and check whether it is the start of a new + block.""" for f in re_source_block_formats: if f.start.match( line ): self.add_block_lines() @@ -330,9 +377,12 @@ class SourceProcessor: self.lines.append( line ) def add_block_lines( self ): - """add the current accumulated lines and create a new block""" + """Add the current accumulated lines and create a new block.""" if self.lines != []: - block = SourceBlock( self, self.filename, self.lineno, self.lines ) + block = SourceBlock( self, + self.filename, + self.lineno, + self.lines ) self.blocks.append( block ) self.format = None @@ -340,7 +390,7 @@ class SourceProcessor: # debugging only, not used in normal operations def dump( self ): - """print all blocks in a processor""" + """Print all blocks in a processor.""" for b in self.blocks: b.dump() diff --git a/src/tools/docmaker/tohtml.py b/src/tools/docmaker/tohtml.py index fffa120..05fc08a 100644 --- a/src/tools/docmaker/tohtml.py +++ b/src/tools/docmaker/tohtml.py @@ -1,5 +1,19 @@ -# ToHTML (c) 2002, 2003, 2005, 2006, 2007, 2008 -# David Turner <david@freetype.org> +# +# tohtml.py +# +# A sub-class container of the `Formatter' class to produce HTML. +# +# Copyright 2002, 2003, 2005-2008, 2013, 2014 by +# David Turner. +# +# This file is part of the FreeType project, and may only be used, +# modified, and distributed under the terms of the FreeType project +# license, LICENSE.TXT. By continuing to use, modify, or distribute +# this file you indicate that you have read the license and +# understand and accept it fully. + +# The parent class is contained in file `formatter.py'. + from sources import * from content import * @@ -8,7 +22,7 @@ from formatter import * import time -# The following defines the HTML header used by all generated pages. +# The following strings define the HTML header used by all generated pages. html_header_1 = """\ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> @@ -21,62 +35,125 @@ html_header_1 = """\ html_header_2 = """\ API Reference """ -html_header_3 = """ - - - -
    [
    [
    [
    [Index][Index][TOC]
    -

    \ +html_header_5t = """\ +">TOC]

    Day@%IXT)m52Dw?GxuFBdovdIUBIe>+?H8wZ6JOK|_YmGyU_XsK%varUpfUVwx;l!EH?Dk7zNcx6&>nt{^=vIWmAOU;#SuhueXul9I zMmY5w7WP>%2a)a{;>8%Je*HP!-bS~n0U_Sq?$rNuPP+|<0uKza%gS~u)mYn*1=k$@ci(Mn@5xAp+daVStBh=g7)d%X!rMhE@<+{N2vS_Jebvt@P zexu8aB`DsntRLWK?x#bQ)qMyouSQ}4J$cyec?_@`QMnfI5WED>T8#4jPer2XA!pu>yTHd)o%f=9v}9R+APhEOz$Ah=U`wNUNirsJ6I+&LX*80?l5Aw+cF<#HG`3#M zjBJS-o7m=&lqM#jIoy_7PU5uudbsz{mL?Q@8n>lAoP@UYl#@CMIq^NEIrNsCy2L%D z4ZXSl|F_oKd(T)lh6AMiUBUKxf9qS{`d;g?_aM3DQ;1Zl7tRHoIgGk(OADGzR0d?k z7&U&<=J(w}PspHuh-T3N)|;&4TX;+UisVWYkH*TtQ)sj-5pdQb_s4F_MrqlBJU!lK z8E=*?w_dviEek5ZRtY?xL+-~;ZbjxNmGCJuTk#J3Z=ry9{2ESUKp|PceNGh7_X$^+ z?emHi7Qce@&ybFfNV*y6+bTFMzofWlL_TSFgFxEIbWaM9pJO9g=KrSp4zlx1^X-ApIN=^*G%HJ6-fNLPF%*->@>QQh4o4&es&8Q+>u7k0#ykPxb2yCWHbl3 zx3NGa(#Yv1^JYxWD08;3&R0#&5#}iJ!VgT&apruK)VR4q!#T;EAiL@{Ij5QP1;Y7N zlM~D!=OyT=z^f+b9P4y(dahO)PCM)TGNrfG@c{0ifTYnCrjHP_c%5x6q24E$fQ z8ZR<^Y>9%FR9EAth(5C9qf0uLLphuL8X$sSACrfaUa#`Z4oukzsFMNtDERk6=y+L<0!R+hB8b`9`abr~FKH(y3` z{c_}Q0IsWK91BP&VsV2IVF8?x5a1AdDDd&6w!CAxu5qK+#Ae;p zHw zemuNdL2m%8)vzSM-&_uP7&13(`XngKS7aqbI%=wzyqE{x1K#N2N-#~nz5u4#*9nsA zLV@UVukEc1oTwnazR5&xV`LR(;Ug?!VtE#9OM@y+Z9mWjYwiNIl*{7H7v=7H;2zCrkRs~;bz=NkaX zgV5p8@Z(F#cX2NRB%V){tq_sPl_$Selp*3G$}pK$q8GX{DFmrDGGioaky|SKyqKj{ zVwc#?AlROyQDX5kvRYnita`Xy>y2eD3BbLU-yzhN6R{0nTEnCHavzg{<}1t;81}u& zo4%|4M7qXHaHdw;sl9fdZWeQruJe##gX{hEJY>LKB4viVZy?8iz=siN@Il|yf(2_e zkKD+BLUPk$Bji^=q$%V^?dpkM?Paj?hrQ&-moj7Cx&PO$#w!D27=)3ouqswmxn>s3 zFxhs6Rqj;ZKIMLOsdA?ZcTLqwzjD9Uw8P|(89gN~Jzrm{(^pxYe#3GfdLKZ-Rqr3P z>KzJPx`cYSyo>p?IATr>2Z)LJkXKo2`qhTBq|~RxJA7Krr^?BFR+$?nU*oX>OV?^; zT<7INjaz*d^m55CP~7BRsP6e0`a&w4^fycn6>iLz$gU?0jb_*e%O=A(I zuQM2e9!%cqZ{{_Edbb2-Ehu?C1=`en&(B7Mv+lOOkW zjIxbh$EzUDn|v*S77c6 zpcTC7g_ieE-zrYu4c`2EZXNjEV@&JX8R>w27Y;B&aHBUzWLxXfnab9wGnL`iX(!~v zR!VR7nnMd{IbY+A$HQW+Hzsnhb?S^v)q8^^7FH*i(gttTY)hxks9PqjMlh8lWxb31 zMCTDK@uoao0UaRNO8rIy#Ap1i(+5((RI-da*_PBt{2ZzsJ6K@GHzTf-Y}%ckC?~%7xS9_ z%_v4qyvsw5w=}E;Ej&lr3XsT^b(M`!VyE2|SrE)lK1(q%D_pW!7&0Sd0-u~;ZFP=y zl@08bA)!8&ivV?P>B8hXt8lI21ZQYbTV-U=pm2j<6p7P3qF8F5l(kQle*3h*H56jR zs!Ht>&6VMDF;|`=EV~laEQ>wMg>RaeEee6!RGH-UcET*Jkq?9APIifv;-bXr1CalN z{#t&=v({ISqF1UnZYtFqaBV$q_0aY?xKt+}_VF2#*0nX9aSJ-MT!>N_HxHyAv9%sz zn!|kVZn=>AwzU5L%v5?O?piB9(9kY%%M`m$d^uxeD4(^s!7>`QwLH(?o9_>LQ-k&G zjSz01*P|z^%;no;;DqCo+G2z zWtSP|24i9u(qmc}WHUf1S!ReMi7V(MT6y<`SOcWdbyucWc{D9CxX=NnD-mC4g8BL1 z>H>-lrpW37le80PlB@jw(+xiB3g7qxdILfmS*QYQWbJAMQ^myxjH=$Cz!rqwMZ@L; zBCttxO0CEO02Zg(Tzj%xqI#@rYSdPp4;=u*eq$L=iE*;~jckNIux#bRXr4tY98}Go zERR?R`don{5y=H6H4IyFHOX`SYKsK{_ z9&AF-&L_z$8qF8;B|)dRTxj}ruic0ej>jU?4xN3k z_ay;GwRJyexGnsE_?e7co_YlI zJRBa(k2j3vCZ=Z^vJ=zk!J%BZDbyTlEUj!>hKF*+0xU{6lTW9Mvs39{7kVhTPUW-kph!s zin;N@Y}zJlFDx;H(M8#OdT)B7NDOfNFL>MN@B$FGnpob^N$0sL{ zA|pBrD%Q`ziCh&3cZ9$G#Z#x$r>f(fN1~(QCN&dR|G4j1AyuI>)0MWK2%9#WTunviOWs=q!E zQpW?CZ-0m2+N1T+hG@7Wc0?7AsaRZfhtyO^eK@3U2r>Q_PDuTq2PN+h5WO*^M&oKr zNPRS^MH40=)h=wV5yC$ctL-=kh}4u#oY14cAD*Pw0*eX$|j(AiME>10m* z?SXh_L-=?w5>+*?AD?SjR}VDQ)yIzHfKyj^TW3T4M7W{)3!M?^{Lh_uMExSVTa+Ql zM(LqL-4(~6R3W6U%cx9Ttpsi%^(O~1xitDahPO@r`aoR$N+3RW@hF!Nf>Jz2L-?=q_5XmWI^B2ako--gxy* z>ibTnE*2pkc}SR7J&-GAeV$Le-BsiT$notMMw zSYc5pmR;M(hP`-t)Rl)4Dw}aCDl4kuRS)DUE7a#^4`D(0ld25zk^JS^5RyNr;{0?a za@(?r_DE-9^zelG;m^mL2f+x5NKd*k*cR!Cs?Y2Xsee$J2K5C*{#J$5FYFIR!eLc| z`OJj7I@OYAR6eAZSu6{o?(o{?hHxYiiM7pzgRw6L8yeN$E<9APPR@iH!s;6fL-k?x z`{1rs@dkBbVMu*%Ce+r^01C}DgqsJ|?*g$GWZP#hUBXP+YCf)Q8uRq^m-hg-9ga8SYYNs*b6%Kc9gt+#O2x*2TKE zMjH;N!wrw^QQzAiSO4MQx76P_nQ-jcF10MKeo%2peXjD@@#EmKW8kW5fs9B;1frbR^U@A(ahvBh?vJ*H>>)LC8Ry|E@R$PFKHi@Q}Lt^l`Z!W#>(oN5KwnkeFu|Ds_;5d#^ zQ&t!IwCj1Q7^ATIS8L@9=wE1N0fS2AO0fDjp#+-(*NGsl3qcM7Dh^FYv8OCHsl{rr_k1*A-VKFAE3Z}4evnt;xQ!tND7{n0v-Q4RL*7bM(B-f95OT;eXOuS{=5>FxQx(0rR^jY$^b`N0dEqfw*G56q|I0Ttuc5HTP z)V1z|!=uKFcqgucUoJAmbUr_sr%wSlgs#GizYQt*Mj)_KB;xK+C>d6ZUspHB)vkEg zeTT_#o&2W*|ET1b51;6KAPePv$02q3GwI$hA6CyEsNUc@6rWz+(D@^{3S*swaA)TJ zy5{D#hHw~$1kzR?r5=vLCP0xxfvYP*FdPZ!yrxjt)yVAaIR2?%=M`!G6Xriu(Z#sB z{E)gUr2Zc#w7auw6sSb2?*L3j?9&XB5UY!z#}Ew$L{f|+WIY@XN21}*E_FvnU6C0Y z8d5h`Z-@bSpbJuz2qqHQth)Pbz#=*><1guyLDmvV}=PCvvDy zOQyCQ+MUdHc7zk1>2NFSF3=k7ZRn)Tz!m8TItR3`*3WIESv@ z8jggUu8sr`H`b$rNVxgxXnm~iaJW0$v^?9mGFl&O1kqJ(NZlEVscYgY7djGz8EXt@ zlbrIN(Piu6u`ks%c2O}dimQE@=15(vZtbTcK=m-4q}dQ$I)IMAEDfkd$D-l7XfRqI z3D?6}pdSNU+Zj#7o~5B{55u5^qhD0*p{>z~T9V<=RpC&VdeM0%zPoOBcwI2k!1;t) zts0XM%Iv>5hpKNuPtDC;Qr5kPstyqjK1B-%;TI0nLk7s+j>ce}EbZ5aY;v>$6Kw&sE7+YgIRwJ+pOF~u8RDCCxg|DJU z=n<{mmH>ewrO923(F_BjA|esEUSEC#Ud@V4}V=4Ig;9 zK;CgE_wB8X>IY86O@VD{HZD*2NJn;5eI^i6=MH4Rr%|vp|5MK#2tC^nZZs*({=WE$ z(QxeKuXZ&a9t}d^;0b;?a41&SUDy00@ON}8I@;Pb9EB14q_~qmsR~7clFDFQpIlg7 zi^NZ6X!!15_$>@viR?K%Lg;x+kLp9Gpd$9GYU@Y=v3nwv}w!&RA)n0)gGz{u7ES9esCbO zHHxlAt8Zexvpwnyfs97}zOKXD)Gr-8L{WuQt%`#iGb>1u_QtiCd@-qoMKq~@Jg-~z zZmg6`3{?4|-`J~cerPOL)Js{rO2mRMo3|@NNth)g<3nTViIH?(uM3fq=I$b~`p=;G zKN|?FYk)XMg3!v5CX%;@|A?m{PEe3ZF#*s_&?T3LRbyP;9&fI%6Ga=0f_cM$(W5qI z)E_yaIk>g(lN#5C$Lhk-I%xU$HEZeKPQZijh}Ex)wC~}nX(p6_s~qjtK%sx)*M+I6 zZwgUCVp)JX*M=ZT^>yJ`Z=}8^93U+FMl6;y-*+RNd)(-gCMe_ zNI2FRWG_^E1Uv?;p<@xkO#|1}L4Kh__E4QqhhUXr_3+NU9^&c)bkWsy@-N1N1>*I@ zH5{o6ualO5GZ{)Wha2m{&Gpe(FjgO}33sb=74dFJ6ftQC(kjh{nmVZ;&=YXM+7UkD z(qmi=uR0X&jd(TM(qiyTwL99s4)mD7mQTgw7es$b|32oc0i&Sf~pRw-GYmb z)P_c-m)-C}-vi`#kHa6Ri_&~FflA;K>;{Y+TTAM=sHd<;AgJ$-tDAxP5g@+$?I0cv zHVVa5OsI*t`tTuOE>6wK;6K#guQHi#tV%B@H$~vwkdGH(M@3y8 zXLL1|p%yHtx;460eE`FY6F7z{9FH#82I6G8xVfy0v~+=0_7u7Rzom5-(g)%n_Vtlm z9=<~T&1|SKSRaj0iba&yCC)-R)m7LuiC|0-xO=cr^;E(YQU24A88`xa0Bd^z-AP@w<*LwMmTr2YvwyglgOQHK(Z-@!C43T*=uz@p2) z+TN&7?IjOHg3S^2-Rijdt$o;+`gEvs1+$0LkKjoD;=wpVZpB&LgE5e1X&k=P z)@Xa=xXAP1A*}GR(bNW-cEDQv0&3r<4yhmSpAYWWuoLv3L20b-)t@1RZOLKDL6W}( z++RHy@9b31I~n}@2lDR^?qU2v1^<^r3QcsYTdR+%v(wz`6w-VVqa&_x;UG6g|cJn7PuRoofQ@4)TzQb_EV-! zW^!UamsGM{S99v`L8o7-2rO@iW5q+BOhEQA*;umQe=p2RUE|tqYVo1v+1PSqh4HU` zP_^-JIC$dt?&Vx7Bw(LsDeq_<7a}|&3{t^=-~Yon?U%o;4N-XOBk8@l;k0$*-J>5m z>^!nE-g@5W$J-`C&k}dvJ;lP7l`!OwK=)}hROlUV(R`5+? z$D%NUO<2)`sn*3qO>lJ73hZ0PJCk1oWf#Z8U0pdWETh3X_+QJZLBd&VLdLPa>dZc? zZj9&ZbKzeNcV_<*a;nS!qgoM1r4PiznmMD~e009{Z)RTnXR7nT_)nh({5hsy>+{Tp3S3w@E^7`$xLVd0nBvD2}G#rL&8h4AE&6X!oPc51EZz*;8M!aU(FM4baYIJ^-GM`~ zdhT&@k)Zx3yp7KsL_(cK>>;==@FRbM=>Ll&)I)F?K7SBPP&hX5SP#N?gkyt9D2hlN zkxZ1!&lDCj*!pB$0r)u+ehT3m$bS&wRoJxQk`{8?h#i_RP9HCer?c#CDeV3Tw%^vN z9&TASP>~|`n>cI0#hpp`$y{%%m`TI*)erzK(-`h>2qg@TUR}y1W$=G zK)a(E#&B&giXF$h;d5gfl*{gwaHZfV423|4p7wBEV-5pZ+lWPDxPvR-VHSjOKqfW9 z^xv1quL>qcqszF&zZd6cpA5t!?F}LLxawaHgp!eHd#nvRJea;ikcI@wg?F#g;41eTOQQ`gaF;>;<+)9Q=FHcwFk}vumym)G;cI>e{ks)t8uo9ajl* ztgonKR6YNp3R2WGic+blwiH*kD)B%^XBhpT7F>P}(|KLIac%WCWibok{exhgTyH>K z?oyW}PhvCj!GqY71+(%0aH4xRZX~Fk*k1|t)JI3Km)6;_2k=){tjC9b2!$ezjQ`sG??_i0<6pkyad*k6*}QbhkM#s2 z!_jtnNevgA^mr%RC1lj(eE+EbR#5pRGwRnlYCFvvn0Obbx$%-mi>>h_XZif`S{A?H zc)#snnq9fCR9}&~h3%-UR9}3HcwFkd*K+?2!R4v_i^tLqi0tViY;n@ty-V=LVp zE&1C&+CP)gB40*3k95ENL7vabm+Z3{YkvMHLl+@0viHF~0+W ze*0tg$#a$3#F2fB6mKCD{0w88-&;{OV|}}#eEvX7MR~r-wUUf+a&+D}VKtcd9tg3^ zy>C~D&mUi@5T7@`ASN?6XwEACS8`SQJ$kD;GB7K0>6MN8tr_d>QIBb7SVRP&00U z4DLmE!p?Gp_6tVy$i599}_8ti_x=lwBOZsF9pRxw| zy*ZFgi#q1XM0gt+;^**Yr5%J!gkIsAiNKwSptgjWD$K;|b_{ag&BdRagE#`%{C2_AK9&I?319jz&8&QoTbzgQFmg4eM?Fxbn4`$w|O9E<>-nRi^-^+1)4 z<{l2>ax}rqa+hBOg)0PwvdMdYQCRj4so-+s+ES`s=?zK7Wmw~41XV|ImF2(A1aJZC zalAD4UEIn0%EGw%Yp8SFkHXp2=aBm{F8f30^MY44j2nKD-KZ{Cyy|$>5ys#!YP~)a z3O3c@jRahI$Dz=J3qy(OKUKeodptM@1H65q5UwSJ>gpOBf_1nR&8sZDibdBTqLyXU zn>g+IM_%>eeVZd#g{}=JlAX9U`rWn7a=V!CA`VB@;%^Z*+&x+xN(4vQdfk_BMjwi` z#j-fn8vknSu}Cn;6F%G%yzF&V;M<6i<9HnpZxi739_AVD#&m|KjJ#L^NcznN4l^40 zlKSuWgw(N$W4IflzK_dKUjd2!oGtv1eATSyMftv92V*ce8CGVj(^OO$vP5J8N z>z@q6&r@q)fVKCFj0$ItXDNMCIHD@?tWcme5Y#M^4B zTki`T!L_f_xgflU0FN&!%}D>NT5BRe;nNilss}3XUvOX55s*RpWxe*_!FLCcCNbxu zJNsq5BdACG*zacohw<{H&VL&DPn!0h3EW?CpE^R~JGR~ESM@ksYN~<6k&0T=?h)jl zkao3#+^5uol@Bbqzv{k)M{sVbVXyz1%MeS!?fwwkY4XAU;Q67ooxA?NH6o1Pa!?#OTUaX zX+*vy{5MQ{(n0w4NQFBGO}~e7)M=@y#o*2(hhxVRJOw=Avpx%IVw5@n;(9(@pRJ4MK|e7N$DG{3&p z*j_}vhwRvr^N%eExTNK-=N;!>_@wjCYg^5U8(V4~ztNl9m;Y4rAm`4nw`!4ox)QRA zS36b%E^uu91qh0t7deNl6MPYUBi;&Le9$*gj+5n2qnxyC!yJ~wXa&dCntDh6+;JX3 zytQUk%cldMDiKOsXXSr!oa1j%=V{bAfjXpXd4CqCU4H?d)#GZZ*_bG=CVWNQ`Fmfy z87O>}jL*wg7H05Umj-k6FE1VDo2NlvgJ(ICiJFZro@?-vNYrV9XZ!p-LRsOMj(-LB66bwN+K%4pMpGJ8t(iY!0kmh_~ zTr^_>*FP@8eF4l+`y*@DXuqvuJ6uKBEPoN@O#;XBb!=JXIpFPhS zW7|B2eB#wwQ`u_$8jH(wC`%f6;!bFgGA_bg@eh{PrM?DeFLTX0M^LA!4E_qFS@tx_ zh=-o*!xc9FMdUB@<(KmS@p}Vr`tj!D5vf<&zbzlZCBQq~a*vkf@W?yu_=pfM4ZbWg zcD`B#aY|4Hlh)_HwCPgYs?rGM6Zvca@HhxC4H zkNR5{+_7ZAz-0?|T)v?HiUqyP7bLGbU-*+X1Da3${KPTxD|o!;Rf#xpW4eg+BNy>a zMtybhg+k}?ORW23C4Nv8b=&B>j$T+t5(oSuv(s? zyQc2a@qMb{((!#Qa_RU6oA3jrRz5D^uUR^5T!)|Bv~@3Hx5<+O>jTa!BKzRqw}89h zBLU}LQ}=vvY^!O<9M|F@+>;*-I9%h+=i`;@A+~uDKVQWC%;Si+%;T$3x3La?VE93) zvl9NC=Rnt*a{j>YV^Ti9zegDSA>HE_sAK!#57u6+AO2wMh5DgxXFvR5*8S4Y(w6(h zR%*S^GX5;8hVPZxzWGC?4@tXH-`B$BkAcoe`LdP=jK5^t@`pGt)|Nkad7-wot@F3F zu%AG=#<>(PTh5;rq+i)C22~qPa>W`$5B?C~h2_4r=0WhRt;?Uod+LI`)>`v4%E(8g zC4WSYHq_FGzYVv`(8unJu$*=I>u(#RO#1`0fz0QRznL}RdCn6ALu?@HwRYnd{G@%U zpOT&_rY8!y$%%r~)}Pway}75gqkC&=Q!<&@lIrd0+SJYbw!z_as$&A5Ihhz7E3Met z)3PPCWgxkwx8Et`?oOwQ&U7K28cB~82Mahv=uFQ>bP&}+Ob3lRXwpHm4%Rs{UHIMi zp`pncopBpGOLh!wNu;`ZTDPRSHVx>4*2#Sn&iLR=Dg)FC4pQknJI=E~@0RY?Exo!$ zVsoo*k#bTUJ*mRr-gF8Vt;^x|boVf;ub58{j`yaAQ%-wFcfSU)X?uTiLcym{94w~wXj%q`_wHG1ic(skX`d_+ZgD1r{xr`dSbj}t|F>#>wWyL-B~5dQYQ(aC(#87mBFp2L7z@I42xYDyS!c)C!W98clP zekpv~57}#?ZUiPZ3P9vzHLk54#xxqzP%x}*x}A{&6WIEXaZD>v*6kK$X9gHz1v z!p9}^v&hL$jt?>ewACYahqS%B1L7oDc5dnIrd+jdY1_0t(eDfvCo@hymmMvphR1SK zOy`^_e2r_bgW=>_(t~(gDLdd#>~vD8iK(LC-;ygDG<>oFPEYM{Mlfsn+*EN=D(*-R zBc|y-KA6W;LTDgiBA3ZDzMnZ!wBr{3ofsU)kfpen=*j3g+Zb>WBq*eq;}Hy+Q^&CoTX#a@J?)!Xe1mIYX(Bh2AI#6r z!^8Oa5*D;g)^F)C~6VO=39Y^A%UZdxhx=-sJLA_AyhSm|ZIO3_n;%LNyL>4!V>>ZpK zb`fVS@DILUI-J@&h*>BUo!QjXRC-*LMqzqLzKtc!-qJETlX9l;`OK7LVxaik2`4T! zHCf0NVJylh4^eeeoKy&|3=t#~oH!j+C@>0H$kXH$8>hhL4m4-BR{n9x2m(5j#Zk=b ztf($MQRJ%aQ%-(zpJB@_cTK|vWubKNz0blZ`Y8$}v-t!@m7dtbuYO7ndl#lNQseT$ zCNWxl{hPX5H{qASK}jtqx<~Y;6+*$`fSo}zvXpQb&$5mDY|iC}r^hp6=^31l({AYY zt+~C<)FeiOk&L7>gVSThR1tQT{d5{#+C^L8q_jvD91yOEZ_$pYaw85tbUO7ue8?4_ zyv0Xx%~xEuJuo)~JI8C?zl)MA*tX+LdVtF)d|zbS3< zWCq7`W3w7QKv;F<4DKDwjSb?J#}rkG;o{`jG}z0PMNzn2;1ow&Z6V1?fx7LHv3ELOtz=mdV0Gy^~03*cWp{Kh0$C_hSolrg^~!z^V-Y^d=794)`>jPR^Qa8lC~@VrK17!PD~gu+hb66s7a zIS5L-Hl0!+l4*67t|*2^*Cc3|8SoKeerCLVQ+MC??ybx=3L9;;8PwBYJ=eZ?M;~ih zi@UwMt)stxORFcw!(*6ECp9@XlA6q9VCS6~87b%rNpxK~Cj~tVw?H_b^dQ}}<5MIl=qvfm}%~qdIUCt~$ zbFz%)P?BOM1)<1Vb=W#t6c#g<#IqX3QLyMlx?os81xw^pDn{b^j8`clN9vGKIT(^j zGS46Ux@O@APtAx^m>HWK6sGs-2Px14FF+?ugVr-C?cTOQL&#KcY(vu-*JJjpuPs|Q zZ7y?5#8DBDw`!8ECo+C_SJHl|?AhL*=+JJfpSQQR#2TZb(JVs?SaHgy$Rty6!{N~q zo?q}hW`pES4UR;0KsiLJQ3p*r5K6h7Y6G}=dtZM~my;@B)L=wNuBaGxW3`&Zt!Tj} zSPzOW2;53{z{WY8XVK&gP8TQX9Kqkv1TRh&^&)b6hp@b#rQxRUjX8YB7QPg`FLYpN zA_F(PyUB#cmrHFnX}i+fV$y9U+-kyh6Ly#|Zo*C(h<~Ow_jDzD`a1e8q%Kpl+k`zP zObUi@m`u9YgncILH{o^@?l9r)CN!(r)J~JWgYb;;FAQW*(Xz9Di!6-^!)YG_Y!|PoR7*mh z0L!>*#!dFi+XU$-lIbi?84HzDY2=)qdOIqITqhKwRvo^plzopYLIt& zO6zLDe=BS_J?>P2`vKHwba&_j7O<%VM+)YfqLZY7r~3_mQx>$)kD&d!CQ#oxv2?=) z=$4t`F}U>@l8c^oM7SuBO$uGJb#iPBUIl7y;?gZ8v?c~-%bJ8?1_*S->BHHNsRd+Jc1AnjAb!BC)^=!g}0=@|> zJxzCbNkoIeb!ijf_M{(8`rsTSxY^x4b9|nmGou%)sMCgTY3qqc!smQ&3vz030{chO zhcF|_ZMV71GMm#)N7QalmUL+~n!9tAl4ZWTQN%UBN$kW*1bZ)9x0MbC>OlMqy=^Ca zpp~OpkIJrzSlzbRI{0(zgkGM1Ww)-*oG}#&X8=WrHYeNSYcry01W&x(#>^Mq69B4k-69a(V%!z`$V+q zt0+DU0LBk5{LJFmTZ%SW@1jH@?YoX$@;!&G~+3Iiy+g((xPMOyZ0^6u^@ zlTLn|ax4-p8xMA+WCuA01@5G0(!;VA4!_OsymRNk{lxne_D>6-WhzyOI>X~5gL@f` z$$C3QyU8^zmX_G^!RnDgQY4{eQ){YqQ~xIX=!z(D!G!Be=sJSI@A14nw4A+DST`0k zf{AoLUCgXcO>pA{IKl>FcWDX}MO-uE$Q&P$PO+FqzRYYsk2PODKaFZ5;)dvX5@x_2 zMXG;tGS!7|zNEHzrzY}aG^t^JOdc>cr#krKG@DJ*=wg{|Dcy`s1-Ed!Xd*UpvxOb{ z=>er2yMmR2kG`%=IAEbz0FT!6&~!G{Gqsu1oS4jZ8T)D(3$}8wpm%Cny=+YF&@nKS z2G;foZU$n!Jwv;(mF93oM?PtExc-s8d$+bYGC=HCO<;6v+ltK^yIFwlxS}2;S6Z+g z6ML~qJE9%5_Q8n}tRQI$`D;yXbK}Gj$F5wVz(aCa z!8cWCqo+EzH;1jlmf6%D={!7h*^1YaZ)#X{l1XglB2NZRC0tg{4XnG}JsVR9otf&% z*uxBy30DxCRc1y2#?RDNU-^hAmQMCuI29Hhm}(v?S}ZmXPE26(dN>Qc@TU3GUAC+n zE(HZHkNx`8reU1t6`aw*LJAYC&nBU(5TlH4PWACjiYHFCwXefs`S5HRY=mrGr{!FL zyW}GJWfa0{p_tNx*XLEv_^h0#L66-%9f?ILrBNs=(^krIa1*>VWJmCS}1=&@@K)B8? zC8XXz!_>9F_t=!rPLFF^3y>6<7$cASaaP@ixq?l>sk0fGY2&Ij zYLoo*u$-Q>rZd>W8XLU(ZaX^5O@;*qCyF`fUYx!gFjlvUS<%Y13@NM13X}?0~nKHV+gf+}&t`!xLaLa9OXQK4_Cyh0=!?Jx^ zzt4;BLxS=9iQ#4RFbw&fnC$C-frV2 zyv4wsA3Cqhb$P_9c|VPMND?jE-cgyKLRtaB6C8QF&JTZ73a2@)S7!PV4FKa>^M$Bc&XiOGGiU@*4RupXZJ_m4QmlTnun)Ns^Y z+9kZhNs>WrUv_r23N-qd)xT-Ul7-Q3`*EV{tQN;a59MKzAFuO94 zah$tzBYs~B@nNShoyp*r8Vx9mhNvi;X$6Y2YrK^i%SxtG`W)v~hyROXKKOQ42w~2^ z?5yXrr`x;Du6-E_nmu4a^MkSiAJtx!sbz7ZC>Klz#_vtB&r)~N+@8?PG;N-DkEw9kdsSw+oFw&VI$MC-ayV1RX_7tVrphCC!Jjh`sS>^ zcYF8dP1r6jn=`%8w%wP`bKmxsQrD?_G6m&DEolrtjbk}Pt6}%x)=1gZa|A;;+u%7Y zcH&$vD^a*U1Ft31^)ukx_?H~#O_1qX^b>lQ(W~JN*deUoz4O%E{e75?K;;UwruS!tBMK3E&}cC-QHrwvYw|=o$MfX zDN^uor*OTVCkHUH^wVlp)`>U|8%fJXwzuHf;Tx%)95_+=;xN>UnH_CJUGLEj+OUbI zr^qWZkx~`<4k$|Zey^#0ya+VQ79J&xD-NiYB$u^Zzgjc1*;V7>%}|I6!}I*0;f(_< zu(e+(8|UH}nl{{_<8F(e(e(03ubo|9<9-=-v`64Z6g=W>!ugat-4>7S6MH6bOA)m5 z)ZCUCbL#@utZ#Or2ptN;hTW7|cbj}`OF~~}?BCS8bqnkSu1BrM9urv0fhWkzCEVS2 zxTT}7lF8v2H~Q9NGb@G5h%Sh}p6$Jx^&QHsE&4}{*jA=NTJgw@jbv+9-!m{u-Tvs2 zKAIzKH0;@NIsMfeYAFJN^ISle8oYSo+!4cWKb&uU&lJi%y3RY}GaWX$p!ZtX_IMuc zv7b@I-A%Z1+V;KYcPaI+8RB1#3E$ALBO<||kj8M!YH$oYUKp1~oW_rc>su$>|4C(2 z!|Aaxj~e~-wu;7;ndQc^9hpZSX9NS4+aK<0~h5gA$B<%i)G!3V?! z2l17&Qz9d0s4gHg|Lv4*y`M8=Fw`lHtpLdI=B32!xb#f}_9$KVPijGS%&%~3+b=D^ z9hUVTBVAVxoXV}@5iNNPuqL%0vC zWy#JQ&Qu5)HT|_xQ`l+X5tvL|vz@_c3}+KEi9_(7;Op1~kM&qvM1{i>elG!<(vxHv zUgl*g2hE95l?pRfSDaFdp$MYx$loV>EN{uXfMCFwzb&t0=!N!qqu~t&8DR8Q{|J#u zs(IW8s$uI#j!Q*@x#0U`!^W^~>1d+_j`d)lC!I3wR+-?I3dG$VfMr6iEVFtazJyCO zK@6QtWvleyq6+hErFQk$Q@D-%scDz>&sY|_%Q9oYaI>p~^u;K{M`Ya+hV@|%p2f+t zJ2G7I%H?r&lGBsT)7A2@u!P0N0@t4;3IUf0Dw!Q^;n$S5!>Ytg(0acTEv16kWGX_b zD{EpqN$0T@@OG)H$pb!P@0t-y%cOU2kmiP&IhZV;IN1^?pJ0LDkvC;#0(xH*Al9W* z(^y3FsxwYwX){I#$8cYPa9kd1K|+pAsmKhK+}@261lOQ1>7FLeNIx5h&eRN$_cK6V zGXS~3%$UBPYt&aZ&;4Y*!`6m-dVoERBT!yi1)1STn0oJ@!7)FJ!watZ7BCkzyqh5h z%h*IuV=GHMlff}4FBI_H5y95U;^Yi(Tiniz|5UMX#dwv@XpCf)n7LeH5Y!im?S&Khau&KR?0FxF=l-0Hy;<0SWrj$H z&EQsw$-tWr{P7#oRopS({d3YKUDQ`dv6_|Zr{?Cg9Uo1AUT~AEXgI<4wh)(aM+|rr zKmp4YMnrwrudy75zAN%>BW~FU%W+YZD(JTWP}xsomnk(;AUUR4E^FxS%~)iE-atrE zCb$`3$4+7x3@r&b3f+_=@WDok)pZWbQur#GHzd+(-ZDeY_fPOiGs=s#z)ZW!5oDTx z2jftW(fWAR#wI6u69#iXF@d)!+~!!5V3XEl2=4zsl7}n_`QNi!} z1&OS-S1Gr?SQ_mh=r_B{iuj`+eCLZ^3yNfBE>Hz_E0whs=Iw{S6OzJXfEh>?i z56!r~Gz6DU11iN=7>72|+%_sl2yiacjjxCRY&VvCf(w7!#JuMQwUHX)z)Ns7}9|P1Hv%G$B36^Le8Z}l7H|K^2aT9~@SmF3* zZ?1rsoNxzc%AJ+=jLScW|d?H|B%AH)Wl9ECfn0lDb{_JpD}dSW1n z`-Oa|R0bmGmJyUpL5fcLBN?AMx$bSADj*x(+>3G+&`J0#EA#+yOp+ypF^$(ZKUz}C&0IC_q7J|aWbhuWo-Hw;e3p28qCUVRuM+<9i|3>@WR z^Kixx+uV>#@!PAKL-evr`+fu4Col!Noqe?ouX_^UzEQsIt4V?v;}A7-F#rqaHtNq0 zP82{ZGD0fNH|2CEZJMPAWXnXuAFy{Dz+1BV2Rjbz$Q5!!IWXO2iV5b-6RJX~Hy>+!oEhPMX`En!+=~dY;asrEoE)Rr})Db~VEtNf)_t zD`PcJb}71A&0-H}SOx*<>X^t(%67SP7u1&1pTk+pK-(nV7v2nCD4W&;oW!=JGtet% zgcC)bmm0{Ax8r5$mg(U=X?bHz-Y6*-JWM}&j^IFX$TDP{)9grjNYB^k|y11-~d6G*=ZsYP)gSA@>s z5Juxr#0Lv<>TxlOMVt)w01H?O)Bb3_64y~9k=`pDIy8x2(KHtxMFnb2Fo1=Eme);1 zEC`0M_%ApETV|$kmr)NF;+Haq%Vk*jRD_TZ(?oS!aB_u|yhq~7KV}%@(|3E)*vc>B zl{#)U@WLc87{kF1ZXlIt1$K*-!Vqu7@Jj&L!Qp;2E&@Q`IWtD^&2+(i#8E2x#+nLnq>>7o)%dem-A!7YCaM$vAo7Y7;kW zaj=Byawaf@cc^hC3Uxh=r)deTIVrd2pp38vM&sS+)9kl9c)i15sA@3#@Jd==UaJ>JSA4F z)m+ig66=7U@$T-dnOn`|rE~)`QqPcXM!K-&W#q=xwDcL_B?w-ewVniMgG=8K6i5lK zdEvFcGMVsnnK;#2v&XFMX>?{LCJj%4(q_tEO$gFT#F&xZ^>6Gu(qWwHK-#H{XPG{H1Q(NOubQ!Z(`)M zxhm=015fJbc+FG{i`KDXjD`I!xxj^IV(fEyD3Z_{0_;istR7TWhw1?twlvWPtgwdVA z`<|kEH8a9$;$%c56&z@r!$&dZ8cIX%ypunK#l#7KdWUw``=aDkw#Un`6h!0o_@>0> z&?M%0DHVz;r^Qd-ou}y%oSX^m9JzdKIbT+$&~Q|?1DnOy^RuG%{*3Hq@L>%OS}O^M z=is6swRV$PoS|hD=MYHq77yGRlHS@+NG#M(|D@cfcZQ}5vyOJZG$-5Vv*tP9`RnIjc&|EEb3y0 z;~QJ=RyXEi8NJPlyb%mAEA^;nf#rI*Ar$yeUNAC@!gr1ID;TnW4{MAShs!n|K=A}D zi`y55d^VU13aZ9ZcE;*}?4Sn?M{B0o%D2tRbdXPf5pV16ru6PRE)1l3LO25_22K@> zGB!lhqEI}-TDG_dWFS{o>ZvYvTcrOg#M89;@AE zGIV3H`Y{~sxBHv8{P7qXm#1d!-pGaV1M=EEwHxRIn?)O&7Y{TB+7ZP!rt}vKE1Y}e zONK?H5$6XY-9LWS3g7c%z~X?j-4-#)?|iW}!~HtGl;J5I=jXEIk9GMyNkC%o7#`(J z9hf_g$O$|Z&U7WiC-9&SgD3Gw9fa~n7;G4Dwy_*vl4cbD%AZ%->y`GNU)txD_Sw>- zh&+O)!nsRAVuJ4yvgRor#lP}*3jaQbhht{=f{rg^_>zvVV0cc)YZ1sF({JEmJBDxS zcqPM?_|BN0>a2^;IFb&C$se;Wmn?U@UY0vZFUuX-Jh0duzK$rUFs#+_N`?>VIKPl4 zf2_M7j}H}Q@e6D|(lhI@WVxt#SuQH8QKJkNyE}@9RAKn2j<06;W;Lh(9)93Y|FQC8 zcz_FoGx(Al=7_-xe2_8V>|pS+MEe<>SRlC!@EbX-%V0pFI~eez>BwbpO6M|QzsU9X z`lR%_jlnC@>vjTd$LFej(m?cxY{2P#8NsVM%HVlvvx9-gbf<^u4iD3v1p1sH-OE5D zy~9I#r-$?o59ysA(mVV}KOqS8G0>!Z_@x83{3J4o*%Bx3RIm9!(YfhEE9We#OPsx4 zCXptImpHRtrlq;b+$+uPm`a-4(UsJ+<1Fdjj<}?`9eYW0ONEk}mL4TFEoDk-`e|Th zvl860R2XM_69~Uv=3qO6jd+wZeQ<6Bkr|!OV86|O5Rpf8K7&VXKF3(bASC)INLk@T z<`}+&9+mU(n+GhBBw-t}76F*Kd$VNj-T)}&6i);g*(I0{5XvLMk^>~$E5gwOE5OYO z;pl-81VtUSGXvKi2BEDyY>UH^Fv@`l^6vcpu~W%LAO^9*iIxdf?RgR2DVEnVBhSR z1r`A*@S|Y4P72ELS?EBHs@AQZvq-raL7+1rnBBe$!BaYV5 zT{u33&mOP{yQMy?&mOQ?yQLO&z(kDlFWP`12gky-1(z6 ztCjit$Q-|!%<6|YD5|65#QmB_zsSk zn4^LnK!x)W{8)(oqY^y>;O8rM@*i@oyg=o%J;#h(Z|Ik<++PF0vjQ~9Kui0>uN|{&Z!F-21YGr@#GD1= zW>^%Cg1Bp>t4}0>qBd-wu%#TrGCWnzKBxNQ*SXXsOOO}9GG`7{Mb^3noU7A#C>jix z3uxEfsKxj`jt6SzsQ@E-GPYCt*%vIKRm_O82lAB9K2l9h;(_4qGHt3HRoNSG=2-g; zJT^_G#nv`$$HaC;JaE%CFr1NieksF8@xU{%pb#aLR>2|3;9fjz$WWu^dRG=7pPguO zkt)fwn3ZH&^a$0#x6|p(Fs#(^)eNh3Jjie<9(Xn=i$L!#eQ%f<6H57;0*flK-8ZfXJnU6 zFhYV#iKVQCKq|9WDP)ASwuOw3f#6ce$U}H+A>$|Tpl=4hF40{K9>*h1791@+5+9>ZomV4wV*ykbua5GzA;7%Olcdl7a5sWzJQoRIA%C z&~3IqeB&is;2wE7G&clx%bfM^!g`-mzlBsE6 z>6C?b6!<==QD<;cqPrOUCp?(k#}5+dDWQCl!8awk%K~@>)&7UHN-{W!Z=R!v7suxq z`#K&Fk^!l%3pns6F{wJm*w>O zfb(+<#@qsuQ+9wa0{JsC4%abx#f%56#=-cQwN>yMNFp$NI}cm3 z`3kfHbzc}~)d6XB9(aQlY7(qYu{uenQ;hwqCY~KCbz2h#@(3Q-TLxqZ@CFHZMn@Sm ziQsQ%(66JGKz{XD4)#s~(9b}F?I&0btKWmwe<`pY5?DJJXjnTuSUWseJLZGMS!JUN z=iyei;=D1=2_~O1PA(-gGEP<`|4DtreT-Y)Bgv8i56dxxGk5~dPFs90z#hd@%CIA# z+a5f~Ju^|o*ds#8ezM{K_}gbzEd)PtSE9-qsg`7*RW+8Ew$~A49@XWKnsUseEj?p~ zs&RTZM3QKij__6VaTX5*=*T1^)u1UxWl4*ur7WVfH-zCE_N%DBRI+-#Qg>hItSPN< z@|CQWl$w1Es7aJlI4D|LE0I1Ag1e36L5R)~!YYBVs}?~}Mv1%H3J*AvfrhlxgS69ww9|vM(}UzP@^ffTWU$&=0en{Dslq~T*12hp zaSizn+pn!nrd{b4yH=loUc)0ijbcLd&HWk-&$Ag8CPVs!^otpC9}V%9%(s6KJ^+$k z<`X))616tq@$o+^CnRgz0D^mUl)3irWkj$6=e2bik0s0oI6_V8D8bC==zatb>Zpa5 zL}U~Xw}tKB8AM*egI*YDklP88!}6_no;0Q8H(TuIJ(jl0n6VlR0!)iJXk08xgC%+ zr||gZl3Cn@Ko*0S&o4C%So)%rx^wvylDf2yCAzJvAecOZhwR4iRUKc(@T`unV7Ls+ zchso`vhv6DDxD`Gw?0u$j&;jdBM%q{5wI9*SzF2<&S7?iGbQ1ADc;qNU`$8vMZk>{ za1MhY*pbjx--YNqyUM@aG8#;Vo1S3egskXZxv!dYYhSx`OGT zL8C;IsA0}JwpAmFU!-Dll(~N^5Ch5FG$N}dtB-;1#9aiiGW(t%g(6B0>rw_UOZ0Y1 z21O0KV+=Gz*I|4Jm5$>f-GV6Ih{tcy`%#9b$Xho@NNmnHv-!vLe#yH>!XrAqjNwB% zzJein+Ru%a$4U58C^KBlIgme=Yq3Z&_&y#Vm00^VJZ#PIoQ^MJ_^3?rJtUL-vF;mq zKr;p`_NlQqkyR;KNeW24j@q{UNRH|(2Ab3R80^DSffK_A5t7{jox$fN+Q&e5B=jRV zCLhB?lo>v!v?ri)!8{Su1L;8}p;st;8&s%yB$_pAY+YpmD+7zsSq05eVuV4E$X zwgq`?qg(76U}C|2Ru->8NQgc%u=_D7zDL5Mj;~<&N~Ms*op;vdeV3|Q=QK=vc+ zv$~XlE_El1$yYTz3Awcia#JhFAIskqfJp{s=hK#+MOL-6h|IMj)Q1DxlZXzO>?wr0 zl`GpUx)aZ0XWB`~nbnis<$SpY@F50>Rb48E^(Eu3Z8g&dPz$;jM`2v5tdq{}cT-Ns2a9w;rfjp08gstDyY zm>=ulR}g4~TsC0o3(|Uf5F4ivJiwg6bJAwJ*T$van<%|pN|OvmB)XFoU)8w`bU!Zt zu13}xUCKbWarc<*sBPE}sy!%_>t%2h4y4tJi+HtnzJ|lUNVMNEP8II_?<9EyG>#vXQ^W4uEwZ$Ag|2u-Lc5$I`D$={5$s@x!hP z@EZ4ejpr%t^GaPM_X6Opk$s0f$XX|TUipeI$JN3 zLB{47eo#iVZ36<0zUT8Y%{>j$iQ$NjuVxs*G6ve=j0G!=izoo07_i(&a)LT8rP~WsVjbL@HieA(jdcAc);8%u>uRqlCGCQt1QThL52yP zeFVW#9kqja)PoiAVD%AJL~8aiXvc%zA`CUGKEiqwkI&gX3s`K3{gn1y2w8=3+ZXXP zFV#aOHzVd;mymD7b`^shegy7NMl@VWg z;yJIqOBvQbCvEPL@C_Yb$?zo9MG0kC`Br55D8sC!lC_NioA@Zh(iM``%Rsl?#z0qe z$-s)sq+%ZfUFr^E7qWOn;U~0gHVeGfUr)(rpZM zsY^|k{zOV$Y`m;KmgolV0))wgMnJ-(j@L4Dt}I22b$8(bVhmX9(^D+XO6fKR4@%UV zAS55cLqp2&gcK*AM(~1;GWauzZZi`g4NS!+QF7sm?2J$=o#GkCHDyGwQjbBxY8_wA z@SzpL;V;^*WHcW_0S3o_Fi*K}4hS@KbK}BdBo>&te>|Cq8gD?myi*$8;+yBM+{q&ST>hz|&vPcDV}m35WE4 z4dF7>g^Fc$_Q&iCRb@9|xcRCQcMH{G1fge(c09_-ADm-^y%kL&nq zh9~eq)ttDIk)_v5;_(|TZfyA)9?S{@mitx_EIlcu+ZgE955Mtq{?;!@c`pOq+MPAF zeoRXH7`!IYoo^r*y@uWFeDONu;_>aS`Tls9W96R_COZD`YHr1P`e` zwGt%6#4$&dF&!kh-G>8F>>AP6kF9 zCNUjgDh8Y#+yp-D5Xeh1b4dn-hqjNqa#?9AU#LTt*9x$QA34ZK0uRK10XqV)Cl300 zd|7&AH$GV*pO8luV|OF*0ZksuGsuJR>pb$%DKz!hb08j^#F9Ki4sW&#ZwNDTv^WrX z12;bG)H7lJo(K5Tc);lG3}3|qH~9^TR9~wLHXt0q147z%zHZL>yE*6Y1_|@$Ro{PB zsy`}NA#og$U&jNb#Xw_=d=FbD&I5Dc6<@DNc-5IOe=h;&DFDR*%c}=mezLikUI?T9 zdjmCBp(dI7PK0db8!d~1rg$U5T~h42aA(k(5R^0foJ3e317fvNJXP47KY){xF~kYk zrfu(>%O*U&9+|ZQ4-pC?j7V{>zlAMcjUrZAfL_+G_SNpQwHacw1i&{YgZ@n9Vmm}8`<^N%BVL!vtwtN;oia$t@Tjn7VG%in7JONg*j4DQrX z24i@jRh+5SRX5G;N8&ghRAaDA26a1wRe0QLD3ZT5_*X;iWkA#*#0;kJEOhc%;Fmz{ zJ&t^$hiVLJ1*)lrBKadI(#+>bds*%zd#Jje(qm|JTpI3Rph@5olv$)Rz%qDVqTBJW z{2j-?I?L^WwNB%~87HNtQqbmH$R8`8!LtBcWd-LZM$h7@*2zUbxd{pRBN{bNUiEKlO`@z)5FW0KX&;0PXg6@fWM9?|(0dIHI#lC^`uV|bLaH!#Ntd-7SrRwP*+ z1Yn>6-Ok`R9(QsdM}jTg41ZSy3!}~8gw(-1R-9t5k;(8k8j(h~GnkU-wju(JojZ9% zNmuN*ZM_D4Y;Z){_Ay}pl<4ScS8);CNjxMo!{>Fpmf?PE5hH(%1+l^M}hT{dG?-JiD#eHnSo$IcIfT>@!x5X*T8=d&QpdPK5Z27CcYo;Cm>2Cv}}p<{#) zeTY7RECS@21;aP+K+qWInl3loi!9by>`YZxHQqe6$~QrTat;r;kO7Y!NJ`!sV7yxT z+{S=FZIK<+3utm$TJL%pf$rDUPVAF4d>rmI=wpM|q_mF#+m=ZavsU6ENf|z=<1R^A z&XW}%d|o~t(OC@c#RD@Jm}7*^eN|hLJSthYGk6RSPKuzk5Ybg{x5M0kELMkYW$=iO zGB}QBAq=n>uE&vJOE<%|--t}zet-dcfD|$~fkz}w^cNDkJ!H`@MQpSS5Bg`o10CoE zp8se>U5a}Z2UwA#2FEaX5Dz#>%`u_};My1uW*=eh#{o)^jNBC%C1R88j_F=O-M?6=$bUN)rsj^O-Mt#oQBpqEvF@kwozkk zN;Wj!&-eHIxzGD*#$z|Tdv@%_hMW@xuHZv{n?e&j!EqV6T{!gq9n zheUEvdJ(-1IBSu93(ixOK^WDP+?G$EpEA=P5ot-mg%EWP*`ld?MZCHrs27l}nYv#@ z6*198CcwklWOk#A;hCl&*C+`7YP7zVLZ^u+2DP_`SmG5-zSZz2ZuBOpP*(0N<0uA^ z977%3n7OZG#9_OSsFs+?J|~DC=1X>uWRtJEDSflqoDpdO53@~sBs+ZFO%+Z#U8tqZ z|IS0sztwEIMB2c^>~J5s^YH6#s?gzdmHw}w{*OEFMzc68q6q9A&f8bE+9_0XJ#2d$ z_p>)ua)X31l8Gk&Jrl+2oJ1QYIxV6o$xfT= zOjcw6_3RZn1l+N2l*BmG*!8#YcBXwIcLAwYL|=+gYQ53H7}ryfXB5QtV(I*Qg1-h^ z0c7uHNoO)kWYq|gf1m|XI!k1-VP)zXRQvyR4& zx7FX&w_j$#w`Dw)JVEy#bMnx9d98p~aP#!;x5eF$n%)F7Vxs!rv68gtV0A@mknto) zMogl96Ll9Ma!FEyL~>AS5M2PI0Fh=3&QP_$IJbEF*MYvvOnXG6rN;{4RECg^nYvfR zt2=^v6xpc8lV^iO!1D5uQ&O#;@N6wM!GE0vR2d{TUJ3!m0Q)p+XHvCQ_NdQi1%d z%%)4E8pJfAf*Ozvbny3SLf-eS_Ol|2U}-|kNsy-rm0YZtCI%4=0Zls55yv-*>c916 zX+p*uAZd$4D<+C*LZVp{ofdKb^N-uIZA5#f?G@1{1T0O6srY!nTr};Isr&drpU52$ zv%+2P83keXsHO+ggskp^BuxZSI%8xqO8|!SI>farJ`XrVTW#8SSyr(H zl&6UTl78?~X+mC;pdwAE>4!igCaMoQC{2hq@GthV9fXWqQ7~d6(sL$Vp@*bCY3ew7 zGCKm8b&AR*$?}beT)|TShH|Jc3Emrm^IgZ@6Fdirc~C}O zE^g{45siwsmil;wWXzr}lBqj-5v+n_cREFJ%|vHK)euii(wAlKo7X?EkGHPtMh)g-- zm~0ic-Km4OL@g#dEh3L(uqF^qxF8*(Q>N|~@v%EXpb?o`pr=IK=P8~NnFjhuoW@lj zd5~u)2k)e!PE{lu#MgaftUZl{xn}B8OPRid17Ax?LaamuD!4W+WALs3O@g3>{^|Afs9r zH}#WK4%<$2W@BHQ4%{=OL6kWIPLqE>iUxv1jyu`zihd3M+Dw|0Z$Szkcn+EAPGerb^QQ zrN~fys#IwLpcJX2zT7jdblNKI7Fqmu+4qX5e(dLbO_cPXX_O+q89_~CX>@NG?XoU7E3$|+;tA0$ z3vgDX@Lf(Ux(T=fh}1DOvJSmbLrdN8KdBE>Y*=fb)HzSt5IlMPJ9u6Txc%AxPB$8` z>IpX+o?PIciF*L48og>wcv4O1vTC0kg-knk?hOP3*zUd2H3l}cWs}OctpVNYqkW+7 z`5Zw{(wOusNBY1>o#`LDDJpv+HP9?KNHOSbAC%NsrQot8P0wAs1LLYFR*C9U5v&Ih z)yN%AwPv4HT&xNsWv-#YigySQUcV;B2fuzz0TsnGHF+GH&1#`3LL3c(pECI%#Icvw z&(d5QXI>aU{=d9&%{~yLF?6M{d|XM@YL>ZDSRk$xS~8N?)k~OBz>1iFTzBje#7&ae zf?)Vc9!0Rn<9~8DgF_+;j)^E#s#BN(^vT_8V(M&7_BTNK9V_CdX}|iQ(;Cw+qT09vXx^pYHwnbnn-6Z)DA3umRa|tjJdZF*dFp!Dwb+qTU^I ztcVtenP_=z+4ATY(MmD7`v2E$t@O9DI4;-%>DO9WcC3iji&?M6h10L~^IupzCQrLi zW2X&(sPE1>>&|HeOlOfDfFrXXMjdJeb*Z{f-k}>!5js+e(2u4FJt;-#NK=F5`askn9F^E`DW%hLKl8Q(!~o$;Gjcu2-+~Jg1osZnsYE7U?iH z-f0Fyw*+J>gYpHTaa1sCbucMAg(*MU+(pS)pWHyda!rgpA5r1NjkRk$VoL(7Tnl|5 zFMUD-uhnZ}yw@sT`xRcRWnPPTGWA4M8woH}iZs-fBv{oXV{2bpy%)Y%^wYs^4aYwP zT+H&&J*n2U;askbn-lpu?b%!#cUt<`N+<1qMfQC9h_9ctspZHx-hVyo%m%MJR2Z~w zxPn3X;OP>k2sU29#0nvbK4&H?22VsEGebXrO^iGlym^L!-xqrG%_P8l90qv}Ij@Cl zV!YQv7`()5q0DOuPpeBGM(eT=#fNT+=>_a>LK{_uH!hE$PrEVD!ETx2e=$){s5IF& zucB$Oz~^#pK0s()wP$nf*%0|ITD7ubfL0MHNislMIJ&kZj}n5`4M{L4A0TZk6v4(M zn3N6BHWqIC(Jiv-jOVY3k!LzUNq~HS9c?zG1s0@X)-`nXr@hjF4vw5Lr{&zReLtqo(D|Id zbMjLVQcg8O2TBPq+ ztpB@0ltlZWDE3pZD(@7H^`Z^fIgu4$|L_;%2IX9c*^kIgjk6+4fI9?{HBim})XFMi&lI2fXsVo*%$;`X~Dow7iJ7{Z7+n;Ou!x`A4M_=GTb`NwOf_ma%^a56~$f?^@k=UzSU^@ zOxu-fq zKB;Zx?}kpj}bVoRWh7&Y;G8{qpUkj z+oKALj+M{6V{@OFGf$!EG_C!#yQ?}jSH%sWr?8^ceD)LmB&;3M|5Lyjib&12#8mvb z1^yJE6>-{l%~!F;#WQ-!@zq$`A^mGW(tEk6TN-&J`_>MMy+Dl>ZRPoJ+F0rJqaOqm z`7+=+{W1HDYqfo@u}j3c6>CB}Om_ zG3}7;1W<25q)r|c<=Sp(7fstM;tb*NdXd5IGTTAmK z(3yzVIle}8#PM~`*)8KXWSoh}hm7qJk!6w*nkYKM*xNIRW`XJv)d$ewt3zz*KL;v? zPwPi6qN|RN&5>&hz(qvr?;)(zwo#v*RA3 zBj+IEw6Qu(fj7FY7ilrJSL87#ZH2ftwA{qq4wZc>H#$i<9Z%^$0%)U%)XDj)I1O}$ zqJCyni7q*LJX_g*0VHRei{gW|Tok8VE{bbHv6o$ZqbrU-DXO$ed*bwx?HZt75vh|i zkoHR^>K1X@*x|YMbgqpZo@-;n>byZn%>=KbWX_z9t#zfsB zP8%DRYftCe*sxsNlWY4zy}C}cSmZ7d7dhT{sW=LB2BJmBSBdIhxX9y>%Jy?08B&=n zI5VTGj*t04`d09@fxOn7r_oKv$0*W&5hPJ^QCSpc73Y%rpbF^hM5i4eCkw@_ z7Vy9IL;i<;Q=KN8WMH}|_L}Idh||V_QKUBlUA{$~I*yErGp2sQ=)U7){n9U)tmWnw zbQ>fInNnHvH4>akgXo@{c5Si=M>`CC)DIbS>?lN*NzWniUqbAbw%N4ZA}-`}GKhy_ zu}zU>y;;V-Rln7n_N+*|u}_LPpV$d9bfU8gGX|1`FW*L>M`NenFvi}#g;Kjop7Row z6d|`!pt&*$1v?sO<<~hUsdb&>S}r0>o?2DK1Q~?-|L-~38L|%e6l_)K z0y%b=`g9kh&#|kJTgJx4|Kf&2aj%hCH3N_@Sz93SClje9vL^aqKe1m@43pKm8;9VtgcFA2Le)eu{ z;aHrLsd&CztbqK_T*SqS*)TX&WsiLAp%_XnlA(4?p;3~lG1WE`^?A?GH0EaM{cnhd zA=#4;l=ByXzWB$46uS)2gs2A;?*XM=(IdwwDr>ia`{hH=N3Wj>@w zVK+Ehpjj+f79!Fow-$;k@rms8=c{@?U$x0sGIl{IhcF}FPM@{$CP`YIL%Ra#yzsMu zu=-X^0l@0pCX0>@5moDTz*{Ch#(O6|4k+nMM7d<0(pH&7;j0LABI9KhysIKa)0cYm z)tub7i&B4?WSY`UnIw20BCWTM>DABuxju>`qyCWSME2C@t3Hv}8N35kW3-FV7>S;A ze52?*gUzrUz`8@mx>hkPBGM=S3XrzZv~h_wQT$PGJbS)H)J428UxK$o7w1!eWGCYF z>*adOe7*V-qN_2UI|9Paupjrl}%=kvT=mymhtX))&k7Uo+oOtXF ze55!3ynW(d6DrVD4o5R_d;{u|_yxtk?cx_i6`zkh7EU~$epk64t4_2e1Cf5f74(?> z%<+noi>w8Cs8xQ0fPaDJzcCVo^o1$AEWjC&CC7>=o?Q^ds8z`&Ss`o8^xPyw)h1a{ z+9AL!n?W-R^rIr5&E6E>s->rK{*dL8vlgMFaeOjp_YifOs4s|Aaf^xK=4ctKWP$m$ zv|wvV0bjvaV%y((Gel6(WEuELp3i*M;3|#n(3)KU8dA|E$2W?$^L?SR>?Gr5Kz0(5 zKFLnfuA4Syr&|?8ws#p@FB`h00guT;)|k9h(B+3EwonrDalnv?_^R{d)qrs$;ABO5o!@dvjM_qwt?6i1;A+ zuNo z6eJzNRb*cT%5I{*l03U52GugqTv0|7?Qp@`MdkQn*)8#}2^FN-ONp_Rhym_6gMx$zz>?W=DQB1g6G<6_kH}TFoW;a>ZTdbZI$gHt3tBg?8 zhLGEWa89at!$dK=wNgx0U@t{mnPL>MBD*PQvLgH>&u6}BP&X%8R;!~EXh=o79N#E< zoo{B9Wj7hm0T#T7^htJ;cF?pjyY*3&C109t5xr^r^DUw-dXnji2$L_XdVQX5rqL@1 zU+r`|tq?J0FNIyMwmw=ciTNU6v_yQkyfcVU@nOGAj`3u^5j%YOJs)YS}C#5e>GAT3X&$Lc4Qv`N=~AiF2Y7h z%x%DBNyJy4C#}S>T8@1dmR=F5#>Qm{7&XocD=@2oAR<0UzLirDZ@gZTvA4)iSr+;dFI^(i;Hp_H ziFphVS;Plnju2$WYCJ9C$< zrIMHtz=9C*L6%}Q<=Ju!SDDdktEI#~&)c$4kThE^Ap3csY$@t1$+Kc&P%VQsGv=3G zpm(WGSy5DuFP0S(|C&%ix|LfZj&DF+62GAM`Z_D|3!;kuU{>70Y6>mWS>!sftT+d= z=j0;#hHlwbPJX+9yfzu{(}GaxP)dD?nthtcj$=g>&$e=6)T(4FC$CO3J+}f;wMjaZ z_5d*9*3oQ$kPgK=>zKmy*1&cP5OYpF#W54bbg0@~2gG!!Dzx7Gva5!*KT1xEmlq3rUNmEi4b-W5FC5ie<@|2VqRLh{=jBm7yE>N9PlBgVCEF~rWHKBqu zCDjneH=r(wUr_uN7vJ86srV13q*GYA??l`8vrpOib9dPe4`4VXDZl9hBW& z2BA`tlr4CXZ$#Wzn9qnPo~0x)YE_bwK;bV4E#rlqTQsWGwWP$m$v|wvV0V}eTf+owrPx5@`s|HtTY=_qD zB+!tG>idT9jiL>&RZk_^NyamP>?9(6lAWZTH*I$qrX`AB1REb;~xu;>6(C^G3{ zFO|g10kWHj55j*8e5=Z{+YqiYv+S1G=h;mb3X+cCb!1-v%5I{*l03U52GugqTv0|7 zZF0fdMdkQn*)8#}2^FN-ZJs#30d-0Ig5tNi_ytkLe=xgkVYO~u)GM-O=TCOK4O52) zvs$D9lx?`=cN>&tw;)t@lXAlXpAk7}vCfDno@F;NYE_cmyv2po#W(IRNqZrG*QfMs(8Ufaqm@2F&u6}BSO-Zvv^ttCEAac$&=$uxit0D>%d(q{#{dgn?=_G<$!^lNo3=aj zfnI1JOWkXVmW+SCMbt%4GF>miK0x=1czvF3h7c-9yj=_tWA;+mneVVZS}ckA0wA1- z50`hwG{%e0c%>w!-A-5U7l85Rc^Z(pw^&Fm^7iQs42ys?AhPaaFO|f68PE_BAB6j{ zyqf&czy_ZBa;RkiG2VRD%m-Z)^OPX-vQ~MEyj43`>;hUPa^PZA8%A7nXJ zQ=Xje<0><-*IMg)MH+!6rzV&wCl{Fs z@~|4@Hwb9)1JBNaPPt1qbr$EW$cSS_6xN=diP1?V&(7rKzL|Tj9j$6la+kEDfJqqM zr4e#h7nVh{?g=fO#B$fH<2GoGqC4rnV5Qoe=v)w06UT{StSPLLb+|~8S+rKkv_>`(oUPUTSQvs zT4y-D>&WD#d?xz4#y{U8>S{{z**wBUpnQ<)^KFB^l{)tqr0<=e9@moIP?f%px@z9t zBEBW@+1VyCwIC+L(43eI)uwI2+XX|+zqh)2M0{KGEOCT!X8JCX1Are{0!EFq!Ys^n zz|e^JAo*5KLA>#LNygqHKV@0y%_nq;NXC~%Z7zs;jeUW%N5ltVju2$cYCJ9CWkpdrzF1aF{A)r5=~hm^ zqv0D+m&7k9zP_1D{DP?BKbRHQuyQ|!(JL|rEGrgaHUQIHKb_>e}3-DxU z^%0^j6ZHj=YI7YB)1j(JmfZnG=EQ<6D+R2`eF~Z^13$C#>7Li{WT;e2Vhd;-MYkQ_ zD0=FRs_un5!PeH#4hnLgi1bPBQ>cB@#{Js?#rM_Qlxz`|M>=B;(H}V%5m(`jd^t(4 zpA=y1YjAZH#uV3rMp0wRQlX#k_gWu`xeOR05g$8GSp|%X&Um>bMm6BMT&nj~Ss|Rf z%)P~WYLPc~2#e2vhv~`_Z<(JzroybNVX-9UCZIVYJ`|tS$ScbSY7);S=ebf6?GN!SEL$4a?e9IYhbzn^G~EN$it+NU$yz26{!Jbca+jgs5B&c z1jsQW9TxVCh(cQ$5~BttX-Hmb1wZ7}6tz!<`lWT>jXx)?+Lt6LX=ebRugJAA-AH@V zv^~xEwSbVq#JgBAg~_tZS&OU~8?%UNas3y=t66(y6|-3{#biYmDcVXEqkt9JOhJ z3*95)tIm_1zU6)kaIPZz&TqLSMr|R;a_KtEGH^*^ZvL1GK2*L-Qz-AUZZ6&;Pc}PP z?1GpGRk#D#6^R_V+Ii9j^Qt#V-Xr3pE|!+c8bT&jL)HNSM0}0;RJcpjS|V^7Dlx<_^5MdkQlzD&I967Pb%_nmh^)O%Ot z%OX}IXqm|(6TtH2B+RChi);mX<`4Nz0B$=)CP7)glwLyROVLq_bw*^}u_6j>`BID; znB+@&sTJhQ`KXQgQrafdo|9JXOY)_(hk$&UYhyx_cFMFp3-~R9kT1o%STSG9a>ZG1 zLh7;5lM;WZmM#;;@M>14iDJIIg;lbs_bJ+97o&g``BFiX)#TShzDQKVh}96=p@p<# z6YmA1yN+)Z&EBT!l6)!S`nTvjx< zlL|y!>moi(0rMCjoQMyX_eC?tZO)hvO~7ow)jU^9 zcVN7Eo-kzYEf!LXynO{M20+YtDs;ITcvJ^-0ni)~A8IKLl|P{v!gIuV^2v$ZeAUeF zxrXM+L*`{|^A>sACb9TiASN>vrd$onB{B1W=_%qvEyv2rli32UGGijHl@j~>L7prW zBu!@P$i57e%tU=9c{1C|4XR~u+l;v#g|@h0?V@sgFqtLZb%}RD-fhmiAnLsr~)Ar@sm}#V~GHuTt$UX>(O#Go!g|n=sIA)@l zH5A%)Sd6K*I8n@Ai%}GlVjZGnRkl%N9xd7eR2>xwP4y(J#;=Kdq2!gurfKC?`P3p> z?f6E~_U~48NkWrxKOmuvczu%4q^&h=w}`x%((zGV12TCjxru(t_~%FP6^6k?1-fwbx*x-IjF6P}W;u{j59*Id8_@j$ds#nu_Wg6fCMVyqjL9L))01zYDf!ESLZe6iGN8IxTq^7F+LPue8|o7 z#4q!B3W-I23Y%E`E{Mrhg;iI>Qc27fAi0Y8P&^Oxm6a#gJGjb>K3**)_Ia|Gg@UBX z^$6Lk@KSOW^_AqwwFaR#s1`kG#y8qUdtI=0Q8_-CTodoQ#JeExe&<~f_1+c9wFRp? zfcY$P4_Fet57UMha*=jWmR#l63do2eZJ_J{pY#$c!HVt!wt*ro7WRyYLfcMJj2f8i z6y>E>kYGWS-zd7? ztm=|%D&sCd;t-KO$)?f{nl^3^hbVp#FoZ3l@<_LYMPw6z9i@n?Fv*(I4}OpIy)(GF z3S-t>L93`S3#zb-x%H8lKQP}O5g$9xf}0rMbH>XhF{;5*-@LEN3L!Q~fD|U;LoLP1%2QYit}>&0_?L5TpQkWcC`g*ZI*|k{vRyze>hf~fbdNMTc0711)!M5ckIsu`Hu zPA;+&2C?*BFFS6?JQtIE~8xmA%%%|HN_Mr%iGRcqzQ}UW>+mNnkZ&7 zHLK4=u|3;3CM)tDMO&$26tE(jDQL1{{Cdb2iE40_#%!iVzF`xOA0dR^a(ts`p+(gt z*-XY;fNUlreUi7_?;tL?=OBI$~4NE04n}8J{ z;zKRP%F6TQBCayCe3{ti`BD}NlIF_|WWNQJFGYPNdA_`z8&u0cGfO#Aw9f@=7nS3K z`7-gYOS}v69(3LXQSV)mFYjTsZynGpa^KF5`{_fNQ+P4MMGBy7%O}74fP5)(2+H!M z^b#sxiXK=UXGB^p>=_Y-wtOi@4NUT-yo%=4SA#|^Nb;q$OQt=SYh!+rR%bxItc{Ul zzLfR|Fj?!+)`O5Q#k-nfzLaH?#p*c)nKw4(DYfvniDJG~v$jkW+tW@lS=56REnkXJ zz>0jSpvh|T>mgqxszIZbAjDNmGRNiUsoRAFAyCSag&=2Fy^MoODZ?TYCGZEKHiGBWXP!|NqTahAnT=xAgqEZw(grMPor1aU z?H~w=OnebAPs3SW$MUXO$LytMxekljOKowY*ob=KI8lr>hgGsF*C;ZN7Ht8lj*5h) zdXiP+*F?Th@=9aVv~s6_Qj6%c;~PaczE9O92~EcPfP^L@eUi|my>8lW5owu)ouOYA zkjYEQP4qt+|9p$6v&|n4E+Jb1Y+poNLz0c*D#F=T>3heh#x*2v4Ago~kZOM~GHNqOxcZuu+{P;IAj2dT!X_y7zG739I z6?~|Cr>IcgWxXU9Z;@}aLS->)s>)hGPl+4>n;~Le^}Uk!i1?`7J(o3vouV4D0@T%c zjd|j4AW$t4h|0f_^H3|L#5_;@GLNT_SmdX03X5|fCRY`jT@Cyj8KwY8t|C6vQmm{z zx%T5KGaARgk#qYz*~>yf(&RdU>?eSdtEjIePp&h$LA4BK&G<&U=r*+|xr)m1!Q`5F z*CpNsdG9*!f~fbdNUkeb^`m8Ki;MzGu46E3PA;+$NHVIuxg7sFnL0$Dw37#SL%YTR0XWarV5%Yp;|0# zX@wroYl!X8dfl|y_JYw{j&Bs*Zj=8D+rixy_Z|wesYu`Vi~WSirkS$d#Kh`Pok8C3=fqL5k>df7$<)%SIUl1L2wgu4z zz>A{`C-lK z6}-Bs^{qF>>V%TL)C|VAEozU*Nz=yVdJoZ&(}w8VSnL38BSd!{-za+UgEsNEf~^hK zJrqoQk+~lb`=rP&rp$E_c_lYqs^GwUx<#tZr$@wvXEufS_tC!(#qsR97Ey1IUx8#G zPyJ-7o9n4-(3H>P;G?{xSsH52=W&S9Ok`F2Fx8)U3-eZmeW1P(y$3im5j8EnsVjK3 zO;j1EC(356EW9v3<9>wC0M58dR0iqv9L)9A(vO(!je_Wuvn`0qj}zjGlzxnKDEF>Q zygTGQauhlr|7)DuMN{JTH{AbQX7jiR?t*__RjwTwIdJ4Ns6f=HjtPHB$- z=|RMK>swv^sK!NZ+WU%r!uaP}M7?pIy6OM+SGS!QqT;2_F6B~baskhI> ziMNxa-sRakc*i}3_dP+)%HF{<>V2(;{-omMS4XV@l8VTtvFAjZt>1b=q-1~E5Dh;e zLs=yIH)%ftl7-XaMOpjCkWG(Fpb{~@Y7$c>zlKoY0HSV zK(d+9wCVzy<)ZcN#y12P=_lSNm#!&@)Uc^`0}Jx9ND&LAU|Cj~Ww(f&Bu>3JoKF=o*qo z-ZM|;0a|Y60pev?tx=ySK6&>#x0t{&=D<1^pt-643C7HXSowonpr#e>XrfJZluUK{f9* zIl&0M`Q}NS>VU2i6ZEq929Tucb?=l8j@;_a?b9}<;+6_ML#~S&Jw-l_&ArPFMy=8PEi~I z>0Dl>tXGVLxh#GIBqz{LF}nG=EVp$K=CXL_7P~9Bsk`JZ7v`+U3b45>Mh#EqvP>sT zbVg*_*dCE3U~^fFix%f{?sYcT#=gq6aW040n#&5VcoYf(YQ#IYI6T2k z!=r}Cg<%lUZ=~Dsh*86n;gM;riOz^L8rvgM05&{gT(memRfwF|*<2fkC)dW|39&Ui zjXqvFJc<5TqL0Iq=#MA*I6Ond906KAqIVr%=a-rxx!nO;JGy*`cW!ZTf|~|M?s8$sMRtLu8Zl~iG8JUHWTO6XBDv`7HX0Ww zrkY$EQ_V6~w=G5-AJuXXsIx?89x9*9(pMu(I*TS|%^;o2qm(B=n9Jg)Kym_A6r-D; z%W|6pA=QX?Zn3+9o4QNxa$(Mji~*a=V$|?tF3a?kiOz_07~9ha838tz#kgp3F6Uln zb8YOaTpQE&E>R+>Ae?Gf2` zZ17#9C=24nb+{GH;)YSDSM5&G=xoL5hW7-8bI^{hh|MH;;DqZDHiKZS6P} zP1}ISBO-TTtb4>9I(ayQ+^bJsvf$1vH;mn*_Y=q>?VeDNmYXV4>~y&$`eTVc zF1JK~JkiJHrvB7V|0^4cUU&S-(0J+f)Bg1NDX&htzZsFl`C^=)GzA{!ZlbL7^^Gb%SGp;88dCSNYSxj2nrNsk@jpK129K%-ppPw+VHS-Oq^}Y=r%w)+w_W> zli-2bwvrnA*`}A+)S7X{YzxNe39F`Ez-$vaFt$hJ2-s{BL(Q1P?L+R>Cofqr+j7Hr zvYTjRk@iWbN3%^8DRw&B68*76A7@*lKc490Y*U9eTFe)WE;~MUa4Y2wkaqBO%JblX z4sJ`0eFy8U9t&n%(ZRtu?O@e31n6LqF=Kl~rh#>^m>DMzb1C=glb0;$;M_2Fu-=Fw zi?oAPRt4%{QN>O>IME+V^s$2z{qaN}J9wFR>lX6`qg#$YDXNzv@Y#a=dB2P|0Sj70 z`ea`v?V4%h)<~keCW~5jt#vkr#oiYBXZKT zJtBRM6_F272ZPfVma2jN7g5vnXin6HkIhtgCyFOiAlRe@EY^rh%}#zV1kdDi570gL zAtX7m)sR}p)rfqJ!+1>Hit-X51m;`d3<15$Tiu&$ZpscA4Rs zKFH*^$nZ=p_Ri-_hJ4llMC{0oPMH9vG zIYp=uz}roacia@W=}M1`+-&xz?sTC&I*B2m&KK2B?87&T)_$9H{yGmc+#%yRz>uza zeR5@ycHXqHJrXUL=(LCncw;a2*aSiaWVyGA-ZcJdo2ZPF|5r>S+62jH_kAmE2Wcj! zco*1|h8{Y#NJcz~MHTyarke_PY@pu;yzsi}J}x7$pb9RMH30fTq{-O0 zo~3OxQMZWG#+9XFGf=0CPCGtsAf#^x#1@e{Iqg=jRi{b)A;62a+eDpdoZBkSn3@-D zLpL4IJavc4x4d3-+wl#e>olkAV^vMBV(B6zoAkCq3xEz1neyTgw-wV4zzN7wKmSge zsIlLHcW%8eVk(b1Od0hCh=L{)Kw4i8<>t1bqyy=#H7jUNgUY$&dZA22Mdw?1uC`!_WI~8WSvpyNk;-i~jrt7|<-UqC6 z5n1!3>saCzC)9^rVxyAg6~f3}oLyPQk6GI6i#-+3d?{sW5y6ga1@1%Kjvk z41D;qRsSyTSz?@l$44(;88-RbQ)8>~qt3GH@|CR5v1f-b6fchtWG|#ed!aB9Kk$Le z69d^lcPbU^1$8L8E=~-O4t(_T(C|R^TK2KBy;ywq{MbPDg|wLcyeobDYH{@9C5&Is zxMS?g+1p+5L!-})jSM_-dHmV)#ewX?gTm~xlhIWdFFlie)|W;uj~BBabA>ZKR=Vy= zj9c~vuMq!pj_PH8CnXRh$U@$t*!*}rs!4-H=$9>2&? zU%YgFlvz5SeYISXy^$ozS$V_k9j@5PjQki~l)bmSY$Gv|%dEUqR?b#k(RIv6hdJ#F zR|c|oas^jC)?Hp|FC)wQzemd`yWtG|m`IlWloNGce0uymllbquVqyH^r#Yd2?n+Ob zzc8HrI=dg@nbYgJh=vM#MlTn$zs?m7!Q&(6$3J?0Ec-oI{NSYvmxmabf$Uef7@!Y= z>}Hw0o$0SR6V;{VH9StQW?#u0U`GGZ8QIxHqpu~x*e5?m*7VI~fm%mpzn!0gMZ4i` zu0CyDm;Hh-b4Ga+-dS<3=J}7E<>}!|L&M{K!hhAtK0?cN&TbXFhJ^Rb_(z7H8_3@M z8qa2@jQilHhc7X$U&ssDjPbULkNgbpDPY$gC_mJ=*1#KFp$0FJ1meZW{;*N z%Oz(`(lcD_y;vM|>E)V89el0!C zf$ZD9(}uG1!q5{JN3B&qP$9_*2nGrluZ)eJf6jXD0)n)BDK8HUji3LF)$>bPDHbkBMWDOghg=nQ*l>Hjzf%hlp@LjLZvb6l&Ntp{M z+ZAv;(utDZKJ(z!ceecM`}y*#@6Rb% zxcWZK^)W<3o;^YeJf0nYG|T?gyUMl*H>?SMi?Cn?*S22@ytVBgQ?kqYd|4y^`h$)9 z)$&IE!}3PnR@BhQHz$pJ%w5n)Pizr>$Q91G(l5A6rr$7p&6Sc3!&}{DG2bwJ$O+0e z4F5|SggG*hea2b&4MVfL3b~ToFnqjHls%P7!iK?LB%NonVVFtdTaCZu+_ho&hmH*! zhJTwDv)^+iw_$kHUA%0=@B@xdHw>TlYQJI7Jv9m3r8j#8Dy6t#m~})6J_OW+7-(-7X#U`JHUF666D=*IBz(eqcXWK~>a!-~mXn-p9#%LUn(E4z`kFxihhATrP2 zNIcz*g4+oFk;xw)P-lO*kUhk1<%!@gode_>=e`*|<<@Uuj5qF)bgG&cL~q+mgxXM3Z1d(b-j&)bH_c4)uC)z~&`*@kg` zhxT9dg1yY)nelvwc9BbRS}s~S?9lXs_W2I&xuld$yMlITpEK6)(0(;9*oFI!9oo-u@um*HL;Iz)WSg9SWsu)}y}{6pjCpKB|Ve-H8xePGn?P;9k{_?IRBLoR4UT8`e+$T-AJ4KM;xhCmYW6pe@8i^5YWj=D`P8K0dS=`T*-sgtr=~xvD8G_+ z=Qodk*Gge2yq*q^OW|!+&{EL&B36?6i^lp@F`XB(&l&HN)FX^h$XHyNFJ8*Nqf#=E zjUcjhbj5UW9ep30#e5yTKP}m;xM-5HOm@RWm6`0Hn6xsJeZ{1enXESL6&^&f>kKFG z;Y)rxz9$hXsholX)Tg>54HuZmrM9{9Dtr$$q75jNfRDawDF-+Z8mjj~nYpR?qvM8MlHx?F)U8 zJybc4*{dog1KIg7vib*q9Lj<0UDov>WBp)Svc7!UBxNJ}<0h&c*)N*3a%A-%!)L}T zN475Qivj!RVK|#OvU(&JgmGklC=phU?40$Fo9zSHSU$2p3mfl@^_Xs8z}}%v%0=04 zBxTm9Is?hQ4UEp{&{EPfB&^uga3hHmXCD(}&ysVaEX)W(d3S}1) zT|a|c*~R3qBnrEj46!_dWxSZ^;X*33nsrLw!?Zb`wR7&j@c#e*EX3Nd#@<-I#{OMe z%>MVZWNYlTwn)m>*n3S>xyCM;v~rF8gh^j!jeW_v+9Sod#`Hwsfi?D@6XDliV{c(i z`0UwdOUXasxe(SB|Gl{scw1v1C|_eAE?;9mBHOUW{sp=|Zb$wN^!>%l&t?ZOXD?p4 zdVUnCZl-%LK0BQK8O*thmxeBXCVM5f!v!87o`0GhXe|Y%KmXv!-U$2n)$uF*f8cw> z>Upc=-%EiN*7Mx6SvzcBxZVEFI>H%r1Z?NlYT!p zI|@u!I>A>Y_~67C|IBiNpXFwzkL~Z+2>%O76^-11^nL7dD$-k}`sllhPhVuK>0A30 zHy^ZRn5VR^hg{tMRbn2W6~`|>m&!lP9ZKJsOR+&)Dt|OIuZ_DDl}-=;Fhf>!q4W-! zzSF~F=f`>C??ivU0TKKCPhNcH>bO6X_mSUqCZCQ?`$v+T9@g|P3;1{5oO+k3-t-o! zE{Nx2B4+Fn?U8 za4uLEU%A3PyOSSCPOpu{+3-vg5_?YOEVfjB|0O?UZQo7F zKMZsF->8&4e);mJE)Hk^0y)b}|7ywR-l3Sr{#-Mx9@OZ8{gv#GRP5z0GxS9EUy%&Z z`e!xK^sxOZH-_)Ts$BHj68U^_>64eUe?$2yA$jt90NXo${?Zl3fu!*2N6U)!6q#LG zx^IVlX1wp+?~WVc#R^IGi$UP-5Zz7EZw8@T=5|?o@4I{~zw|poxnMcjY`$17%f1xK zeg`{{)xXguZP;IcNcyS zRK^MRs$&PpR?nW*Mzy(vE2-KXjy_-3htXsw`@=+EcqKkysfPN1o;dFSeF*C|=m+}P zl|KH}3&ODmzX^hUkRKrH=lV0s^UDksk6`KjGYNxNT4u5(ixb<}D)yC58$Vkp;vi9|kxcn?&{`^W|TUl{e z7mgN~K`;V}K>aU19E&j3ew-SiHJ~;buV(lbumG09yyrWib08cW@S9+WIWYzXfq2b} ze&}tet|j4^MyBfqpB1xjAu69A0pz8>i7aLZuc^9AS}XaTLD2{eOntii8? z_A166oC4zY?X@=OZRj@8SJ(7)wGFTd!m)tOA{b#V>Ur1}{2)|ca@qvp*h01kGUi{s zz??h;)j)Ii5S_kVvJdXd&L6?=4mJlsUohAMjbIJPzXk;VyD#Ivh3$Wf|2}@IU+YT# zT2tHLn{7w%)0aIKK?j%x?Vtc!K^tfS&7d08fR{SIQTlQWw6UhOuIJ(Psc>Dhb*`$reoJ`*s!v;Qf!kmW+ydbUeyiB7gITZw?qf3zmH!?H{u}UL&tKR7{}zAk z3snEI_g{eOQ{3NdJA&U3zGI*kXfIL&PJ%<)ul>x+omVS+fDY{gxW4QD_dfg)=mhs9 z_eTdh{cCxW+HGiU)X zWgqm~vs7cZ1HBK{!8TY0YhW4Zc61$ z?EDe@^!ado9(*3GgIaJMRN9B~E;`w-0ogBu6%hPF{9qsSMQn5(>jGn-73kX53|c@V zXaaSh9)x3yYxpkEqkv}iH+#@KARPMK^gKA}uPqx~7aO<+o`iOQ1$5dQg<}g|`=mqe zkB`7za1U&9UwsSQ<6iteD001;0C%}&-UIXg+NzkUW0`C4CRhMVK%YsThi1@fa7Z0T z;0`zd`W&-9kjGrTe{L zCw(W_@%m-x3J6EAYsTgjr~ysjE;iNBJ?K7=|1PNXU&dwyXwD3Qd+_`0<5r<}K{&oq zyES|^K!|sXSc}xCSw5Poe2Eim~ z2mPQ0v;p}ygG&Fq$do(wc(_*Az+R8svI>+_M#(P|>MNk!qK|WgW6R5B*NR;@UP`VP zvMWv#wz6*kjX?hO&~P+UhuV`hl((m{{!VZAjmovRSKL*g^H>HeK>kZ099sMO6RS=6*O{PQQiy?Zkf@U-|DL+k$RGcR)BQ?GMqdd>y-HbkZLw#@Df%MYjM(zzpaD zL!baUK^tfXEua;=RJ6t}1g8eeG z70?eB!60^>&~Rw2jeuRC^`kkr1D3!R2#0v-s`0InKd1uoIRx@ijBrRMn=tR>)9if| zBOEjI%^c`wEGB`Tt@Q!jqwAi13tc-j9Kk-^zaP+Nx_?*y?KOi4HXOWL$ghMjfY=PTAKI=d}>3G(0Z`%lT@2_X-8$i$7bx*E) z{62KL#|}rZpGBtoZ9Ui5eg718tK;?i%IBcr2=+6`X2B_-d)0P-9~q1cT@g%xQJ{}?%V!A4M=`=7 znQWH93Xsn{kdI=7CEp zccHcihH8I2hwhei{s{K#$Tq+j(B6ApaiHPYpu7ome|!Y)0o@a#Kt4-AK8g_z$z-z+4uE`ifqWDr z98C?(b8zq`=HZ(eH|Rdt1$&?u-4-+)!F~hTCYS(gU=q6#XgJm>Z-D#Y5Znd#z$VxS z;SeufBfd?b9y9>?)I#N>7~zmiHhrKU$fpCyM=`>o4{fY~Q*Xr(9B$b z>fOxy-~bGw+ku87*l!`zE0U+dCeRyC4dSS8NF&qx@(zRgI z3iR&bW*{HEWmrCn5e~^@GYE!&e0qU=6eAoGWY3z3fx(2wed3(c3`f zqZr|kOg1}U7s%%pkdI=7LmzHw0_*R=7OVojPH`FNrHmcu^nSu{1p7&3db430&|3xd z;z7L;FdWmAXTU9>cl~XEO`ul}>fM0h5HH<*pm+Z1Re|?_eDqR4`6xy>B$JJ7^%g?e z$~PQ?t@H)h`(A9o4$vFSZUemsZ5G`IG#tTx71-t*ND4ad6tz%ZQTX; zfZp(>w{wLaAP#paIB7ujP`DVuV97*>r(kAfFB(AH@iV-mugUif!~E7y)CT z5A=gUbiL4U=p9P+lsiBd(EF4MARIy8>Gkbi-v&LE*y(*#it}=Idc)2rnEgTe4@`p@ zFbVX&o-uSI&~WHIJ57`a!4S~9bNWFzD)oI{-v#Xj?VtmM<6cF)O8a1^m#NHw$y3a0 zPy`cT2L_=De$W6qKsbWF&+FTv1<(dgfpF+GGm7(ac6zl%AIN@) zeh2sA^@@vruqU}c+M&~67R-Zibiwq45ikV?!4L??Hq0K-v!@1d2VT#j!f^*?AKV3c zE)@>lgD-o;8F+pJf;YMKA@zaSFZ<=y}gbBG>QrZh(8>2po7`pKs9fqHw6J&pYU| z4||Ecxr*@x6JQ$XIg9uXFbdj%p5uf=pM$sss$M~VgCoyxLl1$TBishzkUTuAxetE_ z>?itD#OMH%U+>-otb&`)HBV*~y+sCk%m0`wU}@w>8t>N6HQ;{74H zK8tY=9DxIH7lfk&AAM#~KgGBRW<5UyodNw|5QIbWBA5XB%tSbr;r082ebxAZUHD$; z7IX(}fLkCO->m(qM>w}{VLfoqKM2CHgX{oQA*)H`%kZn<@LRF`HhiIXf&QPqC5mqI z&tYHlD)J7{Z)**L26)}eheOX1IzRzgpY)&^%z3*JsD3{z9*m=pYbJroa)i1uU;G-dgsNV>`|3Q&R-eH9vyn_67d`@ zjysM2l4x0B0NwcTsO%jxHd@Rcy~r2SvPbRvvyXm~0;XR2X+nc;RtC<+q7Uef}O4@jll>S z>^k6;S`=>q@(ip=T*syu}&v0qgf94N+SN zZLyfb*;$|zuXwAU1I*)BgkZ>ItK+{1U-R|;gTI+&|KPP*_V17dQ~3*@0)OW1=6{lF zB+pd_k*QwQqjS*lS)fOm@;Sur5W70~5KneAIr~u%>`wkI&fz=Be>lmGrEl?MHw)BO z^Z%bI>=3L2nLvO+=I(=u*CF!9xF3m$bY=TPq-3($gQ+ ztLROhs!JwMvBy&*g)8>QYq0K>Z`0d#$vJPcpZr8n3NjJVU3%>TF6sS=zjgmr1pWPn zKhi3?K>mFUy(JNNjYU11n|LqrFna4vK)n56jo!g`_$IV7TAygt`$&!6;`fu}6*XYE z;@xF6dgq@vE4gxE)XK`Vsz&dYrL&S3&E7hu*IlF6Qk<3Sn3ts&?d8)!FSg%-`)4J$ z-jL}jJ^g9E(`&pwcyLzoyZ?!l$x1bP3%*&OeA&Dw9n<(+jo$7T>fKpJOfl-I$g+WW z9c9D&k5Ncqyw$5QBieD2vBj^=I8espPm_UuQ6=3&pOg`aOdvk~Lc zysE3-tr*;B{^Y6;GpOcC&zf-=pPJ0L>cecKdC#+E5I?_pR?GQ$%(FKn%~zi1yH__a zaaSK!+6LweFF(h z`F|ksJ*Gr7*53G?S|s*&U2?7~-|o<#v3w^?{vSm@ax7o=JK1xS>yWpw4yeX;$pZHp z?TcC8dD@H2YT?S;@J}eaYi{ycUL(i!+l<_`WUxo=6#rWB0@uNkD}R42NFED!dQpAV zKAk4LU4hHI#{8Ct@uL2GitwH2cLn)=UZ-FkuSI?B8~imd`93#o+x?zX@}I!na7_OV zct5Pq(Z~2FzDA(C=DPOicsygJ+`2Pkl|N@#@?(>kTs&Oq@5V&yq*yb9{!4z3k&FGT z!42c(0tJLCw%6<@Vu-i*?Uj9*=LyqZD&L+O`9ae@N`8;AFY(q-#Y}zqT223b2$5Ln z%AVTbHp5HdcEd_(q5ipRQF3MFKI{KOPewWRid?KSrr00t>U4Mc`faVL-2fx-Zl^*K8u3I`D>e$+_fkvR_-%}9rDjll0O3Pfe#`V?}9hKz*$G&XW^z7d7cdXL+Qgi0-u1_{eW{q zUKRg6Ubi0h=cVGaXOZ83W%3K)jX%odi{aBp&@{wll^R{f>_6ucX54*VQ^7(OfTkKv<+UxSas z+L=Xr+-K&)S@nz;c)61|CG+6q%{c!xB`t7+;mhIK@V=nG8a`m;`mOVWhIM{@2=?V~ zNfP8r3zC08F7CKB8xJ~1_SYi!6IhYrdeL0d-kpXOwb!t6I$*|!xaDL_ z(c4R_Vaa<9E4_7wCEsgU@}q_&@75yhE}wpnVabcQ`0$tCzvz2!{#ukgMtj67*0)#_ zf3k+BO#M`zJvH*?Q!&L*U&AWTVZ(}l#IWS2Yu2AB?8{$%Jv~PM`l~6~Mft@|1n9pc zWmDgOLoQZ6n*Y8JPZ&M|-(y(sY20U6pNZXUSm`&&*xa>9lV;_L?brNf3}U`QE}kSP z&M*6oTA$Y|F1bTB^4XR3dY-G_gOtZ#zCVwe@|-_Id5*mu)WiJN`%X1a)a0M5 zk?*bHDbxPV6_V=sH+g#Hgy(ax@ zW=Owi;;%(6mRjtONt54a5R{QWOutLM37%b7=e`##*5_I$8}NS-S^VF^Tjpo+o0wRSotwp93U@51bDz0Ze)6lZb75U@<2l!ThPAVq^SY4V z1IUXPF~0`h22Zld)Mup?|66b?hd~boei7b%Nfux4O}*Nl#s58y1ll;X)_abMe<8e_ zL!zd@SHr!Xb?&qMl7AAu>dLz0J~~RQ{yOoo*#Ca~pEfMX=8tD`-JLe}qW8VTjfCs} zz3`lT#`+1zg@(Tbw;A3JUu9V7x9K3;U5k=`K_0I-ULP{$c@nvJJ4&%WCyjmRJ+-#0 z>yih9{MYbqcw6AJnOnQB$>O)dC*i2S8lG65>B}X>IoH;EBL5!3$Sr@^|6K;V5rnZfIVW$uEO_zQ&Xl>SC zo00GSGw;V(?Xwl$4r@Ouegb|K{oO~yAIrg*zZN8CF?Wjn`svq`WARM@=4-Y04%2>f(BEnJqRQN>6#aR`@$Q(P@Bg<9 zOVV9=UibFURx_V(xg*B+>)|@1Uwhso&3N9EaNhG_$`e`VKg-~FzE{U-k$y5gp4aHS zMZaYe&s)R=IGzvICFi;N$MZ|QW2F2RR?egT(8-$(PY^$zhc(lxpM$l(X(rx$#>0bf z)Spk7ex$uE#24>^I}JYtuQL1$-10PYTu4tpJJ)UGzlJxmKYTUF--FeD>PO}O2h4@* zjQ$_P8x3CqPrgeYR8;y`!SQ@hyb_+GKCL0W8{x8vzaDPe#~u$8lm6ZCeMbH_@I!_l zgX5+8KL>9$@}En8KjlHD^xlLY{#XCJDAsofb{PFXf+r0xf;UoL%}>(*2)x(GSHSUV z=H`|f){oD(5?||);*Y^Q887SMdF&@2fDfDWw!p^>e+7Qk@Gf}D@OR;cFOwLT>i+`V zX!sX!JP)1EdFU(fLL>hT+-i6pN9=7sp}wL27QsiKC(NZkH@On-F#7slzs_4Uf2w}{ zu*R?Id*Q6P$zQgA-`kr8Y6!j?lG+I#jH2n0uLL$ z6z=>M{T1qaHLT}f-yaK-)$oMT*XMCI8@>bHVt5?hW_UAP{x)S`KP~&;3O{b-Ux#-a z-UDm>Y*za)o}Q6BoR7?#)s#FB?=$*8gAW>h13qH7ejfeRMPgj8zu_s?`-Sj4>}3J0 z^)~k3hhd#h#rf}wn)uhj$4&a5fQzgz!=&ftJNTrL{}tST{q_X;-@>Pj{Ohou=Z=Q< z|2C}iao_$;$v$}YBSd!bljKLR&O`S&o}0V^Z)QH}2z(NL-1Of&@Hr+vg-n_a&xP9z zH^WC>rwu}St#GH2e;i(Acol5NQ#ZVa@=S*K{cyL@zYErR_`V>20A6S055xDIA}q-D z8zi>>z6P&@{71H}9toJ9P{wY}JRk1yP3ztoNea}nh z?+Zix3*h^V{7+$>7i;WI)x@8II}D$7F6*J;^I&W57dX!9D|c^tzvE!Y z{|30r#Q!w>>R!fFkdMPUKU@>|^Kh@x{}LRZC)B@Rf#Zd#CeOnA-^#}858<4N|0}p? z_8 zWAYz@kAE|3{{pP{JN2Dh<)`l;CYAl(oa8TIy}xrG=LV7|ExDwnFX_jfXF527XOB|3 zZ>*g3kCjX1@qvNG{rn324J&U=yVl;;lcqqfkPZ$PHuMdrIerwjl=h8JBz$_ZIGiu% zbBmXCwzto$lp~4~$j^4a&J>!VehB;UU#5=bh@}{$U&;JuBBNUedlK85qKY z2@w`|ELnO5Ka;zG-)$yIy`-dGNXrHHS{+jC8}6JI(or2UHn?HQWz&L|PS@hMd|h^f zam<`Kd~DsN%K9VLuqaBKh{LhdH*$MIXgeBV$8 zS$Vp_xtkN>gJE!Jl*$zijSUTMEQ|ZyZ@Z@x=6)0RIrqEDq|E@$rJe}Z81xxVELjqQ zl{XGiDutwA8-~?OD5fzqRX`lp)q!_ypcwou!<1_Dod|>ee?*wq86sg4v~+b1|A(UmMM7fuuP-Bhs86h^B4NEYTT4eX5n7 z$#hA!J-HL_&E?83`MdQ>z2LP<3HLM*UqTtWt2A_JTDo(nm~!9F`hx5E(#D~Ia@Yo5 zchf5E0CLNG-*#P3+H>uSuIscntlGEbsssGKGF|n_o36ca?aD;oy$O3w z{2q-uM~?I{?gnsXA6!4;s=)cQkXyarn50*ZWpT2>{}2+K_Td~PB}DEioI_1HoJjgM z;6{D<^6R_Su2`8aUED!O-ju&P_>W4{;h_!vX@6OH4_W@ z(5NkUn)c=UHVmcXqjzhO?k^V8;#fNxD_5qME?!11#vf$bh2x0v;%)5d*@;G{hB$oj z&SfhhVY}?yW8g}H-F*HgZEUG`SD`N#v~kQ=C>JI+$%}^@$G9@tQ0N=W1!or&JbP}C zZQO7d4xR@!EXSOmPQK0L)5!KIVKn;PL~kfAK3zr!mAUU9c}?V7V&!NA-m^=waJOw2 zzC|_KU)*Ga2H4J*@;1bGufD)m$k}j0`uj@x{*j^$rL6gK=IJoD){T94<}039(;mL` zrbnhizl|E2+W9aveH}Y*NJA?7OW+Xp? zMHz87SrRcUIR+))6yKQ@;G?M=_R5dqwBW(d!AzP28jp zyFsNL@aSlM*cFX2o@a|bK1xZQJ00(2hlIQzQ4Klg=r>xxu(JU2!GjUbUsIgH=hgZc zK2wT&7ATH6Cp)hFGMBK`Lz);oIaF0ky^3Qco3op8TsjqJvmqG*Q#v&5WeL#S%0C=E zl@%O38fzx3IIDMcUBSE@>KZbU<>0t+Yz)^hm}Si{RR3rBO1JkW9#*{Xnvj2-=0k#O zN16OMhES1sy5-fb=H>E;KugIS&N^5m?P#Fv~Rk=`=4k0x~O*xOq z(f?Juhd3W=d2kks-^qO04ejgQ)0?*)A9Jj4sCvo?HTv@+wwSN1ORIM&oQmuTU0JnMDqU1@p4oNP{hE?12)xA zJlB&WZs=R-;Fw!b6E`}23&;9Ugl@hg%<@#5lS`|&d%Wxy3f#3}Cb4Y?cuHofcjq=t zfi#?-PE{-SM82|6+!Rw(J>%fg+f=YWUzW$qm|U~p?a0txM(X1 zm<)Hu+Y}0M&aJ3W8m!bB#CUn2GaY66a7|42#18S!{9-Q;<~jM$;{-|hZj$5fQgYXf z78sUI&h4~@^i^#Q(!Bd_c&J@SKU6THoP6bbS93M_IWMj2)Zz_*nl+YQtT1^8= zwYrsl;8@aE%yw|4x2yJkOK6_3_p2_XOHXrL^{ysAF;vyRp=4@vS0dVtHV>T_P25>d uusIZT)XE&G(=oq+tL$#E&uo&@>|L5Zy{Tr@Yc8w^$j z5!5OwC@Nlw)wWt~i!D`(TCvsETHAWB_0keTDqgB+)oRu9|9)rYoIRkw|L^zy-~an= zK67TCnP;AP=9y=nxtz(I)pM)nNhyW%^NC_XXyXPUrobQnLm_-Z1g40%2qA5(7{m0g z7sm+k;`g=NNPIZIaY6XZJ7tY_iXbutOuEH1z*8>KE*CHz^CMb0ctWhvuJKqQ=$M~z z#L;mQz7%&O;&nKd%XIK7x`5w>G`bMd=$Otj=;i~Se~EVGfa#pH(+1Ox0Kf8c@|U)? zt|)D5oY2MWV8^G1;aWW}k~OH^L+!8{}2NIMUXb!Ymx4bQB4_3-w)#y&Xx zj01bduKUrh&Do=oRtiU15RduzBTeQXLI6L~4a4OS@ccpum%xpM%ZDq58xL0i$Dfj) z4r*B;d?eiAaEF=rLioesA_g7>|7a8TdPQCU;Vif@p17e1Qy%=qwD*e{oIWcNc$9 zoZaGoV^kc@6uUee=__2rN4Kv}WA{ISk#KmI63wgY)*8&KBdKMqGZ z^G6`00tkb5d&$8Zr;r*ex(~nHbpG?{Ji{s86URr(9C*Sz+s)Cb0JMhRa zrd{yyh5v{R8++u2f=Axl`1EZLUth4~gsp>1-@j?qv*Xs!?mYS88!x=`JNsltedg< z@V8g~$ICy%#Z+GNqrQ4|HV&9N;QZnUoN@^M>xkQbmBwJ+t#Ir3z%NG(6SLsgz*h06 z=%aJY9IJ^$#Rmu8Lhu<+{+9sPdEi}uqrhkXilL?U0sg|1ehuP79{N`zeZD9Cdw@fp z{A&UCdeUzKywL;y9`v?*;3E&=w*&aXrI#-(z|%bCF9)3Vz|}xs_0e`%w zya$0_;NnMw1$-~P-vWQHn+{}*1x?+_WO`Lsl0(5%kw`SRcXlLF>H6+;A|Vo$D-(;8 z&8?|)vU^TjeJYhqiFtL2>g4%}dG!rRhRZuUk}hy+GM%Vx>PRQ5>)VrwIh{QnY2q-t zI@y~}%xS6bb|U61tnW%x)ps=a)Hf#+73EI6n_ncFT02@ZWq{E-Fe(y=Rb*>HmK59T zyNFeR=)^n+%M@$Uk=U5*b&8nR+MPO>nVQa2I@QqK+ND{iV452m5-Cb$BBWBEtY6WZ z=;=7WwWBf7(AAab>Mr~G=!wkRprx7Y1*3_IMTxGSbc5*ZN+Y*OrMo*Cx>gCqrTA!| zOzKy3cBh$??rfvimh2GC$uzP6YV7PuizY>*J=xB@h_CN%W>T`dTQr^D-I`7^l29T+ z222yS*SB_vl}%mUtsUtmkw`Yyr|W^SB9+nz-Z0x+r6f^DhK&zTl=h^$Idc%F&Y6># zTynfPwW?zFoW!IOPL=P%N^p9Y~hns$ohryZlG7l8iA^tE7U{}z`0JwoZ z2F8u_fxnqP2EQ%zQTT22F$nh2$E4tH`k3V0Lmva>{q$kPx6#LBVmo~dxI5@$Fnol5 z3Hm?%fDlj6j|lM;eQ^8?{bPi9mOcjB7wI2|{!br+@$2+45bvgs$<$u@n1Jk~j|t7Y z^f3|IPal(_(98*MwF>c0Xw9Sh{JSR%`gd;~9J>43-J$)z9GrPO1ofM1_t;Nw*faCX zM+TknG*7t96E60I!4M3?QUP$^=}GMJ8;y2 zQhED<18?7Us}L80d=xk${sPKcJRswJmWcm40G$3j=yV*k+2*2bBhqUJ(C#6HZ^Dy- zM_p*cn!@=_1Aer^Hy~%u91t~q{aFJ1M>h}t2)y}4)_{!m4V)N9T-j#OoH=kS;%6eB z@C?K=o$)syp81&n4%RE0H4s4kMHFZV4Wq(nf49Tqm1Qk8hjn)tFp_kA55D(8{zL?1o_PD>o4y{dpx^v zk6hE&AFSych=Znx-ZXd#ach?BDf;Qw!OspH7%@u4-#Ykh#0#->z_+|FH@DB1d&EXx zF6PNuqUOaxS@z;!pzhNCWn#$y=D=An0Z(TkJP%>aH=ec;u0r?#{N;cHf^xZOun9DS zVrf6-|5p-!7I1WVH-WdS_v~Nv=)P~F?UB~c{OHn8-wV7s2>%%V+u)D#x0I}I8cfTr zgOd$Sq}}41xo(ed`DJ?!Z14ax1fG`+{PqxH{!Dp{}SR~LDc`3hR(KZ(H{K}N!$l(g$eE_^i4k0~`h}ohY#*g#(d!34K^pq;+nirT?nIA*%Y*a7ecC6)M{r-j zg#bt43gDFf_4W04)o1ii%yjhc#zBcT+YP!wQ8!SvY3typD3@i5=*@$#BAz-ZYIa*# zXJ=(~L65+zy$yXp2((?@z(mHwKN`MY)#=8;XOJ%dxgI0LEpq0c_sW{}d$NIpAua0z z=*cLA*^bNL16Dev+Y5OiqdSoQy@O7(HVHss; zkFs@x(_l;U(e_24R}2>=jhTJ@Gl1Iwygb;$DG1MJeuT#(JQrc||1J3AW5z~_8nka; zEQ<8#%t!alK;5T-UKQMOxHMdsp&f$F>Ovn}fc(qBXA8nDr;+FD2Sd=w35X9NerXJ2 zfyf=Go49qb4mcL*k3pIM@ACnRvh{=T0 z4?Cf7-(9|S@ZVqRa`)CiuaWjH>Jp6hNysb~GI?J|oG+3);Kchpn{R-B1>7TW zFEZ}CSXaX>hwFvg2=@rwi*WD4&44R|ix39>r*O&^K@|J;OYht|Xm1w-#PdTRImdX6_|zeB`5>l&BOWY!qkjtM<)Lp` zv0HB12Dmu3b^Q>+6R+G@aLm^Ab@A(O_%8A>&0_oqTW^{Q8}i5v;0x|WxaDx$qi^(w z#cBN#yzGNKZa^OPY1(mZBhU{K_fz0WaoPZ;vsZ@1?Sql%?SqAAU+Pkdd0^N4;`IJ! z4;;8M&-6v+v5@CO*dVsy#lS=OZHLyoXah`(r~82O3G5Q4=5Lc90T?z!*{P)-KGKE{ zrgLm`__z~%ybiikfSUx)Ul3+rT!HXE5RTl1JqolbZNo;)!{UJbaLeJA!Iil z{U4US)IS^fd}rP8k0-yq<2`@;hQW>F0`JuTFZAtW-y1x4$9v-2SN|hYcEezFdf+|c zgw7uG9@B;&SNpCHX_HL3eo@;$aNxkxQOMPI)uZpS4`DRIZ{sP{w+-O?emFAtzgmO8DJOTCD-=%dhvi#~j7TSPmx;<N)ZHH!bMpj%_dW@9cY_|LvX8 zM4OWy^&9r=%`cF~FlT7s zhW!5oT-Jed`xE5m=wlw}yn!_8$Lo+6`}scjMRy|%=g4pF-zd9HkOAzt6z{BSz&O{{ zH?Za|$O(M0eAYW%xOMPttiP~}KY-<6R->4?Cx`tMeGSXTx9`WCzWC<<+J#Ko-Tw_9 z*9I8c2Qh{WWX1ai?nNCiN7)k*mkkEdhOeT3g}{>qnK-dg7b z?4Mk{$A8)%2G`X5VemZUVLWlNfs?(hufGj(5qbL{;{$Q68=Daq5H-+|%Lb1@+4ii> zZ*rVG$CP;)^h}h!_~tUyCxG-)+AR1b@L?meq^Q|L8$mw4i9G%s=o!j{mEOG!Fv~sz z{(g*$I{vENrvoM*)Efa@>S#COoH{mfOqzK6Aaz>QTt9d|(kPp=P~QFMC*=Je(7R{i z*1<(8-;#lo$mh(yfv)pluhGUK(#Lv?WAPl&D==#_=>CWz6XrNdy-a|HA9HSuudh0M zfmhXcsyuv^0H69r8$S{8EaPuzTlS@V19NO7?|Hz9VqS18;-jXILBB^ZkHZUWqw0sY z$@?V7Wu!a&{n@0GM`3U{k0#C}z~uRP^ds{8`R9~h-@x&V@49U8MD(R7{BOVy!9M~1 zI`p$^k^TpSRsTmG(wc5)LLcAeczhXfk_c1IOQV>FVeLyB{t@sw@8&$~BH&={`8LM! ztgGO&&vHL^2Kp=ap=sCK5KhBwhT9Ie18x`GZnz8K%HckR`vQ)(W&bR!Cm~~C4D7!I zwzTYdWt*@D$m)7r+rqX>;FsNovH1$J*POJs{29~1TLp2+)CWP)S-vpe?k-h;m zULFj<-b?~saAqIuX6*oUIoDs)CuP}3ivDM47wm2gV5=xAGz&HbG&ole)vQxxpdY_# z$xUyHna>VRz+7Fe;}FIhfq@sm8{>T7+h^i1$H|gqm+m1CQan58tLf{PGoRl}e6@Ck z4Q81#{?g!d)O$GV5Z?lNkijL7hMc^Vfgg3nSl!>-wKX8hZVLPw`JhK{lgH5V4TIq2 zZO4XVjv1?qZXJ%fz=%_z3(RjF1HM65#IG2{nqh>4OF26@MQCH>?N|F4amW_q)Oxfv z$LR5FQ#iKi^6#VF;JA+`%2!%g`P-Uo6|33H+l<{aFyt@$42 zOmHo5y>L^|PV3-rhPxYX8{96qXW(9e+Y9#*+!t{EyRcRUegRw=+)TJCI6u|gG&|6b@bum3YIu$>goBN#|sc$LZ5Bx?Ft1N(W~}GQKj|y`nRP+@n)j@i_MLJGuFv;~FFmr3!1=(>V$ z>~2NJoqI4zystrvjD`ZgiJNV*j?84rA&{ruL(bc@bmcxi51 z)zzX}EOk))+=Z$vhk86dx>51o+}63GzAZj`c4x0nD<0j}I38~7bT_2h5oOk=8X%_( z35P~w@{j~WJB?Rp@s?z3bBoEu_$Ac~su!J6t!0llN39*ruJlpH=m`^#hkA}qeG~Qk zc27sDr>hIEnjorVM?+^Lu}3#vL>UyfnRjs~jc$YnO=tUO;)1_~M-EfgPJGP!Adyf=ZCZ#TfI44~x0*J60Fr`ndZLE0%z z5%;h^KJKuN6ch!%>(TZrlk5mAGp;*OTW|cNlO28<+opG{L^@tlwl&5(I@58!R&1?r zBY&>O;+0o-efKKhm89_kP5TY>Gx<8Zk{#$f4M|MRFuJxRyHUXu%HgxM1Gc9%1^sGE zmat;=-AO@YRxC@|pEzHo#yfi2SE#(Te6ojThE8;9Xy5ss(8kwTt4#jma)_g?co(vI`4a8@fAFolP(wqM;|1?raB* z#?BQa*3j9ts+;PCusT%ZM-9gVPiOBPpUa5ThM*61{; zq~oh-RImxA5=!lGh_$*KmvR}0Y~oElZEcz}*pzxTX0Tt0IThvc<#^%T$ci7UF-D`$ zw|1}b#lNQLW8&Yx=9y3EZ(Fk;{)NCR z_!r?j*E|Cs`(3NYf2z}q;ggTZ)mZy(AeZ_q7vt#oPL@93yTee=(O* zKMT)Zyyrxc*bSElhgY)dEZB@Ib+`zA4&r!*DHjfV_yL{R9n}i<5CmH>S!^m z47lnfgOFno44g1wmI!7InH7?@FUyzX&y&OD;a0vpLXPl_w8l%e6Xm2^3Ue>$LX?ed zemec(CQI^p*Z*Dhzr&*L55m}C@(?JKjddblfimIzCis*c%eWZ zI*>m!%Z#HDDlc^-YR?;0WMYucKE7u0gLAL;L|h3ka=81-1l-$!@T1 z-v>^EQ8^k3zCvNg(TRh@<$VhD+vhU%Faw6{`>~Z9Jlud0yA}k3`38*IKf=N(c!UA- z?42k+IKqJW_KWD=!I1_muwR6A2^JVIZl8qK2_9v@B6}9N4jyg5VtYBdO)zf2@%E== za+KVL;(di>HWs@gSR@}*;1qiv4Rkw zuT%h*+qvi?!HJTitFLgLeHz)ABp*?fPqnwRzEkBh3Y>4BMN+58I}~z_y%TmTIA7kY zz@_%%1S<@<%zlbsr2&`Qe~pM{|qVC}^pSH6H`{ z#YVxHTe0_`ZT{GLw0;{M>CpHa*<;Jdq5b|PsFfa^{Jp>Ae#p1v@JhmlUhN5}pGoH4Ou;zAr7dl~eLV?&`NWwD#V^2FFYaJWmvCZUp#i`W1-dQQYPL2aHF zv60~T1rhrNycb2R2O9p8h@F3!5HG_+UH>d%%fS3ABK8 z#!iO>e=cJ;fU^gIi4q=?v2|#S9WusqU%!yCV}%eqW$bS#;bAGP8ptj*`y6l<@OR-E zE(WD&=)RvL9I1wYLO;3}IbggZpQAxSKW2ij&>wjnR6{>`O+lf^XH47nrGjwOas#*u zow*BO!2cUOb5vI(axS$w_a=~p@}i|e9e-C?@8X#!NkC(;P+{$g1LN8dq!{oI#Z%Ln zfKY~xB9^Q1+sVcg(-i*6c!pM@2F0OSat{Fe=TMN)961w6G{(PzutMeXTPO$>8jgj$ z2+cKM$UX_Igie(Kg&eUzg+7Gl8!&4B33?H#kWrPIXTME8E9E=|=G#H&UZ_g4s=mSk z+a3jQp(!_R*FsZ5)dnmQhb>lP&T}m3@cW<}p%*Bg!(V{PhF;Y5nhJFaz068j4+1Up z=}0^S{$udWQ5>^Qxk@gqPObtO0@4|H=1+hMg(7mX%C;2GJlW`E5!O_+xqTu_4bNw_ z?FE~Wcto$T7ZMA?I%1Wut995ftodNguIWTl_%C2MYNz)i9C-}{?3E@*{;@Ca#RO{kY}%!Z;_*3bSe81Lsi)4k<3~H`s@Qhwbv<3Xq5dkifO$WS3~v%%zK%9 zA9Q?$5&M2iZ)aKa5fj^nvPJAV zh;IL@kKP)Lbwj)Vx$k?|2V*CoHt+6x>GNRhY*>|#{`$bBLqz_utYWSeLDu{aS@gH8 z

    +

    \ """ -html_header_5t = """\ -">Index] - -

    \ +html_header_5i = """\ +">Index] +

    \ """ html_header_6 = """\ - API Reference

    + API Reference

    """ @@ -87,8 +164,8 @@ html_footer = """\ """ # The header and footer used for each section. -section_title_header = "

    " -section_title_footer = "

    " +section_title_header = "

    " +section_title_footer = "

    " # The header and footer used for code segments. code_header = '
    '
@@ -99,66 +176,65 @@ para_header = "
    "
 para_footer = "
    "
 
 # Block header and footer.
-block_header        = '
    '
+block_header        = '
    '
 block_footer_start  = """\
-
    
-
    
-
-
-\
+\
+
    [
    [Index][Index][Top][TOC]
    
+">TOC]
    """ # Description header/footer. -description_header = '
    ' -description_footer = "

    " +description_header = "" +description_footer = "" # Marker header/inter/footer combination. -marker_header = '
    ' -marker_inter = "
    " -marker_footer = "
    " +marker_header = "

    " +marker_inter = "

    " +marker_footer = "" # Header location header/footer. -header_location_header = '
    ' -header_location_footer = "

    " +header_location_header = "

    " +header_location_footer = "

    " # Source code extracts header/footer. -source_header = '
    \n'
-source_footer = "\n

    " +source_header = "
    "
+source_footer = "
    " # Chapter header/inter/footer. -chapter_header = '

    ' -chapter_inter = '

    • ' -chapter_footer = '
    ' +chapter_header = """\ +
    +

    \ +""" +chapter_inter = '

    ' +chapter_footer = '
    ' # Index footer. index_footer_start = """\
    - -
    [
    [TOC]
    +">TOC] """ # TOC footer. toc_footer_start = """\
    - - -
    [
    [Index]
    +">Index] """ -# source language keyword coloration/styling +# Source language keyword coloration and styling. keyword_prefix = '' keyword_suffix = '' @@ -166,95 +242,78 @@ section_synopsis_header = '

    Synopsis

    ' section_synopsis_footer = '' -# Translate a single line of source to HTML. This will convert -# a "<" into "<.", ">" into ">.", etc. +# Translate a single line of source to HTML. This converts `<', `>', and +# `&' into `<',`>', and `&'. +# def html_quote( line ): - result = string.replace( line, "&", "&" ) - result = string.replace( result, "<", "<" ) - result = string.replace( result, ">", ">" ) + result = string.replace( line, "&", "&" ) + result = string.replace( result, "<", "<" ) + result = string.replace( result, ">", ">" ) return result -# same as 'html_quote', but ignores left and right brackets -def html_quote0( line ): - return string.replace( line, "&", "&" ) - - -def dump_html_code( lines, prefix = "" ): - # clean the last empty lines - l = len( self.lines ) - while l > 0 and string.strip( self.lines[l - 1] ) == "": - l = l - 1 - - # The code footer should be directly appended to the last code - # line to avoid an additional blank line. - print prefix + code_header, - for line in self.lines[0 : l + 1]: - print '\n' + prefix + html_quote( line ), - print prefix + code_footer, - - - +################################################################ +## +## HTML FORMATTER CLASS +## class HtmlFormatter( Formatter ): def __init__( self, processor, project_title, file_prefix ): Formatter.__init__( self, processor ) - global html_header_1, html_header_2, html_header_3 - global html_header_4, html_header_5, html_footer + global html_header_1 + global html_header_2 + global html_header_3l, html_header_3r + global html_header_4 + global html_header_5t, html_header_5i + global html_header_6 + global html_footer if file_prefix: file_prefix = file_prefix + "-" else: file_prefix = "" - self.headers = processor.headers - self.project_title = project_title - self.file_prefix = file_prefix - self.html_header = html_header_1 + project_title + \ - html_header_2 + \ - html_header_3 + file_prefix + "index.html" + \ - html_header_4 + file_prefix + "toc.html" + \ - html_header_5 + project_title + \ - html_header_6 - - self.html_index_header = html_header_1 + project_title + \ - html_header_2 + \ - html_header_3i + file_prefix + "toc.html" + \ - html_header_5 + project_title + \ - html_header_6 - - self.html_toc_header = html_header_1 + project_title + \ - html_header_2 + \ - html_header_3 + file_prefix + "index.html" + \ - html_header_5t + project_title + \ - html_header_6 - - self.html_footer = "
    generated on " + \ - time.asctime( time.localtime( time.time() ) ) + \ - "
    " + html_footer + self.headers = processor.headers + self.project_title = project_title + self.file_prefix = file_prefix + self.html_header = ( + html_header_1 + project_title + + html_header_2 + + html_header_3l + file_prefix + "index.html" + + html_header_4 + file_prefix + "toc.html" + + html_header_5t + project_title + + html_header_6 ) + self.html_index_header = ( + html_header_1 + project_title + + html_header_2 + + html_header_3r + file_prefix + "toc.html" + + html_header_5t + project_title + + html_header_6 ) + self.html_toc_header = ( + html_header_1 + project_title + + html_header_2 + + html_header_3l + file_prefix + "index.html" + + html_header_5i + project_title + + html_header_6 ) + self.html_footer = ( + '
    generated on ' + + time.asctime( time.localtime( time.time() ) ) + + "
    " + html_footer ) self.columns = 3 def make_section_url( self, section ): return self.file_prefix + section.name + ".html" - def make_block_url( self, block ): - return self.make_section_url( block.section ) + "#" + block.name - - def make_html_words( self, words ): - """ convert a series of simple words into some HTML text """ - line = "" - if words: - line = html_quote( words[0] ) - for w in words[1:]: - line = line + " " + html_quote( w ) - - return line + def make_block_url( self, block, name = None ): + if name == None: + name = block.name + return self.make_section_url( block.section ) + "#" + name def make_html_word( self, word ): - """analyze a simple word to detect cross-references and styling""" - # look for cross-references + """Analyze a simple word to detect cross-references and markup.""" + # handle cross-references m = re_crossref.match( word ) if m: try: @@ -265,35 +324,38 @@ class HtmlFormatter( Formatter ): return '' + name + '' + rest except: # we detected a cross-reference to an unknown item - sys.stderr.write( \ - "WARNING: undefined cross reference '" + name + "'.\n" ) + sys.stderr.write( "WARNING: undefined cross reference" + + " '" + name + "'.\n" ) return '?' + name + '?' + rest - # look for italics and bolds + # handle markup for italic and bold m = re_italic.match( word ) if m: name = m.group( 1 ) - rest = m.group( 3 ) + rest = m.group( 2 ) return '' + name + '' + rest m = re_bold.match( word ) if m: name = m.group( 1 ) - rest = m.group( 3 ) + rest = m.group( 2 ) return '' + name + '' + rest return html_quote( word ) def make_html_para( self, words ): - """ convert words of a paragraph into tagged HTML text, handle xrefs """ + """Convert words of a paragraph into tagged HTML text. Also handle + cross references.""" line = "" if words: line = self.make_html_word( words[0] ) for word in words[1:]: line = line + " " + self.make_html_word( word ) + # handle hyperlinks + line = re_url.sub( r'\1', line ) # convert `...' quotations into real left and right single quotes - line = re.sub( r"(^|\W)`(.*?)'(\W|$)", \ - r'\1‘\2’\3', \ + line = re.sub( r"(^|\W)`(.*?)'(\W|$)", + r'\1‘\2’\3', line ) # convert tilde into non-breakable space line = string.replace( line, "~", " " ) @@ -301,7 +363,7 @@ class HtmlFormatter( Formatter ): return para_header + line + para_footer def make_html_code( self, lines ): - """ convert a code sequence to HTML """ + """Convert a code sequence to HTML.""" line = code_header + '\n' for l in lines: line = line + html_quote( l ) + '\n' @@ -309,7 +371,7 @@ class HtmlFormatter( Formatter ): return line + code_footer def make_html_items( self, items ): - """ convert a field's content into some valid HTML """ + """Convert a field's content into HTML.""" lines = [] for item in items: if item.lines: @@ -324,7 +386,9 @@ class HtmlFormatter( Formatter ): def print_html_field( self, field ): if field.name: - print "
    " + field.name + "" + print( '
    ' + + field.name + + "" ) print self.make_html_items( field.items ) @@ -345,12 +409,24 @@ class HtmlFormatter( Formatter ): result = result + prefix + '' + name + '' elif re_source_keywords.match( name ): # this is a C keyword - result = result + prefix + keyword_prefix + name + keyword_suffix - elif self.identifiers.has_key( name ): + result = ( result + prefix + + keyword_prefix + name + keyword_suffix ) + elif name in self.identifiers: # this is a known identifier block = self.identifiers[name] - result = result + prefix + '' + name + '' + id = block.name + + # link to a field ID if possible + for markup in block.markups: + if markup.tag == 'values': + for field in markup.fields: + if field.name: + id = name + + result = ( result + prefix + + '' + name + '' ) else: result = result + html_quote( line[:length] ) @@ -362,15 +438,11 @@ class HtmlFormatter( Formatter ): return result def print_html_field_list( self, fields ): - print "

    " - print "" + print '
    ' for field in fields: - if len( field.name ) > 22: - print "" - print "" print "
    " + field.name + "
    " - else: - print "
    " + field.name + "" - + print ( '
    ' + + field.name + + '' ) self.print_html_items( field.items ) print "
    " @@ -379,10 +451,9 @@ class HtmlFormatter( Formatter ): table_fields = [] for field in markup.fields: if field.name: - # we begin a new series of field or value definitions, we - # will record them in the 'table_fields' list before outputting - # all of them as a single table - # + # We begin a new series of field or value definitions. We + # record them in the `table_fields' list before outputting + # all of them as a single table. table_fields.append( field ) else: if table_fields: @@ -395,7 +466,7 @@ class HtmlFormatter( Formatter ): self.print_html_field_list( table_fields ) # - # Formatting the index + # formatting the index # def index_enter( self ): print self.html_index_header @@ -407,11 +478,11 @@ class HtmlFormatter( Formatter ): self.index_items[name] = url def index_exit( self ): - # block_index already contains the sorted list of index names + # `block_index' already contains the sorted list of index names count = len( self.block_index ) - rows = ( count + self.columns - 1 ) / self.columns + rows = ( count + self.columns - 1 ) // self.columns - print "" + print '
    ' for r in range( rows ): line = "" for c in range( self.columns ): @@ -419,7 +490,8 @@ class HtmlFormatter( Formatter ): if i < count: bname = self.block_index[r + c * rows] url = self.index_items[bname] - line = line + '' + line = ( line + '' ) else: line = line + '' line = line + "" @@ -427,9 +499,9 @@ class HtmlFormatter( Formatter ): print "
    ' + bname + '' + + bname + '
    " - print index_footer_start + \ - self.file_prefix + "toc.html" + \ - index_footer_end + print( index_footer_start + + self.file_prefix + "toc.html" + + index_footer_end ) print self.html_footer @@ -442,21 +514,20 @@ class HtmlFormatter( Formatter ): Formatter.index_dump( self, index_filename ) # - # Formatting the table of content + # formatting the table of contents # def toc_enter( self ): print self.html_toc_header - print "

    Table of Contents

    " + print "

    Table of Contents

    " def toc_chapter_enter( self, chapter ): - print chapter_header + string.join( chapter.title ) + chapter_inter - print "" + print chapter_header + string.join( chapter.title ) + chapter_inter + print '
    ' def toc_section_enter( self, section ): - print '
    ' - print '' + \ - section.title + '' - + print ( '
    ' + + '' + + section.title + '' ) print self.make_html_para( section.abstract ) def toc_section_exit( self, section ): @@ -467,14 +538,14 @@ class HtmlFormatter( Formatter ): print chapter_footer def toc_index( self, index_filename ): - print chapter_header + \ - 'Global Index' + \ - chapter_inter + chapter_footer + print( chapter_header + + 'Global Index' + + chapter_inter + chapter_footer ) def toc_exit( self ): - print toc_footer_start + \ - self.file_prefix + "index.html" + \ - toc_footer_end + print( toc_footer_start + + self.file_prefix + "index.html" + + toc_footer_end ) print self.html_footer @@ -488,14 +559,12 @@ class HtmlFormatter( Formatter ): Formatter.toc_dump( self, toc_filename, index_filename ) # - # Formatting sections + # formatting sections # def section_enter( self, section ): print self.html_header - print section_title_header - print section.title - print section_title_footer + print section_title_header + section.title + section_title_footer maxwidth = 0 for b in section.blocks.values(): @@ -503,32 +572,43 @@ class HtmlFormatter( Formatter ): maxwidth = len( b.name ) width = 70 # XXX magic number - if maxwidth <> 0: + if maxwidth > 0: # print section synopsis print section_synopsis_header - print "" + print '
    ' - columns = width / maxwidth + columns = width // maxwidth if columns < 1: columns = 1 count = len( section.block_names ) - rows = ( count + columns - 1 ) / columns + # don't handle last entry if it is empty + if section.block_names[-1] == "/empty/": + count -= 1 + rows = ( count + columns - 1 ) // columns for r in range( rows ): line = "" for c in range( columns ): i = r + c * rows - line = line + '' line = line + "" print line - print "
    ' + line = line + '' if i < count: name = section.block_names[i] - line = line + '' + name + '' + if name == "/empty/": + # it can happen that a complete row is empty, and + # without a proper `filler' the browser might + # collapse the row to a much smaller height (or + # even omit it completely) + line = line + " " + else: + line = ( line + '' + + name + '' ) line = line + '


    " + print "
    " print section_synopsis_footer print description_header @@ -540,7 +620,7 @@ class HtmlFormatter( Formatter ): # place html anchor if needed if block.name: - print '

    ' + block.name + '

    ' + print( '

    ' + block.name + '

    ' ) # dump the block C source lines now if block.code: @@ -548,16 +628,17 @@ class HtmlFormatter( Formatter ): for f in self.headers.keys(): if block.source.filename.find( f ) >= 0: header = self.headers[f] + ' (' + f + ')' - break; - + break + # if not header: -# sys.stderr.write( \ -# 'WARNING: No header macro for ' + block.source.filename + '.\n' ) +# sys.stderr.write( +# "WARNING: No header macro for" +# + " '" + block.source.filename + "'.\n" ) if header: - print header_location_header - print 'Defined in ' + header + '.' - print header_location_footer + print ( header_location_header + + 'Defined in ' + header + '.' + + header_location_footer ) print source_header for l in block.code: @@ -579,15 +660,16 @@ class HtmlFormatter( Formatter ): print marker_footer def block_exit( self, block ): - print block_footer_start + self.file_prefix + "index.html" + \ - block_footer_middle + self.file_prefix + "toc.html" + \ - block_footer_end + print( block_footer_start + self.file_prefix + "index.html" + + block_footer_middle + self.file_prefix + "toc.html" + + block_footer_end ) def section_exit( self, section ): print html_footer def section_dump_all( self ): for section in self.sections: - self.section_dump( section, self.file_prefix + section.name + '.html' ) + self.section_dump( section, + self.file_prefix + section.name + '.html' ) # eof diff --git a/src/tools/docmaker/utils.py b/src/tools/docmaker/utils.py index 1d96658..b35823a 100644 --- a/src/tools/docmaker/utils.py +++ b/src/tools/docmaker/utils.py @@ -1,48 +1,42 @@ -# Utils (c) 2002, 2004, 2007, 2008 David Turner # - -import string, sys, os, glob - -# current output directory +# utils.py # -output_dir = None - - -# This function is used to sort the index. It is a simple lexicographical -# sort, except that it places capital letters before lowercase ones. +# Auxiliary functions for the `docmaker' tool (library file). # -def index_sort( s1, s2 ): - if not s1: - return -1 - - if not s2: - return 1 - - l1 = len( s1 ) - l2 = len( s2 ) - m1 = string.lower( s1 ) - m2 = string.lower( s2 ) +# Copyright 2002, 2004, 2007, 2008, 2014 by +# David Turner. +# +# This file is part of the FreeType project, and may only be used, +# modified, and distributed under the terms of the FreeType project +# license, LICENSE.TXT. By continuing to use, modify, or distribute +# this file you indicate that you have read the license and +# understand and accept it fully. - for i in range( l1 ): - if i >= l2 or m1[i] > m2[i]: - return 1 - if m1[i] < m2[i]: - return -1 +import string, sys, os, glob, itertools - if s1[i] < s2[i]: - return -1 - if s1[i] > s2[i]: - return 1 +# current output directory +# +output_dir = None - if l2 > l1: - return -1 - return 0 +# A function that generates a sorting key. We want lexicographical order +# (primary key) except that capital letters are sorted before lowercase +# ones (secondary key). +# +# The primary key is implemented by lowercasing the input. The secondary +# key is simply the original data appended, character by character. For +# example, the sort key for `FT_x' is `fFtT__xx', while the sort key for +# `ft_X' is `fftt__xX'. Since ASCII codes of uppercase letters are +# numerically smaller than the codes of lowercase letters, `fFtT__xx' gets +# sorted before `fftt__xX'. +# +def index_key( s ): + return string.join( itertools.chain( *zip( s.lower(), s ) ) ) -# Sort input_list, placing the elements of order_list in front. +# Sort `input_list', placing the elements of `order_list' in front. # def sort_order_list( input_list, order_list ): new_list = order_list[:] @@ -52,9 +46,9 @@ def sort_order_list( input_list, order_list ): return new_list -# Open the standard output to a given project documentation file. Use -# "output_dir" to determine the filename location if necessary and save the -# old stdout in a tuple that is returned by this function. +# Divert standard output to a given project documentation file. Use +# `output_dir' to determine the filename location if necessary and save the +# old stdout handle in a tuple that is returned by this function. # def open_output( filename ): global output_dir @@ -69,7 +63,7 @@ def open_output( filename ): return ( new_file, old_stdout ) -# Close the output that was returned by "close_output". +# Close the output that was returned by `open_output'. # def close_output( output ): output[0].close() @@ -83,15 +77,16 @@ def check_output(): if output_dir: if output_dir != "": if not os.path.isdir( output_dir ): - sys.stderr.write( "argument" + " '" + output_dir + "' " + \ - "is not a valid directory" ) + sys.stderr.write( "argument" + + " '" + output_dir + "' " + + "is not a valid directory" ) sys.exit( 2 ) else: output_dir = None def file_exists( pathname ): - """checks that a given file exists""" + """Check that a given file exists.""" result = 1 try: file = open( pathname, "r" ) @@ -104,12 +99,12 @@ def file_exists( pathname ): def make_file_list( args = None ): - """builds a list of input files from command-line arguments""" + """Build a list of input files from command-line arguments.""" file_list = [] # sys.stderr.write( repr( sys.argv[1 :] ) + '\n' ) if not args: - args = sys.argv[1 :] + args = sys.argv[1:] for pathname in args: if string.find( pathname, '*' ) >= 0: diff --git a/src/tools/ftrandom/README b/src/tools/ftrandom/README index c093f15..71bf053 100644 --- a/src/tools/ftrandom/README +++ b/src/tools/ftrandom/README @@ -43,6 +43,6 @@ Arguments are: --rasterize Call FT_Render_Glyph as well as loading it. --result This is the directory in which test files are placed. - --test Run a single test on a pre-generated testcase. + --test Run a single test on a pre-generated testcase. Done in the current process so it can be debugged more easily. diff --git a/src/tools/ftrandom/ftrandom.c b/src/tools/ftrandom/ftrandom.c index 4daac0d..9a5b632 100644 --- a/src/tools/ftrandom/ftrandom.c +++ b/src/tools/ftrandom/ftrandom.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2005, 2007, 2008 by George Williams */ +/* Copyright (C) 2005, 2007, 2008, 2013 by George Williams */ /* * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -184,7 +184,6 @@ { FT_Library context; FT_Face face; - int i, num; if ( FT_Init_FreeType( &context ) ) @@ -203,6 +202,9 @@ TestFace( face ); else { + int i, num; + + num = face->num_faces; FT_Done_Face( face ); @@ -327,12 +329,9 @@ FindFonts( char** fontdirs, char** extensions ) { - DIR* examples; - struct dirent* ent; - - int i, max; - char buffer[1025]; - struct stat statb; + int i, max; + char buffer[1025]; + struct stat statb; max = 0; @@ -340,6 +339,10 @@ for ( i = 0; fontdirs[i] != NULL; ++i ) { + DIR* examples; + struct dirent* ent; + + examples = opendir( fontdirs[i] ); if ( examples == NULL ) { @@ -446,9 +449,9 @@ fseek( new, getRandom( 0, item->len - 1 ), SEEK_SET ); if ( item->isbinary ) - putc( getRandom( 0, 0xff ), new ); + putc( getRandom( 0, 0xFF ), new ); else if ( item->isascii ) - putc( getRandom( 0x20, 0x7e ), new ); + putc( getRandom( 0x20, 0x7E ), new ); else { int hex = getRandom( 0, 15 ); @@ -555,7 +558,6 @@ char** argv ) { char **dirs, **exts; - char *pt, *end; int dcnt = 0, ecnt = 0, rset = false, allexts = false; int i; time_t now; @@ -567,7 +569,10 @@ for ( i = 1; i < argc; ++i ) { - pt = argv[i]; + char* pt = argv[i]; + char* end; + + if ( pt[0] == '-' && pt[1] == '-' ) ++pt; @@ -633,12 +638,21 @@ } if ( allexts ) + { + free( exts ); exts = NULL; + } else if ( ecnt == 0 ) + { + free( exts ); exts = default_ext_list; + } if ( dcnt == 0 ) + { + free( dirs ); dirs = default_dir_list; + } if ( testfile != NULL ) ExecuteTest( testfile ); /* This should never return */ diff --git a/src/tools/test_afm.c b/src/tools/test_afm.c index f5f9936..24cd0c4 100644 --- a/src/tools/test_afm.c +++ b/src/tools/test_afm.c @@ -118,7 +118,7 @@ if ( argc < 2 ) - return FT_Err_Invalid_Argument; + return FT_ERR( Invalid_Argument ); error = FT_Init_FreeType( &library ); if ( error ) diff --git a/src/tools/test_bbox.c b/src/tools/test_bbox.c index e085c5b..64b82c3 100644 --- a/src/tools/test_bbox.c +++ b/src/tools/test_bbox.c @@ -88,6 +88,26 @@ }; + /* dummy outline #3 with bbox of [0 100 128 128] precisely */ + static FT_Vector dummy_vec_3[4] = + { + XVEC( 100.0, 127.0 ), + XVEC( 200.0, 127.0 ), + XVEC( 0.0, 136.0 ), + XVEC( 0.0, 100.0 ) + }; + + static FT_Outline dummy_outline_3 = + { + 1, + 4, + dummy_vec_3, + dummy_tag_1, + dummy_contour_1, + 0 + }; + + static void dump_outline( FT_Outline* outline ) { @@ -125,12 +145,14 @@ FT_Outline_Get_CBox( outline, &bbox ); time0 = get_time() - time0; - printf( "time = %5.2f cbox = [%.2f %.2f %.2f %.2f]\n", + printf( "time = %6.3f cbox = [%8.4f %8.4f %8.4f %8.4f]\n", ((double)time0/10000.0), XVAL( bbox.xMin ), XVAL( bbox.yMin ), XVAL( bbox.xMax ), XVAL( bbox.yMax ) ); + printf( "cbox_hex = [%08X %08X %08X %08X]\n", + bbox.xMin, bbox.yMin, bbox.xMax, bbox.yMax ); time0 = get_time(); @@ -138,15 +160,17 @@ FT_Outline_Get_BBox( outline, &bbox ); time0 = get_time() - time0; - printf( "time = %5.2f bbox = [%.2f %.2f %.2f %.2f]\n", + printf( "time = %6.3f bbox = [%8.4f %8.4f %8.4f %8.4f]\n", ((double)time0/10000.0), XVAL( bbox.xMin ), XVAL( bbox.yMin ), XVAL( bbox.xMax ), XVAL( bbox.yMax ) ); + printf( "bbox_hex = [%08X %08X %08X %08X]\n", + bbox.xMin, bbox.yMin, bbox.xMax, bbox.yMax ); } -#define REPEAT 100000L +#define REPEAT 1000000L int main( int argc, char** argv ) { @@ -155,6 +179,10 @@ printf( "outline #2\n" ); profile_outline( &dummy_outline_2, REPEAT ); + + printf( "outline #3\n" ); + profile_outline( &dummy_outline_3, REPEAT ); + return 0; } diff --git a/src/tools/test_trig.c b/src/tools/test_trig.c index 8c8a544..99ac1cf 100644 --- a/src/tools/test_trig.c +++ b/src/tools/test_trig.c @@ -8,9 +8,8 @@ #define PI 3.14159265358979323846 #define SPI (PI/FT_ANGLE_PI) -/* the precision in 16.16 fixed float points of the checks. Expect */ -/* between 2 and 5 noise LSB bits during operations, due to */ -/* rounding errors.. */ +/* the precision in 16.16 fixed-point checks. Expect between 2 and 5 */ +/* noise LSB bits during operations, due to rounding errors.. */ #define THRESHOLD 64 static error = 0; @@ -18,14 +17,16 @@ static void test_cos( void ) { - FT_Fixed f1, f2; - double d1, d2; - int i; + int i; - for ( i = 0; i < FT_ANGLE_2PI; i += 0x10000 ) + + for ( i = 0; i < FT_ANGLE_2PI; i += 0x10000L ) { + FT_Fixed f1, f2; + double d2; + + f1 = FT_Cos(i); - d1 = f1/65536.0; d2 = cos( i*SPI ); f2 = (FT_Fixed)(d2*65536.0); @@ -39,18 +40,19 @@ } - static void test_sin( void ) { - FT_Fixed f1, f2; - double d1, d2; - int i; + int i; - for ( i = 0; i < FT_ANGLE_2PI; i += 0x10000 ) + + for ( i = 0; i < FT_ANGLE_2PI; i += 0x10000L ) { + FT_Fixed f1, f2; + double d2; + + f1 = FT_Sin(i); - d1 = f1/65536.0; d2 = sin( i*SPI ); f2 = (FT_Fixed)(d2*65536.0); @@ -67,14 +69,16 @@ static void test_tan( void ) { - FT_Fixed f1, f2; - double d1, d2; - int i; + int i; - for ( i = 0; i < FT_ANGLE_PI2-0x2000000; i += 0x10000 ) + + for ( i = 0; i < FT_ANGLE_PI2 - 0x2000000L; i += 0x10000L ) { + FT_Fixed f1, f2; + double d2; + + f1 = FT_Tan(i); - d1 = f1/65536.0; d2 = tan( i*SPI ); f2 = (FT_Fixed)(d2*65536.0); @@ -91,12 +95,16 @@ static void test_atan2( void ) { - FT_Fixed c2, s2; - double l, a, c1, s1; - int i, j; + int i; - for ( i = 0; i < FT_ANGLE_2PI; i += 0x10000 ) + + for ( i = 0; i < FT_ANGLE_2PI; i += 0x10000L ) { + FT_Fixed c2, s2; + double l, a, c1, s1; + int j; + + l = 5.0; a = i*SPI; @@ -118,16 +126,20 @@ } } + static void test_unit( void ) { - FT_Vector v; - double a, c1, s1; - FT_Fixed c2, s2; - int i; + int i; + - for ( i = 0; i < FT_ANGLE_2PI; i += 0x10000 ) + for ( i = 0; i < FT_ANGLE_2PI; i += 0x10000L ) { + FT_Vector v; + double a, c1, s1; + FT_Fixed c2, s2; + + FT_Vector_Unit( &v, i ); a = ( i*SPI ); c1 = cos(a); @@ -151,12 +163,15 @@ static void test_length( void ) { - FT_Vector v; - FT_Fixed l, l2; - int i; + int i; + - for ( i = 0; i < FT_ANGLE_2PI; i += 0x10000 ) + for ( i = 0; i < FT_ANGLE_2PI; i += 0x10000L ) { + FT_Vector v; + FT_Fixed l, l2; + + l = (FT_Fixed)(500.0*65536.0); v.x = (FT_Fixed)( l * cos( i*SPI ) ); v.y = (FT_Fixed)( l * sin( i*SPI ) ); @@ -175,19 +190,26 @@ static void test_rotate( void ) { - FT_Fixed c2, s2, c4, s4; - FT_Vector v; - double l, ra, a, c1, s1, cra, sra, c3, s3; - int i, j, rotate; + int rotate; + - for ( rotate = 0; rotate < FT_ANGLE_2PI; rotate += 0x10000 ) + for ( rotate = 0; rotate < FT_ANGLE_2PI; rotate += 0x10000L ) { + double ra, cra, sra; + int i; + + ra = rotate*SPI; cra = cos( ra ); sra = sin( ra ); - for ( i = 0; i < FT_ANGLE_2PI; i += 0x10000 ) + for ( i = 0; i < FT_ANGLE_2PI; i += 0x10000L ) { + FT_Fixed c2, s2, c4, s4; + FT_Vector v; + double l, a, c1, s1, c3, s3; + + l = 500.0; a = i*SPI; diff --git a/src/truetype/rules.mk b/src/truetype/rules.mk index 507ef16..d4b69f5 100644 --- a/src/truetype/rules.mk +++ b/src/truetype/rules.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2000, 2001, 2003, 2004, 2011 by +# Copyright 1996-2001, 2003-2004, 2011-2012 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -31,7 +31,8 @@ TT_DRV_SRC := $(TT_DIR)/ttdriver.c \ $(TT_DIR)/ttinterp.c \ $(TT_DIR)/ttobjs.c \ $(TT_DIR)/ttpic.c \ - $(TT_DIR)/ttpload.c + $(TT_DIR)/ttpload.c \ + $(TT_DIR)/ttsubpix.c # TrueType driver headers # diff --git a/src/truetype/truetype.c b/src/truetype/truetype.c index 4bd1209..576912b 100644 --- a/src/truetype/truetype.c +++ b/src/truetype/truetype.c @@ -4,7 +4,7 @@ /* */ /* FreeType TrueType driver component (body only). */ /* */ -/* Copyright 1996-2001, 2004, 2006 by */ +/* Copyright 1996-2001, 2004, 2006, 2012 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -27,6 +27,7 @@ #ifdef TT_USE_BYTECODE_INTERPRETER #include "ttinterp.c" +#include "ttsubpix.c" #endif #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT diff --git a/src/truetype/ttdriver.c b/src/truetype/ttdriver.c index 3669d45..ecf4cdc 100644 --- a/src/truetype/ttdriver.c +++ b/src/truetype/ttdriver.c @@ -4,7 +4,7 @@ /* */ /* TrueType font driver implementation (body). */ /* */ -/* Copyright 1996-2012 by */ +/* Copyright 1996-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -29,6 +29,8 @@ #include FT_SERVICE_TRUETYPE_ENGINE_H #include FT_SERVICE_TRUETYPE_GLYF_H +#include FT_SERVICE_PROPERTIES_H +#include FT_TRUETYPE_DRIVER_H #include "ttdriver.h" #include "ttgload.h" @@ -52,6 +54,73 @@ #define FT_COMPONENT trace_ttdriver + /* + * PROPERTY SERVICE + * + */ + static FT_Error + tt_property_set( FT_Module module, /* TT_Driver */ + const char* property_name, + const void* value ) + { + FT_Error error = FT_Err_Ok; + TT_Driver driver = (TT_Driver)module; + + + if ( !ft_strcmp( property_name, "interpreter-version" ) ) + { + FT_UInt* interpreter_version = (FT_UInt*)value; + + +#ifndef TT_CONFIG_OPTION_SUBPIXEL_HINTING + if ( *interpreter_version != TT_INTERPRETER_VERSION_35 ) + error = FT_ERR( Unimplemented_Feature ); + else +#endif + driver->interpreter_version = *interpreter_version; + + return error; + } + + FT_TRACE0(( "tt_property_set: missing property `%s'\n", + property_name )); + return FT_THROW( Missing_Property ); + } + + + static FT_Error + tt_property_get( FT_Module module, /* TT_Driver */ + const char* property_name, + const void* value ) + { + FT_Error error = FT_Err_Ok; + TT_Driver driver = (TT_Driver)module; + + FT_UInt interpreter_version = driver->interpreter_version; + + + if ( !ft_strcmp( property_name, "interpreter-version" ) ) + { + FT_UInt* val = (FT_UInt*)value; + + + *val = interpreter_version; + + return error; + } + + FT_TRACE0(( "tt_property_get: missing property `%s'\n", + property_name )); + return FT_THROW( Missing_Property ); + } + + + FT_DEFINE_SERVICE_PROPERTIESREC( + tt_service_properties, + (FT_Properties_SetFunc)tt_property_set, + (FT_Properties_GetFunc)tt_property_get ) + + /*************************************************************************/ /*************************************************************************/ /*************************************************************************/ @@ -146,7 +215,8 @@ FT_UShort ah; - TT_Get_VMetrics( face, start + nn, &tsb, &ah ); + /* since we don't need `tsb', we use zero for `yMax' parameter */ + TT_Get_VMetrics( face, start + nn, 0, &tsb, &ah ); advances[nn] = ah; } } @@ -163,7 +233,7 @@ } } - return TT_Err_Ok; + return FT_Err_Ok; } /*************************************************************************/ @@ -187,7 +257,7 @@ { TT_Face ttface = (TT_Face)size->face; TT_Size ttsize = (TT_Size)size; - FT_Error error = TT_Err_Ok; + FT_Error error = FT_Err_Ok; ttsize->strike_index = strike_index; @@ -197,7 +267,7 @@ /* use the scaled metrics, even when tt_size_reset fails */ FT_Select_Metrics( size->face, strike_index ); - tt_size_reset( ttsize ); + tt_size_reset( ttsize ); /* ignore return value */ } else { @@ -221,7 +291,7 @@ FT_Size_Request req ) { TT_Size ttsize = (TT_Size)size; - FT_Error error = TT_Err_Ok; + FT_Error error = FT_Err_Ok; #ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS @@ -294,13 +364,13 @@ if ( !slot ) - return TT_Err_Invalid_Slot_Handle; + return FT_THROW( Invalid_Slot_Handle ); if ( !size ) - return TT_Err_Invalid_Size_Handle; + return FT_THROW( Invalid_Size_Handle ); if ( !face ) - return TT_Err_Invalid_Argument; + return FT_THROW( Invalid_Face_Handle ); #ifdef FT_CONFIG_OPTION_INCREMENTAL if ( glyph_index >= (FT_UInt)face->num_glyphs && @@ -308,7 +378,7 @@ #else if ( glyph_index >= (FT_UInt)face->num_glyphs ) #endif - return TT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); if ( load_flags & FT_LOAD_NO_HINTING ) { @@ -353,13 +423,13 @@ /*************************************************************************/ #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT - FT_DEFINE_SERVICE_MULTIMASTERSREC(tt_service_gx_multi_masters, + FT_DEFINE_SERVICE_MULTIMASTERSREC( + tt_service_gx_multi_masters, (FT_Get_MM_Func) NULL, (FT_Set_MM_Design_Func) NULL, (FT_Set_MM_Blend_Func) TT_Set_MM_Blend, (FT_Get_MM_Var_Func) TT_Get_MM_Var, - (FT_Set_Var_Design_Func)TT_Set_Var_Design - ) + (FT_Set_Var_Design_Func)TT_Set_Var_Design ) #endif static const FT_Service_TrueTypeEngineRec tt_service_truetype_engine = @@ -379,25 +449,28 @@ #endif /* TT_USE_BYTECODE_INTERPRETER */ }; - FT_DEFINE_SERVICE_TTGLYFREC(tt_service_truetype_glyf, - (TT_Glyf_GetLocationFunc)tt_face_get_location - ) + FT_DEFINE_SERVICE_TTGLYFREC( + tt_service_truetype_glyf, + (TT_Glyf_GetLocationFunc)tt_face_get_location ) #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT - FT_DEFINE_SERVICEDESCREC4(tt_services, + FT_DEFINE_SERVICEDESCREC5( + tt_services, FT_SERVICE_ID_XF86_NAME, FT_XF86_FORMAT_TRUETYPE, - FT_SERVICE_ID_MULTI_MASTERS, &FT_TT_SERVICE_GX_MULTI_MASTERS_GET, + FT_SERVICE_ID_MULTI_MASTERS, &TT_SERVICE_GX_MULTI_MASTERS_GET, FT_SERVICE_ID_TRUETYPE_ENGINE, &tt_service_truetype_engine, - FT_SERVICE_ID_TT_GLYF, &FT_TT_SERVICE_TRUETYPE_GLYF_GET - ) + FT_SERVICE_ID_TT_GLYF, &TT_SERVICE_TRUETYPE_GLYF_GET, + FT_SERVICE_ID_PROPERTIES, &TT_SERVICE_PROPERTIES_GET ) #else - FT_DEFINE_SERVICEDESCREC3(tt_services, + FT_DEFINE_SERVICEDESCREC4( + tt_services, FT_SERVICE_ID_XF86_NAME, FT_XF86_FORMAT_TRUETYPE, FT_SERVICE_ID_TRUETYPE_ENGINE, &tt_service_truetype_engine, - FT_SERVICE_ID_TT_GLYF, &FT_TT_SERVICE_TRUETYPE_GLYF_GET - ) + FT_SERVICE_ID_TT_GLYF, &TT_SERVICE_TRUETYPE_GLYF_GET, + FT_SERVICE_ID_PROPERTIES, &TT_SERVICE_PROPERTIES_GET ) #endif + FT_CALLBACK_DEF( FT_Module_Interface ) tt_get_interface( FT_Module driver, /* TT_Driver */ const char* tt_interface ) @@ -408,7 +481,7 @@ SFNT_Service sfnt; - /* FT_TT_SERVICES_GET derefers `library' in PIC mode */ + /* TT_SERVICES_GET dereferences `library' in PIC mode */ #ifdef FT_CONFIG_OPTION_PIC if ( !driver ) return NULL; @@ -417,7 +490,7 @@ return NULL; #endif - result = ft_service_list_lookup( FT_TT_SERVICES_GET, tt_interface ); + result = ft_service_list_lookup( TT_SERVICES_GET, tt_interface ); if ( result != NULL ) return result; @@ -445,18 +518,19 @@ /* The FT_DriverInterface structure is defined in ftdriver.h. */ #ifdef TT_USE_BYTECODE_INTERPRETER -#define TT_HINTER_FLAG FT_MODULE_DRIVER_HAS_HINTER +#define TT_HINTER_FLAG FT_MODULE_DRIVER_HAS_HINTER #else -#define TT_HINTER_FLAG 0 +#define TT_HINTER_FLAG 0 #endif #ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS -#define TT_SIZE_SELECT tt_size_select +#define TT_SIZE_SELECT tt_size_select #else -#define TT_SIZE_SELECT 0 +#define TT_SIZE_SELECT 0 #endif - FT_DEFINE_DRIVER( tt_driver_class, + FT_DEFINE_DRIVER( + tt_driver_class, FT_MODULE_FONT_DRIVER | FT_MODULE_DRIVER_SCALABLE | @@ -485,9 +559,6 @@ tt_slot_init, 0, /* FT_Slot_DoneFunc */ - ft_stub_set_char_sizes, /* FT_CONFIG_OPTION_OLD_INTERNALS */ - ft_stub_set_pixel_sizes, /* FT_CONFIG_OPTION_OLD_INTERNALS */ - tt_glyph_load, tt_get_kerning, diff --git a/src/truetype/ttgload.c b/src/truetype/ttgload.c index ce8c888..c5841c3 100644 --- a/src/truetype/ttgload.c +++ b/src/truetype/ttgload.c @@ -4,7 +4,7 @@ /* */ /* TrueType Glyph Loader (body). */ /* */ -/* Copyright 1996-2012 */ +/* Copyright 1996-2014 */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -23,6 +23,7 @@ #include FT_INTERNAL_SFNT_H #include FT_TRUETYPE_TAGS_H #include FT_OUTLINE_H +#include FT_TRUETYPE_DRIVER_H #include "ttgload.h" #include "ttpload.h" @@ -32,6 +33,7 @@ #endif #include "tterrors.h" +#include "ttsubpix.h" /*************************************************************************/ @@ -83,77 +85,90 @@ /*************************************************************************/ /* */ /* Return the vertical metrics in font units for a given glyph. */ - /* Greg Hitchcock from Microsoft told us that if there were no `vmtx' */ - /* table, typoAscender/Descender from the `OS/2' table would be used */ - /* instead, and if there were no `OS/2' table, use ascender/descender */ - /* from the `hhea' table. But that is not what Microsoft's rasterizer */ - /* apparently does: It uses the ppem value as the advance height, and */ - /* sets the top side bearing to be zero. */ + /* See macro `TT_LOADER_SET_PP' below for explanations. */ /* */ FT_LOCAL_DEF( void ) TT_Get_VMetrics( TT_Face face, FT_UInt idx, + FT_Pos yMax, FT_Short* tsb, FT_UShort* ah ) { if ( face->vertical_info ) ( (SFNT_Service)face->sfnt )->get_metrics( face, 1, idx, tsb, ah ); -#if 1 /* Empirically determined, at variance with what MS said */ - - else - { - *tsb = 0; - *ah = face->root.units_per_EM; - } - -#else /* This is what MS said to do. It isn't what they do, however. */ - else if ( face->os2.version != 0xFFFFU ) { - *tsb = face->os2.sTypoAscender; + *tsb = (FT_Short)( face->os2.sTypoAscender - yMax ); *ah = face->os2.sTypoAscender - face->os2.sTypoDescender; } + else { - *tsb = face->horizontal.Ascender; + *tsb = (FT_Short)( face->horizontal.Ascender - yMax ); *ah = face->horizontal.Ascender - face->horizontal.Descender; } -#endif - FT_TRACE5(( " advance height (font units): %d\n", *ah )); FT_TRACE5(( " top side bearing (font units): %d\n", *tsb )); } - static void + static FT_Error tt_get_metrics( TT_Loader loader, FT_UInt glyph_index ) { - TT_Face face = (TT_Face)loader->face; + TT_Face face = (TT_Face)loader->face; +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + TT_Driver driver = (TT_Driver)FT_FACE_DRIVER( face ); +#endif + + FT_Error error; + FT_Stream stream = loader->stream; FT_Short left_bearing = 0, top_bearing = 0; FT_UShort advance_width = 0, advance_height = 0; + /* we must preserve the stream position */ + /* (which gets altered by the metrics functions) */ + FT_ULong pos = FT_STREAM_POS(); + TT_Get_HMetrics( face, glyph_index, &left_bearing, &advance_width ); TT_Get_VMetrics( face, glyph_index, + loader->bbox.yMax, &top_bearing, &advance_height ); + if ( FT_STREAM_SEEK( pos ) ) + return error; + loader->left_bearing = left_bearing; loader->advance = advance_width; loader->top_bearing = top_bearing; loader->vadvance = advance_height; +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + if ( driver->interpreter_version == TT_INTERPRETER_VERSION_38 ) + { + if ( loader->exec ) + loader->exec->sph_tweak_flags = 0; + + /* this may not be the right place for this, but it works */ + if ( loader->exec && loader->exec->ignore_x_mode ) + sph_set_tweaks( loader, glyph_index ); + } +#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */ + if ( !loader->linear_def ) { loader->linear_def = 1; loader->linear = advance_width; } + + return FT_Err_Ok; } @@ -252,10 +267,6 @@ } -#undef IS_HINTED -#define IS_HINTED( flags ) ( ( flags & FT_LOAD_NO_HINTING ) == 0 ) - - /*************************************************************************/ /* */ /* The following functions are used by default with TrueType fonts. */ @@ -286,7 +297,7 @@ loader->cursor = stream->cursor; loader->limit = stream->limit; - return TT_Err_Ok; + return FT_Err_Ok; } @@ -308,7 +319,7 @@ if ( p + 10 > limit ) - return TT_Err_Invalid_Outline; + return FT_THROW( Invalid_Outline ); loader->n_contours = FT_NEXT_SHORT( p ); @@ -324,7 +335,7 @@ loader->bbox.yMax )); loader->cursor = p; - return TT_Err_Ok; + return FT_Err_Ok; } @@ -337,9 +348,9 @@ FT_GlyphLoader gloader = load->gloader; FT_Int n_contours = load->n_contours; FT_Outline* outline; - TT_Face face = (TT_Face)load->face; FT_UShort n_ins; FT_Int n_points; + FT_ULong tmp; FT_Byte *flag, *flag_limit; FT_Byte c, count; @@ -405,18 +416,11 @@ FT_TRACE5(( " Instructions size: %u\n", n_ins )); - if ( n_ins > face->max_profile.maxSizeOfInstructions ) - { - FT_TRACE0(( "TT_Load_Simple_Glyph: too many instructions (%d)\n", - n_ins )); - error = TT_Err_Too_Many_Hints; - goto Fail; - } - + /* check it */ if ( ( limit - p ) < n_ins ) { FT_TRACE0(( "TT_Load_Simple_Glyph: instruction count mismatch\n" )); - error = TT_Err_Too_Many_Hints; + error = FT_THROW( Too_Many_Hints ); goto Fail; } @@ -424,6 +428,20 @@ if ( IS_HINTED( load->load_flags ) ) { + /* we don't trust `maxSizeOfInstructions' in the `maxp' table */ + /* and thus update the bytecode array size by ourselves */ + + tmp = load->exec->glyphSize; + error = Update_Max( load->exec->memory, + &tmp, + sizeof ( FT_Byte ), + (void*)&load->exec->glyphIns, + n_ins ); + + load->exec->glyphSize = (FT_UShort)tmp; + if ( error ) + return error; + load->glyph->control_len = n_ins; load->glyph->control_data = load->exec->glyphIns; @@ -546,7 +564,7 @@ return error; Invalid_Outline: - error = TT_Err_Invalid_Outline; + error = FT_THROW( Invalid_Outline ); goto Fail; } @@ -667,7 +685,7 @@ return error; Invalid_Composite: - error = TT_Err_Invalid_Composite; + error = FT_THROW( Invalid_Composite ); goto Fail; } @@ -714,8 +732,12 @@ TT_Hint_Glyph( TT_Loader loader, FT_Bool is_composite ) { +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + TT_Face face = (TT_Face)loader->face; + TT_Driver driver = (TT_Driver)FT_FACE_DRIVER( face ); +#endif + TT_GlyphZone zone = &loader->zone; - FT_Pos origin; #ifdef TT_USE_BYTECODE_INTERPRETER FT_UInt n_ins; @@ -727,19 +749,12 @@ #ifdef TT_USE_BYTECODE_INTERPRETER if ( loader->glyph->control_len > 0xFFFFL ) { - FT_TRACE1(( "TT_Hint_Glyph: too long instructions " )); - FT_TRACE1(( "(0x%lx byte) is truncated\n", + FT_TRACE1(( "TT_Hint_Glyph: too long instructions" )); + FT_TRACE1(( " (0x%lx byte) is truncated\n", loader->glyph->control_len )); } n_ins = (FT_UInt)( loader->glyph->control_len ); -#endif - - origin = zone->cur[zone->n_points - 4].x; - origin = FT_PIX_ROUND( origin ) - origin; - if ( origin ) - translate_array( zone->n_points, zone->cur, origin, 0 ); -#ifdef TT_USE_BYTECODE_INTERPRETER /* save original point position in org */ if ( n_ins > 0 ) FT_ARRAY_COPY( zone->org, zone->cur, zone->n_points ); @@ -765,9 +780,13 @@ } #endif - /* round pp2 and pp4 */ + /* round phantom points */ + zone->cur[zone->n_points - 4].x = + FT_PIX_ROUND( zone->cur[zone->n_points - 4].x ); zone->cur[zone->n_points - 3].x = FT_PIX_ROUND( zone->cur[zone->n_points - 3].x ); + zone->cur[zone->n_points - 2].y = + FT_PIX_ROUND( zone->cur[zone->n_points - 2].y ); zone->cur[zone->n_points - 1].y = FT_PIX_ROUND( zone->cur[zone->n_points - 1].y ); @@ -782,10 +801,8 @@ FT_Outline current_outline = gloader->current.outline; - error = TT_Set_CodeRange( loader->exec, tt_coderange_glyph, - loader->exec->glyphIns, n_ins ); - if ( error ) - return error; + TT_Set_CodeRange( loader->exec, tt_coderange_glyph, + loader->exec->glyphIns, n_ins ); loader->exec->is_composite = is_composite; loader->exec->pts = *zone; @@ -805,15 +822,23 @@ #endif /* save glyph phantom points */ - if ( !loader->preserve_pps ) + loader->pp1 = zone->cur[zone->n_points - 4]; + loader->pp2 = zone->cur[zone->n_points - 3]; + loader->pp3 = zone->cur[zone->n_points - 2]; + loader->pp4 = zone->cur[zone->n_points - 1]; + +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + if ( driver->interpreter_version == TT_INTERPRETER_VERSION_38 ) { - loader->pp1 = zone->cur[zone->n_points - 4]; - loader->pp2 = zone->cur[zone->n_points - 3]; - loader->pp3 = zone->cur[zone->n_points - 2]; - loader->pp4 = zone->cur[zone->n_points - 1]; + if ( loader->exec->sph_tweak_flags & SPH_TWEAK_DEEMBOLDEN ) + FT_Outline_EmboldenXY( &loader->gloader->current.outline, -24, 0 ); + + else if ( loader->exec->sph_tweak_flags & SPH_TWEAK_EMBOLDEN ) + FT_Outline_EmboldenXY( &loader->gloader->current.outline, 24, 0 ); } +#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */ - return TT_Err_Ok; + return FT_Err_Ok; } @@ -831,7 +856,7 @@ TT_Process_Simple_Glyph( TT_Loader loader ) { FT_GlyphLoader gloader = loader->gloader; - FT_Error error = TT_Err_Ok; + FT_Error error = FT_Err_Ok; FT_Outline* outline; FT_Int n_points; @@ -889,25 +914,83 @@ loader->zone.n_points + 4 ); } - /* scale the glyph */ - if ( ( loader->load_flags & FT_LOAD_NO_SCALE ) == 0 ) { - FT_Vector* vec = outline->points; - FT_Vector* limit = outline->points + n_points; - FT_Fixed x_scale = ((TT_Size)loader->size)->metrics.x_scale; - FT_Fixed y_scale = ((TT_Size)loader->size)->metrics.y_scale; +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + TT_Face face = (TT_Face)loader->face; + TT_Driver driver = (TT_Driver)FT_FACE_DRIVER( face ); + + FT_String* family = face->root.family_name; + FT_Int ppem = loader->size->metrics.x_ppem; + FT_String* style = face->root.style_name; + FT_Int x_scale_factor = 1000; +#endif + + FT_Vector* vec = outline->points; + FT_Vector* limit = outline->points + n_points; + + FT_Fixed x_scale = 0; /* pacify compiler */ + FT_Fixed y_scale = 0; + FT_Bool do_scale = FALSE; - for ( ; vec < limit; vec++ ) + +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + + if ( driver->interpreter_version == TT_INTERPRETER_VERSION_38 ) { - vec->x = FT_MulFix( vec->x, x_scale ); - vec->y = FT_MulFix( vec->y, y_scale ); + /* scale, but only if enabled and only if TT hinting is being used */ + if ( IS_HINTED( loader->load_flags ) ) + x_scale_factor = sph_test_tweak_x_scaling( face, + family, + ppem, + style, + loader->glyph_index ); + /* scale the glyph */ + if ( ( loader->load_flags & FT_LOAD_NO_SCALE ) == 0 || + x_scale_factor != 1000 ) + { + x_scale = FT_MulDiv( ((TT_Size)loader->size)->metrics.x_scale, + x_scale_factor, 1000 ); + y_scale = ((TT_Size)loader->size)->metrics.y_scale; + + /* compensate for any scaling by de/emboldening; */ + /* the amount was determined via experimentation */ + if ( x_scale_factor != 1000 && ppem > 11 ) + FT_Outline_EmboldenXY( outline, + FT_MulFix( 1280 * ppem, + 1000 - x_scale_factor ), + 0 ); + do_scale = TRUE; + } } + else + +#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */ + + { + /* scale the glyph */ + if ( ( loader->load_flags & FT_LOAD_NO_SCALE ) == 0 ) + { + x_scale = ((TT_Size)loader->size)->metrics.x_scale; + y_scale = ((TT_Size)loader->size)->metrics.y_scale; - loader->pp1 = outline->points[n_points - 4]; - loader->pp2 = outline->points[n_points - 3]; - loader->pp3 = outline->points[n_points - 2]; - loader->pp4 = outline->points[n_points - 1]; + do_scale = TRUE; + } + } + + if ( do_scale ) + { + for ( ; vec < limit; vec++ ) + { + vec->x = FT_MulFix( vec->x, x_scale ); + vec->y = FT_MulFix( vec->y, y_scale ); + } + + loader->pp1 = outline->points[n_points - 4]; + loader->pp2 = outline->points[n_points - 3]; + loader->pp3 = outline->points[n_points - 2]; + loader->pp4 = outline->points[n_points - 1]; + } } if ( IS_HINTED( loader->load_flags ) ) @@ -974,7 +1057,7 @@ l += num_base_points; if ( k >= num_base_points || l >= num_points ) - return TT_Err_Invalid_Composite; + return FT_THROW( Invalid_Composite ); p1 = gloader->base.outline.points + k; p2 = gloader->base.outline.points + l; @@ -988,11 +1071,11 @@ y = subglyph->arg2; if ( !x && !y ) - return TT_Err_Ok; + return FT_Err_Ok; - /* Use a default value dependent on */ - /* TT_CONFIG_OPTION_COMPONENT_OFFSET_SCALED. This is useful for old TT */ - /* fonts which don't set the xxx_COMPONENT_OFFSET bit. */ + /* Use a default value dependent on */ + /* TT_CONFIG_OPTION_COMPONENT_OFFSET_SCALED. This is useful for old */ + /* TT fonts which don't set the xxx_COMPONENT_OFFSET bit. */ if ( have_scale && #ifdef TT_CONFIG_OPTION_COMPONENT_OFFSET_SCALED @@ -1004,10 +1087,10 @@ #if 0 - /*************************************************************************/ - /* */ - /* This algorithm is what Apple documents. But it doesn't work. */ - /* */ + /*******************************************************************/ + /* */ + /* This algorithm is what Apple documents. But it doesn't work. */ + /* */ int a = subglyph->transform.xx > 0 ? subglyph->transform.xx : -subglyph->transform.xx; int b = subglyph->transform.yx > 0 ? subglyph->transform.yx @@ -1027,28 +1110,22 @@ x = FT_MulFix( x, m ); y = FT_MulFix( y, n ); -#else /* 0 */ +#else /* 1 */ - /*************************************************************************/ - /* */ - /* This algorithm is a guess and works much better than the above. */ - /* */ - FT_Fixed mac_xscale = FT_SqrtFixed( - (FT_Int32)FT_MulFix( subglyph->transform.xx, - subglyph->transform.xx ) + - (FT_Int32)FT_MulFix( subglyph->transform.xy, - subglyph->transform.xy ) ); - FT_Fixed mac_yscale = FT_SqrtFixed( - (FT_Int32)FT_MulFix( subglyph->transform.yy, - subglyph->transform.yy ) + - (FT_Int32)FT_MulFix( subglyph->transform.yx, - subglyph->transform.yx ) ); + /*******************************************************************/ + /* */ + /* This algorithm is a guess and works much better than the above. */ + /* */ + FT_Fixed mac_xscale = FT_Hypot( subglyph->transform.xx, + subglyph->transform.xy ); + FT_Fixed mac_yscale = FT_Hypot( subglyph->transform.yy, + subglyph->transform.yx ); x = FT_MulFix( x, mac_xscale ); y = FT_MulFix( y, mac_yscale ); -#endif /* 0 */ +#endif /* 1 */ } @@ -1074,7 +1151,7 @@ base_vec + num_base_points, x, y ); - return TT_Err_Ok; + return FT_Err_Ok; } @@ -1137,27 +1214,29 @@ max_ins = ((TT_Face)loader->face)->max_profile.maxSizeOfInstructions; if ( n_ins > max_ins ) { - /* acroread ignores this field, so we only do a rough safety check */ + /* don't trust `maxSizeOfInstructions'; */ + /* only do a rough safety check */ if ( (FT_Int)n_ins > loader->byte_len ) { - FT_TRACE1(( "TT_Process_Composite_Glyph: " - "too many instructions (%d) for glyph with length %d\n", + FT_TRACE1(( "TT_Process_Composite_Glyph:" + " too many instructions (%d) for glyph with length %d\n", n_ins, loader->byte_len )); - return TT_Err_Too_Many_Hints; + return FT_THROW( Too_Many_Hints ); } - tmp = loader->exec->glyphSize; + tmp = loader->exec->glyphSize; error = Update_Max( loader->exec->memory, &tmp, sizeof ( FT_Byte ), (void*)&loader->exec->glyphIns, n_ins ); + loader->exec->glyphSize = (FT_UShort)tmp; if ( error ) return error; } else if ( n_ins == 0 ) - return TT_Err_Ok; + return FT_Err_Ok; if ( FT_STREAM_READ( loader->exec->glyphIns, n_ins ) ) return error; @@ -1173,7 +1252,7 @@ /* Some points are likely touched during execution of */ /* instructions on components. So let's untouch them. */ - for ( i = start_point; i < loader->zone.n_points; i++ ) + for ( i = 0; i < loader->zone.n_points; i++ ) loader->zone.tags[i] &= ~FT_CURVE_TAG_TOUCH_BOTH; loader->zone.n_points += 4; @@ -1182,21 +1261,131 @@ } - /* Calculate the four phantom points. */ - /* The first two stand for horizontal origin and advance. */ - /* The last two stand for vertical origin and advance. */ + /* + * Calculate the phantom points + * + * Defining the right side bearing (rsb) as + * + * rsb = aw - (lsb + xmax - xmin) + * + * (with `aw' the advance width, `lsb' the left side bearing, and `xmin' + * and `xmax' the glyph's minimum and maximum x value), the OpenType + * specification defines the initial position of horizontal phantom points + * as + * + * pp1 = (round(xmin - lsb), 0) , + * pp2 = (round(pp1 + aw), 0) . + * + * Note that the rounding to the grid (in the device space) is not + * documented currently in the specification. + * + * However, the specification lacks the precise definition of vertical + * phantom points. Greg Hitchcock provided the following explanation. + * + * - a `vmtx' table is present + * + * For any glyph, the minimum and maximum y values (`ymin' and `ymax') + * are given in the `glyf' table, the top side bearing (tsb) and advance + * height (ah) are given in the `vmtx' table. The bottom side bearing + * (bsb) is then calculated as + * + * bsb = ah - (tsb + ymax - ymin) , + * + * and the initial position of vertical phantom points is + * + * pp3 = (x, round(ymax + tsb)) , + * pp4 = (x, round(pp3 - ah)) . + * + * See below for value `x'. + * + * - no `vmtx' table in the font + * + * If there is an `OS/2' table, we set + * + * DefaultAscender = sTypoAscender , + * DefaultDescender = sTypoDescender , + * + * otherwise we use data from the `hhea' table: + * + * DefaultAscender = Ascender , + * DefaultDescender = Descender . + * + * With these two variables we can now set + * + * ah = DefaultAscender - sDefaultDescender , + * tsb = DefaultAscender - yMax , + * + * and proceed as if a `vmtx' table was present. + * + * Usually we have + * + * x = aw / 2 , (1) + * + * but there is one compatibility case where it can be set to + * + * x = -DefaultDescender - + * ((DefaultAscender - DefaultDescender - aw) / 2) . (2) + * + * and another one with + * + * x = 0 . (3) + * + * In Windows, the history of those values is quite complicated, + * depending on the hinting engine (that is, the graphics framework). + * + * framework from to formula + * ---------------------------------------------------------- + * GDI Windows 98 current (1) + * (Windows 2000 for NT) + * GDI+ Windows XP Windows 7 (2) + * GDI+ Windows 8 current (3) + * DWrite Windows 7 current (3) + * + * For simplicity, FreeType uses (1) for grayscale subpixel hinting and + * (3) for everything else. + * + */ +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + +#define TT_LOADER_SET_PP( loader ) \ + do \ + { \ + FT_Bool subpixel_ = loader->exec ? loader->exec->subpixel \ + : 0; \ + FT_Bool grayscale_ = loader->exec ? loader->exec->grayscale \ + : 0; \ + FT_Bool use_aw_2_ = (FT_Bool)( subpixel_ && grayscale_ ); \ + \ + \ + (loader)->pp1.x = (loader)->bbox.xMin - (loader)->left_bearing; \ + (loader)->pp1.y = 0; \ + (loader)->pp2.x = (loader)->pp1.x + (loader)->advance; \ + (loader)->pp2.y = 0; \ + \ + (loader)->pp3.x = use_aw_2_ ? (loader)->advance / 2 : 0; \ + (loader)->pp3.y = (loader)->bbox.yMax + (loader)->top_bearing; \ + (loader)->pp4.x = use_aw_2_ ? (loader)->advance / 2 : 0; \ + (loader)->pp4.y = (loader)->pp3.y - (loader)->vadvance; \ + } while ( 0 ) + +#else /* !TT_CONFIG_OPTION_SUBPIXEL_HINTING */ + #define TT_LOADER_SET_PP( loader ) \ - do { \ + do \ + { \ (loader)->pp1.x = (loader)->bbox.xMin - (loader)->left_bearing; \ (loader)->pp1.y = 0; \ (loader)->pp2.x = (loader)->pp1.x + (loader)->advance; \ (loader)->pp2.y = 0; \ + \ (loader)->pp3.x = 0; \ - (loader)->pp3.y = (loader)->top_bearing + (loader)->bbox.yMax; \ + (loader)->pp3.y = (loader)->bbox.yMax + (loader)->top_bearing; \ (loader)->pp4.x = 0; \ (loader)->pp4.y = (loader)->pp3.y - (loader)->vadvance; \ } while ( 0 ) +#endif /* !TT_CONFIG_OPTION_SUBPIXEL_HINTING */ + /*************************************************************************/ /* */ @@ -1213,7 +1402,7 @@ FT_UInt recurse_count, FT_Bool header_only ) { - FT_Error error = TT_Err_Ok; + FT_Error error = FT_Err_Ok; FT_Fixed x_scale, y_scale; FT_ULong offset; TT_Face face = (TT_Face)loader->face; @@ -1236,14 +1425,14 @@ if ( recurse_count > 1 && recurse_count > face->max_profile.maxComponentDepth ) { - error = TT_Err_Invalid_Composite; + error = FT_THROW( Invalid_Composite ); goto Exit; } /* check glyph index */ if ( glyph_index >= (FT_UInt)face->root.num_glyphs ) { - error = TT_Err_Invalid_Glyph_Index; + error = FT_THROW( Invalid_Glyph_Index ); goto Exit; } @@ -1260,8 +1449,6 @@ y_scale = 0x10000L; } - tt_get_metrics( loader, glyph_index ); - /* Set `offset' to the start of the glyph relative to the start of */ /* the `glyf' table, and `byte_len' to the length of the glyph in */ /* bytes. */ @@ -1307,7 +1494,7 @@ #endif /* FT_CONFIG_OPTION_INCREMENTAL */ { FT_TRACE2(( "no `glyf' table but non-zero `loca' entry\n" )); - error = TT_Err_Invalid_Table; + error = FT_THROW( Invalid_Table ); goto Exit; } @@ -1321,7 +1508,17 @@ /* read glyph header first */ error = face->read_glyph_header( loader ); - if ( error || header_only ) + if ( error ) + goto Exit; + + /* the metrics must be computed after loading the glyph header */ + /* since we need the glyph's `yMax' value in case the vertical */ + /* metrics must be emulated */ + error = tt_get_metrics( loader, glyph_index ); + if ( error ) + goto Exit; + + if ( header_only ) goto Exit; } @@ -1332,6 +1529,10 @@ loader->bbox.yMin = 0; loader->bbox.yMax = 0; + error = tt_get_metrics( loader, glyph_index ); + if ( error ) + goto Exit; + if ( header_only ) goto Exit; @@ -1356,30 +1557,41 @@ if ( error ) goto Exit; - loader->pp1.x += deltas[0].x; loader->pp1.y += deltas[0].y; - loader->pp2.x += deltas[1].x; loader->pp2.y += deltas[1].y; - loader->pp3.x += deltas[2].x; loader->pp3.y += deltas[2].y; - loader->pp4.x += deltas[3].x; loader->pp4.y += deltas[3].y; + loader->pp1.x += deltas[0].x; + loader->pp1.y += deltas[0].y; + loader->pp2.x += deltas[1].x; + loader->pp2.y += deltas[1].y; + + loader->pp3.x += deltas[2].x; + loader->pp3.y += deltas[2].y; + loader->pp4.x += deltas[3].x; + loader->pp4.y += deltas[3].y; FT_FREE( deltas ); } -#endif +#endif /* TT_CONFIG_OPTION_GX_VAR_SUPPORT */ + /* scale phantom points, if necessary; */ + /* they get rounded in `TT_Hint_Glyph' */ if ( ( loader->load_flags & FT_LOAD_NO_SCALE ) == 0 ) { loader->pp1.x = FT_MulFix( loader->pp1.x, x_scale ); loader->pp2.x = FT_MulFix( loader->pp2.x, x_scale ); + /* pp1.y and pp2.y are always zero */ + + loader->pp3.x = FT_MulFix( loader->pp3.x, x_scale ); loader->pp3.y = FT_MulFix( loader->pp3.y, y_scale ); + loader->pp4.x = FT_MulFix( loader->pp4.x, x_scale ); loader->pp4.y = FT_MulFix( loader->pp4.y, y_scale ); } - error = TT_Err_Ok; + error = FT_Err_Ok; goto Exit; } - /* must initialize points before (possibly) overriding */ - /* glyph metrics from the incremental interface */ + /* must initialize phantom points before (possibly) overriding */ + /* glyph metrics from the incremental interface */ TT_LOADER_SET_PP( loader ); #ifdef FT_CONFIG_OPTION_INCREMENTAL @@ -1452,7 +1664,7 @@ face, glyph_index, &deltas, - gloader->current.num_subglyphs + 4 )) != 0 ) + gloader->current.num_subglyphs + 4 ) ) != 0 ) goto Exit; subglyph = gloader->current.subglyphs + gloader->base.num_subglyphs; @@ -1470,21 +1682,32 @@ } } - loader->pp1.x += deltas[i + 0].x; loader->pp1.y += deltas[i + 0].y; - loader->pp2.x += deltas[i + 1].x; loader->pp2.y += deltas[i + 1].y; - loader->pp3.x += deltas[i + 2].x; loader->pp3.y += deltas[i + 2].y; - loader->pp4.x += deltas[i + 3].x; loader->pp4.y += deltas[i + 3].y; + loader->pp1.x += deltas[i + 0].x; + loader->pp1.y += deltas[i + 0].y; + loader->pp2.x += deltas[i + 1].x; + loader->pp2.y += deltas[i + 1].y; + + loader->pp3.x += deltas[i + 2].x; + loader->pp3.y += deltas[i + 2].y; + loader->pp4.x += deltas[i + 3].x; + loader->pp4.y += deltas[i + 3].y; FT_FREE( deltas ); } #endif /* TT_CONFIG_OPTION_GX_VAR_SUPPORT */ + /* scale phantom points, if necessary; */ + /* they get rounded in `TT_Hint_Glyph' */ if ( ( loader->load_flags & FT_LOAD_NO_SCALE ) == 0 ) { loader->pp1.x = FT_MulFix( loader->pp1.x, x_scale ); loader->pp2.x = FT_MulFix( loader->pp2.x, x_scale ); + /* pp1.y and pp2.y are always zero */ + + loader->pp3.x = FT_MulFix( loader->pp3.x, x_scale ); loader->pp3.y = FT_MulFix( loader->pp3.y, y_scale ); + loader->pp4.x = FT_MulFix( loader->pp4.x, x_scale ); loader->pp4.y = FT_MulFix( loader->pp4.y, y_scale ); } @@ -1544,6 +1767,7 @@ /* restore subglyph pointer */ subglyph = gloader->base.subglyphs + num_base_subgs + n; + /* restore phantom points if necessary */ if ( !( subglyph->flags & USE_MY_METRICS ) ) { loader->pp1 = pp[0]; @@ -1563,8 +1787,12 @@ /* (1): exists from the beginning */ /* (2): components that have been loaded so far */ /* (3): the newly loaded component */ - TT_Process_Composite_Component( loader, subglyph, start_point, - num_base_points ); + error = TT_Process_Composite_Component( loader, + subglyph, + start_point, + num_base_points ); + if ( error ) + goto Exit; } loader->stream = old_stream; @@ -1573,22 +1801,23 @@ /* process the glyph */ loader->ins_pos = ins_pos; if ( IS_HINTED( loader->load_flags ) && - #ifdef TT_USE_BYTECODE_INTERPRETER - subglyph->flags & WE_HAVE_INSTR && - #endif - num_points > start_point ) - TT_Process_Composite_Glyph( loader, start_point, start_contour ); - + { + error = TT_Process_Composite_Glyph( loader, + start_point, + start_contour ); + if ( error ) + goto Exit; + } } } else { /* invalid composite count (negative but not -1) */ - error = TT_Err_Invalid_Outline; + error = FT_THROW( Invalid_Outline ); goto Exit; } @@ -1618,11 +1847,15 @@ compute_glyph_metrics( TT_Loader loader, FT_UInt glyph_index ) { + TT_Face face = (TT_Face)loader->face; +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + TT_Driver driver = (TT_Driver)FT_FACE_DRIVER( face ); +#endif + FT_BBox bbox; - TT_Face face = (TT_Face)loader->face; FT_Fixed y_scale; TT_GlyphSlot glyph = loader->glyph; - TT_Size size = (TT_Size)loader->size; + TT_Size size = (TT_Size)loader->size; y_scale = 0x10000L; @@ -1653,8 +1886,30 @@ size->root.metrics.x_ppem, glyph_index ); - if ( widthp ) - glyph->metrics.horiAdvance = *widthp << 6; +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + + if ( driver->interpreter_version == TT_INTERPRETER_VERSION_38 ) + { + FT_Bool ignore_x_mode; + + + ignore_x_mode = FT_BOOL( FT_LOAD_TARGET_MODE( loader->load_flags ) != + FT_RENDER_MODE_MONO ); + + if ( widthp && + ( ( ignore_x_mode && loader->exec->compatible_widths ) || + !ignore_x_mode || + SPH_OPTION_BITMAP_WIDTHS ) ) + glyph->metrics.horiAdvance = *widthp << 6; + } + else + +#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */ + + { + if ( widthp ) + glyph->metrics.horiAdvance = *widthp << 6; + } } /* set glyph dimensions */ @@ -1831,9 +2086,13 @@ FT_Int32 load_flags, FT_Bool glyf_table_only ) { + FT_Error error; + TT_Face face; FT_Stream stream; +#ifdef TT_USE_BYTECODE_INTERPRETER FT_Bool pedantic = FT_BOOL( load_flags & FT_LOAD_PEDANTIC ); +#endif face = (TT_Face)glyph->face; @@ -1849,42 +2108,153 @@ TT_ExecContext exec; FT_Bool grayscale; +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + TT_Driver driver = (TT_Driver)FT_FACE_DRIVER( face ); - if ( !size->cvt_ready ) - { - FT_Error error = tt_size_ready_bytecode( size, pedantic ); + FT_Bool subpixel = FALSE; +#if 0 + /* not used yet */ + FT_Bool compatible_widths; + FT_Bool symmetrical_smoothing; + FT_Bool bgr; + FT_Bool subpixel_positioned; +#endif +#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */ + + FT_Bool reexecute = FALSE; + + if ( size->bytecode_ready < 0 || size->cvt_ready < 0 ) + { + error = tt_size_ready_bytecode( size, pedantic ); if ( error ) return error; } + else if ( size->bytecode_ready ) + return size->bytecode_ready; + else if ( size->cvt_ready ) + return size->cvt_ready; /* query new execution context */ exec = size->debug ? size->context : ( (TT_Driver)FT_FACE_DRIVER( face ) )->context; if ( !exec ) - return TT_Err_Could_Not_Find_Context; + return FT_THROW( Could_Not_Find_Context ); - grayscale = - FT_BOOL( FT_LOAD_TARGET_MODE( load_flags ) != FT_RENDER_MODE_MONO ); +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING - TT_Load_Context( exec, face, size ); + if ( driver->interpreter_version == TT_INTERPRETER_VERSION_38 ) + { + subpixel = FT_BOOL( ( FT_LOAD_TARGET_MODE( load_flags ) != + FT_RENDER_MODE_MONO ) && + SPH_OPTION_SET_SUBPIXEL ); + + if ( subpixel ) + grayscale = FALSE; + else if ( SPH_OPTION_SET_GRAYSCALE ) + { + grayscale = TRUE; + subpixel = FALSE; + } + else + grayscale = FALSE; + + if ( FT_IS_TRICKY( glyph->face ) ) + subpixel = FALSE; + + exec->ignore_x_mode = subpixel || grayscale; + exec->rasterizer_version = SPH_OPTION_SET_RASTERIZER_VERSION; + if ( exec->sph_tweak_flags & SPH_TWEAK_RASTERIZER_35 ) + exec->rasterizer_version = TT_INTERPRETER_VERSION_35; + +#if 1 + exec->compatible_widths = SPH_OPTION_SET_COMPATIBLE_WIDTHS; + exec->symmetrical_smoothing = FALSE; + exec->bgr = FALSE; + exec->subpixel_positioned = TRUE; +#else /* 0 */ + exec->compatible_widths = + FT_BOOL( FT_LOAD_TARGET_MODE( load_flags ) != + TT_LOAD_COMPATIBLE_WIDTHS ); + exec->symmetrical_smoothing = + FT_BOOL( FT_LOAD_TARGET_MODE( load_flags ) != + TT_LOAD_SYMMETRICAL_SMOOTHING ); + exec->bgr = + FT_BOOL( FT_LOAD_TARGET_MODE( load_flags ) != + TT_LOAD_BGR ); + exec->subpixel_positioned = + FT_BOOL( FT_LOAD_TARGET_MODE( load_flags ) != + TT_LOAD_SUBPIXEL_POSITIONED ); +#endif /* 0 */ + + } + else + +#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */ - /* a change from mono to grayscale rendering (and vice versa) */ - /* requires a re-execution of the CVT program */ - if ( grayscale != exec->grayscale ) { - FT_UInt i; + grayscale = FT_BOOL( FT_LOAD_TARGET_MODE( load_flags ) != + FT_RENDER_MODE_MONO ); + } + error = TT_Load_Context( exec, face, size ); + if ( error ) + return error; - FT_TRACE4(( "tt_loader_init: grayscale change," - " re-executing `prep' table\n" )); +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + + if ( driver->interpreter_version == TT_INTERPRETER_VERSION_38 ) + { + /* a change from mono to subpixel rendering (and vice versa) */ + /* requires a re-execution of the CVT program */ + if ( subpixel != exec->subpixel ) + { + FT_TRACE4(( "tt_loader_init: subpixel hinting change," + " re-executing `prep' table\n" )); + + exec->subpixel = subpixel; + reexecute = TRUE; + } + + /* a change from mono to grayscale rendering (and vice versa) */ + /* requires a re-execution of the CVT program */ + if ( grayscale != exec->grayscale ) + { + FT_TRACE4(( "tt_loader_init: grayscale hinting change," + " re-executing `prep' table\n" )); + + exec->grayscale = grayscale; + reexecute = TRUE; + } + } + else + +#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */ + + { + /* a change from mono to grayscale rendering (and vice versa) */ + /* requires a re-execution of the CVT program */ + if ( grayscale != exec->grayscale ) + { + FT_TRACE4(( "tt_loader_init: grayscale change," + " re-executing `prep' table\n" )); + + exec->grayscale = grayscale; + reexecute = TRUE; + } + } + + if ( reexecute ) + { + FT_UInt i; - exec->grayscale = grayscale; for ( i = 0; i < size->cvt_size; i++ ) size->cvt[i] = FT_MulFix( face->cvt[i], size->ttmetrics.scale ); - tt_size_run_prep( size, pedantic ); + error = tt_size_run_prep( size, pedantic ); + if ( error ) + return error; } /* see whether the cvt program has disabled hinting */ @@ -1915,10 +2285,9 @@ #endif { - FT_Error error = face->goto_table( face, TTAG_glyf, stream, 0 ); - + error = face->goto_table( face, TTAG_glyf, stream, 0 ); - if ( error == TT_Err_Table_Missing ) + if ( FT_ERR_EQ( error, Table_Missing ) ) loader->glyf_offset = 0; else if ( error ) { @@ -1946,7 +2315,7 @@ loader->glyph = (FT_GlyphSlot)glyph; loader->stream = stream; - return TT_Err_Ok; + return FT_Err_Ok; } @@ -1983,13 +2352,11 @@ FT_UInt glyph_index, FT_Int32 load_flags ) { - TT_Face face; FT_Error error; TT_LoaderRec loader; - face = (TT_Face)glyph->face; - error = TT_Err_Ok; + FT_TRACE1(( "TT_Load_Glyph: glyph index %d\n", glyph_index )); #ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS @@ -2003,20 +2370,27 @@ error = load_sbit_image( size, glyph, glyph_index, load_flags ); if ( !error ) { - FT_Face root = &face->root; - - - if ( FT_IS_SCALABLE( root ) ) + if ( FT_IS_SCALABLE( glyph->face ) ) { /* for the bbox we need the header only */ (void)tt_loader_init( &loader, size, glyph, load_flags, TRUE ); (void)load_truetype_glyph( &loader, glyph_index, 0, TRUE ); glyph->linearHoriAdvance = loader.linear; - glyph->linearVertAdvance = loader.top_bearing + loader.bbox.yMax - - loader.vadvance; + glyph->linearVertAdvance = loader.vadvance; + + /* sanity checks: if `xxxAdvance' in the sbit metric */ + /* structure isn't set, use `linearXXXAdvance' */ + if ( !glyph->metrics.horiAdvance && glyph->linearHoriAdvance ) + glyph->metrics.horiAdvance = + FT_MulFix( glyph->linearHoriAdvance, + size->root.metrics.x_scale ); + if ( !glyph->metrics.vertAdvance && glyph->linearVertAdvance ) + glyph->metrics.vertAdvance = + FT_MulFix( glyph->linearVertAdvance, + size->root.metrics.y_scale ); } - return TT_Err_Ok; + return FT_Err_Ok; } } @@ -2024,10 +2398,10 @@ /* if FT_LOAD_NO_SCALE is not set, `ttmetrics' must be valid */ if ( !( load_flags & FT_LOAD_NO_SCALE ) && !size->ttmetrics.valid ) - return TT_Err_Invalid_Size_Handle; + return FT_THROW( Invalid_Size_Handle ); if ( load_flags & FT_LOAD_SBITS_ONLY ) - return TT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); error = tt_loader_init( &loader, size, glyph, load_flags, FALSE ); if ( error ) @@ -2093,7 +2467,7 @@ #endif /* TT_USE_BYTECODE_INTERPRETER */ - compute_glyph_metrics( &loader, glyph_index ); + error = compute_glyph_metrics( &loader, glyph_index ); } /* Set the `high precision' bit flag. */ diff --git a/src/truetype/ttgload.h b/src/truetype/ttgload.h index 05f7588..3f1699e 100644 --- a/src/truetype/ttgload.h +++ b/src/truetype/ttgload.h @@ -43,6 +43,7 @@ FT_BEGIN_HEADER FT_LOCAL( void ) TT_Get_VMetrics( TT_Face face, FT_UInt idx, + FT_Pos yMax, FT_Short* tsb, FT_UShort* ah ); diff --git a/src/truetype/ttgxvar.c b/src/truetype/ttgxvar.c index 69b702f..1b35539 100644 --- a/src/truetype/ttgxvar.c +++ b/src/truetype/ttgxvar.c @@ -4,7 +4,7 @@ /* */ /* TrueType GX Font Variation loader */ /* */ -/* Copyright 2004-2011 by */ +/* Copyright 2004-2014 by */ /* David Turner, Robert Wilhelm, Werner Lemberg, and George Williams. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -61,9 +61,9 @@ #define FT_Stream_FTell( stream ) \ - ( (stream)->cursor - (stream)->base ) + (FT_ULong)( (stream)->cursor - (stream)->base ) #define FT_Stream_SeekSet( stream, off ) \ - ( (stream)->cursor = (stream)->base+(off) ) + ( (stream)->cursor = (stream)->base + (off) ) /*************************************************************************/ @@ -91,7 +91,9 @@ /* indicates that there is a delta for every point without needing to */ /* enumerate all of them. */ /* */ -#define ALL_POINTS (FT_UShort*)( -1 ) + + /* ensure that value `0' has the same width as a pointer */ +#define ALL_POINTS (FT_UShort*)~(FT_PtrDist)0 #define GX_PT_POINTS_ARE_WORDS 0x80 @@ -130,7 +132,7 @@ FT_Int j; FT_Int first; FT_Memory memory = stream->memory; - FT_Error error = TT_Err_Ok; + FT_Error error = FT_Err_Ok; FT_UNUSED( error ); @@ -215,7 +217,7 @@ FT_Offset i; FT_UInt j; FT_Memory memory = stream->memory; - FT_Error error = TT_Err_Ok; + FT_Error error = FT_Err_Ok; FT_UNUSED( error ); @@ -283,7 +285,7 @@ FT_Memory memory = stream->memory; GX_Blend blend = face->blend; GX_AVarSegment segment; - FT_Error error = TT_Err_Ok; + FT_Error error = FT_Err_Ok; FT_ULong version; FT_Long axisCount; FT_Int i, j; @@ -412,7 +414,7 @@ if ( gvar_head.version != (FT_Long)0x00010000L || gvar_head.axisCount != (FT_UShort)blend->mmvar->num_axis ) { - error = TT_Err_Invalid_Table; + error = FT_THROW( Invalid_Table ); goto Exit; } @@ -501,11 +503,9 @@ FT_Fixed* im_end_coords ) { FT_UInt i; - FT_Fixed apply; - FT_Fixed temp; + FT_Fixed apply = 0x10000L; - apply = 0x10000L; for ( i = 0; i < blend->num_axis; ++i ) { if ( tuple_coords[i] == 0 ) @@ -525,11 +525,10 @@ else if ( !( tupleIndex & GX_TI_INTERMEDIATE_TUPLE ) ) /* not an intermediate tuple */ - apply = FT_MulDiv( apply, + apply = FT_MulFix( apply, blend->normalizedcoords[i] > 0 ? blend->normalizedcoords[i] - : -blend->normalizedcoords[i], - 0x10000L ); + : -blend->normalizedcoords[i] ); else if ( blend->normalizedcoords[i] <= im_start_coords[i] || blend->normalizedcoords[i] >= im_end_coords[i] ) @@ -539,20 +538,14 @@ } else if ( blend->normalizedcoords[i] < tuple_coords[i] ) - { - temp = FT_MulDiv( blend->normalizedcoords[i] - im_start_coords[i], - 0x10000L, - tuple_coords[i] - im_start_coords[i]); - apply = FT_MulDiv( apply, temp, 0x10000L ); - } + apply = FT_MulDiv( apply, + blend->normalizedcoords[i] - im_start_coords[i], + tuple_coords[i] - im_start_coords[i] ); else - { - temp = FT_MulDiv( im_end_coords[i] - blend->normalizedcoords[i], - 0x10000L, - im_end_coords[i] - tuple_coords[i] ); - apply = FT_MulDiv( apply, temp, 0x10000L ); - } + apply = FT_MulDiv( apply, + im_end_coords[i] - blend->normalizedcoords[i], + im_end_coords[i] - tuple_coords[i] ); } return apply; @@ -619,7 +612,7 @@ FT_Stream stream = face->root.stream; FT_Memory memory = face->root.memory; FT_ULong table_len; - FT_Error error = TT_Err_Ok; + FT_Error error = FT_Err_Ok; FT_ULong fvar_start; FT_Int i, j; FT_MM_Var* mmvar = NULL; @@ -690,7 +683,7 @@ fvar_head.offsetToData + fvar_head.axisCount * 20U + fvar_head.instanceCount * fvar_head.instanceSize > table_len ) { - error = TT_Err_Invalid_Table; + error = FT_THROW( Invalid_Table ); goto Exit; } @@ -712,7 +705,7 @@ mmvar->num_axis = fvar_head.axisCount; mmvar->num_designs = - (FT_UInt)-1; /* meaningless in this context; each glyph */ + ~0U; /* meaningless in this context; each glyph */ /* may have a different number of designs */ /* (or tuples, as called by Apple) */ mmvar->num_namedstyles = @@ -856,7 +849,7 @@ FT_UInt num_coords, FT_Fixed* coords ) { - FT_Error error = TT_Err_Ok; + FT_Error error = FT_Err_Ok; GX_Blend blend; FT_MM_Var* mmvar; FT_UInt i; @@ -884,14 +877,14 @@ if ( num_coords != mmvar->num_axis ) { - error = TT_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Exit; } for ( i = 0; i < num_coords; ++i ) if ( coords[i] < -0x00010000L || coords[i] > 0x00010000L ) { - error = TT_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Exit; } @@ -945,13 +938,13 @@ FT_FREE( face->cvt ); face->cvt = NULL; - tt_face_load_cvt( face, face->root.stream ); + error = tt_face_load_cvt( face, face->root.stream ); break; case mcvt_modify: /* The original cvt table is in memory. All we need to do is */ /* apply the `cvar' table (if any). */ - tt_face_vary_cvt( face, face->root.stream ); + error = tt_face_vary_cvt( face, face->root.stream ); break; case mcvt_retain: @@ -992,7 +985,7 @@ FT_UInt num_coords, FT_Fixed* coords ) { - FT_Error error = TT_Err_Ok; + FT_Error error = FT_Err_Ok; FT_Fixed* normalized = NULL; GX_Blend blend; FT_MM_Var* mmvar; @@ -1013,7 +1006,7 @@ if ( num_coords != mmvar->num_axis ) { - error = TT_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Exit; } @@ -1029,24 +1022,16 @@ { if ( coords[i] > a->maximum || coords[i] < a->minimum ) { - error = TT_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Exit; } if ( coords[i] < a->def ) - { - normalized[i] = -FT_MulDiv( coords[i] - a->def, - 0x10000L, - a->minimum - a->def ); - } + normalized[i] = -FT_DivFix( coords[i] - a->def, a->minimum - a->def ); else if ( a->maximum == a->def ) normalized[i] = 0; else - { - normalized[i] = FT_MulDiv( coords[i] - a->def, - 0x10000L, - a->maximum - a->def ); - } + normalized[i] = FT_DivFix( coords[i] - a->def, a->maximum - a->def ); } if ( !blend->avar_checked ) @@ -1061,15 +1046,11 @@ if ( normalized[i] < av->correspondence[j].fromCoord ) { normalized[i] = - FT_MulDiv( - FT_MulDiv( - normalized[i] - av->correspondence[j - 1].fromCoord, - 0x10000L, - av->correspondence[j].fromCoord - - av->correspondence[j - 1].fromCoord ), - av->correspondence[j].toCoord - - av->correspondence[j - 1].toCoord, - 0x10000L ) + + FT_MulDiv( normalized[i] - av->correspondence[j - 1].fromCoord, + av->correspondence[j].toCoord - + av->correspondence[j - 1].toCoord, + av->correspondence[j].fromCoord - + av->correspondence[j - 1].fromCoord ) + av->correspondence[j - 1].toCoord; break; } @@ -1141,7 +1122,7 @@ { FT_TRACE2(( "tt_face_vary_cvt: no blend specified\n" )); - error = TT_Err_Ok; + error = FT_Err_Ok; goto Exit; } @@ -1149,7 +1130,7 @@ { FT_TRACE2(( "tt_face_vary_cvt: no `cvt ' table\n" )); - error = TT_Err_Ok; + error = FT_Err_Ok; goto Exit; } @@ -1158,13 +1139,13 @@ { FT_TRACE2(( "is missing\n" )); - error = TT_Err_Ok; + error = FT_Err_Ok; goto Exit; } if ( FT_FRAME_ENTER( table_len ) ) { - error = TT_Err_Ok; + error = FT_Err_Ok; goto Exit; } @@ -1173,7 +1154,7 @@ { FT_TRACE2(( "bad table version\n" )); - error = TT_Err_Ok; + error = FT_Err_Ok; goto FExit; } @@ -1344,7 +1325,7 @@ if ( !face->doblend || blend == NULL ) - return TT_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); /* to be freed by the caller */ if ( FT_NEW_ARRAY( delta_xy, n_points ) ) @@ -1354,7 +1335,7 @@ if ( glyph_index >= blend->gv_glyphcnt || blend->glyphoffsets[glyph_index] == blend->glyphoffsets[glyph_index + 1] ) - return TT_Err_Ok; /* no variation data for this glyph */ + return FT_Err_Ok; /* no variation data for this glyph */ if ( FT_STREAM_SEEK( blend->glyphoffsets[glyph_index] ) || FT_FRAME_ENTER( blend->glyphoffsets[glyph_index + 1] - @@ -1404,7 +1385,7 @@ } else if ( ( tupleIndex & GX_TI_TUPLE_INDEX_MASK ) >= blend->tuplecount ) { - error = TT_Err_Invalid_Table; + error = FT_THROW( Invalid_Table ); goto Fail3; } else diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c index 3acb24a..eccd4aa 100644 --- a/src/truetype/ttinterp.c +++ b/src/truetype/ttinterp.c @@ -4,7 +4,7 @@ /* */ /* TrueType bytecode interpreter (body). */ /* */ -/* Copyright 1996-2012 */ +/* Copyright 1996-2014 */ /* by David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -25,20 +25,16 @@ #include FT_INTERNAL_CALC_H #include FT_TRIGONOMETRY_H #include FT_SYSTEM_H +#include FT_TRUETYPE_DRIVER_H #include "ttinterp.h" - #include "tterrors.h" +#include "ttsubpix.h" #ifdef TT_USE_BYTECODE_INTERPRETER -#define TT_MULFIX FT_MulFix -#define TT_MULDIV FT_MulDiv -#define TT_MULDIV_NO_ROUND FT_MulDiv_No_Round - - /*************************************************************************/ /* */ /* The macro FT_COMPONENT is used in trace mode. It is an implicit */ @@ -52,7 +48,7 @@ /* */ /* In order to detect infinite loops in the code, we set up a counter */ /* within the run loop. A single stroke of interpretation is now */ - /* limited to a maximal number of opcodes defined below. */ + /* limited to a maximum number of opcodes defined below. */ /* */ #define MAX_RUNNABLE_OPCODES 1000000L @@ -136,6 +132,11 @@ #define FT_UNUSED_ARG FT_UNUSED_EXEC; FT_UNUSED( args ) +#define SUBPIXEL_HINTING \ + ( ((TT_Driver)FT_FACE_DRIVER( CUR.face ))->interpreter_version == \ + TT_INTERPRETER_VERSION_38 ) + + /*************************************************************************/ /* */ /* The following macros hide the use of EXEC_ARG and EXEC_ARG_ to */ @@ -171,6 +172,9 @@ #define CUR_Func_round( d, c ) \ CUR.func_round( EXEC_ARG_ d, c ) +#define CUR_Func_cur_ppem() \ + CUR.func_cur_ppem( EXEC_ARG ) + #define CUR_Func_read_cvt( index ) \ CUR.func_read_cvt( EXEC_ARG_ index ) @@ -183,12 +187,6 @@ #define CURRENT_Ratio() \ Current_Ratio( EXEC_ARG ) -#define CURRENT_Ppem() \ - Current_Ppem( EXEC_ARG ) - -#define CUR_Ppem() \ - Cur_PPEM( EXEC_ARG ) - #define INS_SxVTL( a, b, c, d ) \ Ins_SxVTL( EXEC_ARG_ a, b, c, d ) @@ -232,6 +230,14 @@ #define BOUNDS( x, n ) ( (FT_UInt)(x) >= (FT_UInt)(n) ) #define BOUNDSL( x, n ) ( (FT_ULong)(x) >= (FT_ULong)(n) ) + /*************************************************************************/ + /* */ + /* This macro computes (a*2^14)/b and complements TT_MulFix14. */ + /* */ +#define TT_DivFix14( a, b ) \ + FT_DivFix( a, (b) << 2 ) + + #undef SUCCESS #define SUCCESS 0 @@ -273,10 +279,7 @@ /* */ /* exec :: The target execution context. */ /* */ - /* */ - /* FreeType error code. 0 means success. */ - /* */ - FT_LOCAL_DEF( FT_Error ) + FT_LOCAL_DEF( void ) TT_Goto_CodeRange( TT_ExecContext exec, FT_Int range, FT_Long IP ) @@ -300,8 +303,6 @@ exec->codeSize = coderange->size; exec->IP = IP; exec->curRange = range; - - return TT_Err_Ok; } @@ -323,10 +324,7 @@ /* */ /* exec :: The target execution context. */ /* */ - /* */ - /* FreeType error code. 0 means success. */ - /* */ - FT_LOCAL_DEF( FT_Error ) + FT_LOCAL_DEF( void ) TT_Set_CodeRange( TT_ExecContext exec, FT_Int range, void* base, @@ -336,8 +334,6 @@ exec->codeRangeTable[range - 1].base = (FT_Byte*)base; exec->codeRangeTable[range - 1].size = length; - - return TT_Err_Ok; } @@ -355,13 +351,7 @@ /* */ /* exec :: The target execution context. */ /* */ - /* */ - /* FreeType error code. 0 means success. */ - /* */ - /* */ - /* Does not set the Error variable. */ - /* */ - FT_LOCAL_DEF( FT_Error ) + FT_LOCAL_DEF( void ) TT_Clear_CodeRange( TT_ExecContext exec, FT_Int range ) { @@ -369,8 +359,6 @@ exec->codeRangeTable[range - 1].base = NULL; exec->codeRangeTable[range - 1].size = 0; - - return TT_Err_Ok; } @@ -394,13 +382,10 @@ /* */ /* memory :: A handle to the parent memory object. */ /* */ - /* */ - /* FreeType error code. 0 means success. */ - /* */ /* */ /* Only the glyph loader and debugger should call this function. */ /* */ - FT_LOCAL_DEF( FT_Error ) + FT_LOCAL_DEF( void ) TT_Done_Context( TT_ExecContext exec ) { FT_Memory memory = exec->memory; @@ -427,8 +412,6 @@ exec->face = NULL; FT_FREE( exec ); - - return TT_Err_Ok; } @@ -478,7 +461,7 @@ exec->face = NULL; exec->size = NULL; - return TT_Err_Ok; + return FT_Err_Ok; Fail_Memory: FT_ERROR(( "Init_Context: not enough memory for %p\n", exec )); @@ -530,7 +513,7 @@ *size = new_max; } - return TT_Err_Ok; + return FT_Err_Ok; } @@ -637,7 +620,7 @@ exec->instruction_trap = FALSE; - return TT_Err_Ok; + return FT_Err_Ok; } @@ -655,13 +638,10 @@ /* */ /* size :: A handle to the target size object. */ /* */ - /* */ - /* FreeType error code. 0 means success. */ - /* */ /* */ /* Only the glyph loader and debugger should call this function. */ /* */ - FT_LOCAL_DEF( FT_Error ) + FT_LOCAL_DEF( void ) TT_Save_Context( TT_ExecContext exec, TT_Size size ) { @@ -679,8 +659,6 @@ for ( i = 0; i < TT_MAX_CODE_RANGES; i++ ) size->codeRangeTable[i] = exec->codeRangeTable[i]; - - return TT_Err_Ok; } @@ -712,12 +690,7 @@ TT_Run_Context( TT_ExecContext exec, FT_Bool debug ) { - FT_Error error; - - - if ( ( error = TT_Goto_CodeRange( exec, tt_coderange_glyph, 0 ) ) - != TT_Err_Ok ) - return error; + TT_Goto_CodeRange( exec, tt_coderange_glyph, 0 ); exec->zp0 = exec->pts; exec->zp1 = exec->pts; @@ -753,7 +726,7 @@ if ( !debug ) return TT_RunIns( exec ); else - return TT_Err_Ok; + return FT_Err_Ok; #endif } @@ -787,16 +760,18 @@ FT_EXPORT_DEF( TT_ExecContext ) TT_New_Context( TT_Driver driver ) { - TT_ExecContext exec; - FT_Memory memory; + FT_Memory memory; + + if ( !driver ) + goto Fail; memory = driver->root.root.memory; - exec = driver->context; if ( !driver->context ) { - FT_Error error; + FT_Error error; + TT_ExecContext exec; /* allocate object */ @@ -1428,9 +1403,108 @@ #undef PACK -#if 1 + +#ifndef FT_CONFIG_OPTION_NO_ASSEMBLER + +#if defined( __arm__ ) && \ + ( defined( __thumb2__ ) || !defined( __thumb__ ) ) + +#define TT_MulFix14 TT_MulFix14_arm static FT_Int32 + TT_MulFix14_arm( FT_Int32 a, + FT_Int b ) + { + FT_Int32 t, t2; + + +#if defined( __CC_ARM ) || defined( __ARMCC__ ) + + __asm + { + smull t2, t, b, a /* (lo=t2,hi=t) = a*b */ + mov a, t, asr #31 /* a = (hi >> 31) */ + add a, a, #0x2000 /* a += 0x2000 */ + adds t2, t2, a /* t2 += a */ + adc t, t, #0 /* t += carry */ + mov a, t2, lsr #14 /* a = t2 >> 14 */ + orr a, a, t, lsl #18 /* a |= t << 18 */ + } + +#elif defined( __GNUC__ ) + + __asm__ __volatile__ ( + "smull %1, %2, %4, %3\n\t" /* (lo=%1,hi=%2) = a*b */ + "mov %0, %2, asr #31\n\t" /* %0 = (hi >> 31) */ +#if defined( __clang__ ) && defined( __thumb2__ ) + "add.w %0, %0, #0x2000\n\t" /* %0 += 0x2000 */ +#else + "add %0, %0, #0x2000\n\t" /* %0 += 0x2000 */ +#endif + "adds %1, %1, %0\n\t" /* %1 += %0 */ + "adc %2, %2, #0\n\t" /* %2 += carry */ + "mov %0, %1, lsr #14\n\t" /* %0 = %1 >> 16 */ + "orr %0, %0, %2, lsl #18\n\t" /* %0 |= %2 << 16 */ + : "=r"(a), "=&r"(t2), "=&r"(t) + : "r"(a), "r"(b) + : "cc" ); + +#endif + + return a; + } + +#endif /* __arm__ && ( __thumb2__ || !__thumb__ ) */ + +#endif /* !FT_CONFIG_OPTION_NO_ASSEMBLER */ + + +#if defined( __GNUC__ ) && \ + ( defined( __i386__ ) || defined( __x86_64__ ) ) + +#define TT_MulFix14 TT_MulFix14_long_long + + /* Temporarily disable the warning that C90 doesn't support `long long'. */ +#if ( __GNUC__ * 100 + __GNUC_MINOR__ ) >= 406 +#pragma GCC diagnostic push +#endif +#pragma GCC diagnostic ignored "-Wlong-long" + + /* This is declared `noinline' because inlining the function results */ + /* in slower code. The `pure' attribute indicates that the result */ + /* only depends on the parameters. */ + static __attribute__(( noinline )) + __attribute__(( pure )) FT_Int32 + TT_MulFix14_long_long( FT_Int32 a, + FT_Int b ) + { + + long long ret = (long long)a * b; + + /* The following line assumes that right shifting of signed values */ + /* will actually preserve the sign bit. The exact behaviour is */ + /* undefined, but this is true on x86 and x86_64. */ + long long tmp = ret >> 63; + + + ret += 0x2000 + tmp; + + return (FT_Int32)( ret >> 14 ); + } + +#if ( __GNUC__ * 100 + __GNUC_MINOR__ ) >= 406 +#pragma GCC diagnostic pop +#endif + +#endif /* __GNUC__ && ( __i386__ || __x86_64__ ) */ + + +#ifndef TT_MulFix14 + + /* Compute (a*b)/2^14 with maximum accuracy and rounding. */ + /* This is optimized to be faster than calling FT_MulFix() */ + /* for platforms where sizeof(int) == 2. */ + static FT_Int32 TT_MulFix14( FT_Int32 a, FT_Int b ) { @@ -1461,39 +1535,52 @@ return sign >= 0 ? (FT_Int32)mid : -(FT_Int32)mid; } -#else +#endif /* !TT_MulFix14 */ - /* compute (a*b)/2^14 with maximal accuracy and rounding */ - static FT_Int32 - TT_MulFix14( FT_Int32 a, - FT_Int b ) - { - FT_Int32 m, s, hi; - FT_UInt32 l, lo; +#if defined( __GNUC__ ) && \ + ( defined( __i386__ ) || \ + defined( __x86_64__ ) || \ + defined( __arm__ ) ) - /* compute ax*bx as 64-bit value */ - l = (FT_UInt32)( ( a & 0xFFFFU ) * b ); - m = ( a >> 16 ) * b; +#define TT_DotFix14 TT_DotFix14_long_long - lo = l + (FT_UInt32)( m << 16 ); - hi = ( m >> 16 ) + ( (FT_Int32)l >> 31 ) + ( lo < l ); +#if ( __GNUC__ * 100 + __GNUC_MINOR__ ) >= 406 +#pragma GCC diagnostic push +#endif +#pragma GCC diagnostic ignored "-Wlong-long" - /* divide the result by 2^14 with rounding */ - s = hi >> 31; - l = lo + (FT_UInt32)s; - hi += s + ( l < lo ); - lo = l; + static __attribute__(( pure )) FT_Int32 + TT_DotFix14_long_long( FT_Int32 ax, + FT_Int32 ay, + FT_Int bx, + FT_Int by ) + { + /* Temporarily disable the warning that C90 doesn't support */ + /* `long long'. */ - l = lo + 0x2000U; - hi += l < lo; + long long temp1 = (long long)ax * bx; + long long temp2 = (long long)ay * by; + + + temp1 += temp2; + temp2 = temp1 >> 63; + temp1 += 0x2000 + temp2; + + return (FT_Int32)( temp1 >> 14 ); - return ( hi << 18 ) | ( l >> 14 ); } + +#if ( __GNUC__ * 100 + __GNUC_MINOR__ ) >= 406 +#pragma GCC diagnostic pop #endif +#endif /* __GNUC__ && (__arm__ || __i386__ || __x86_64__) */ + - /* compute (ax*bx+ay*by)/2^14 with maximal accuracy and rounding */ +#ifndef TT_DotFix14 + + /* compute (ax*bx+ay*by)/2^14 with maximum accuracy and rounding */ static FT_Int32 TT_DotFix14( FT_Int32 ax, FT_Int32 ay, @@ -1508,14 +1595,14 @@ l = (FT_UInt32)( ( ax & 0xFFFFU ) * bx ); m = ( ax >> 16 ) * bx; - lo1 = l + (FT_UInt32)( m << 16 ); + lo1 = l + ( (FT_UInt32)m << 16 ); hi1 = ( m >> 16 ) + ( (FT_Int32)l >> 31 ) + ( lo1 < l ); /* compute ay*by as 64-bit value */ l = (FT_UInt32)( ( ay & 0xFFFFU ) * by ); m = ( ay >> 16 ) * by; - lo2 = l + (FT_UInt32)( m << 16 ); + lo2 = l + ( (FT_UInt32)m << 16 ); hi2 = ( m >> 16 ) + ( (FT_Int32)l >> 31 ) + ( lo2 < l ); /* add them */ @@ -1531,98 +1618,10 @@ l = lo + 0x2000U; hi += ( l < lo ); - return ( hi << 18 ) | ( l >> 14 ); - } - - - /* return length of given vector */ - -#if 0 - - static FT_Int32 - TT_VecLen( FT_Int32 x, - FT_Int32 y ) - { - FT_Int32 m, hi1, hi2, hi; - FT_UInt32 l, lo1, lo2, lo; - - - /* compute x*x as 64-bit value */ - lo = (FT_UInt32)( x & 0xFFFFU ); - hi = x >> 16; - - l = lo * lo; - m = hi * lo; - hi = hi * hi; - - lo1 = l + (FT_UInt32)( m << 17 ); - hi1 = hi + ( m >> 15 ) + ( lo1 < l ); - - /* compute y*y as 64-bit value */ - lo = (FT_UInt32)( y & 0xFFFFU ); - hi = y >> 16; - - l = lo * lo; - m = hi * lo; - hi = hi * hi; - - lo2 = l + (FT_UInt32)( m << 17 ); - hi2 = hi + ( m >> 15 ) + ( lo2 < l ); - - /* add them to get 'x*x+y*y' as 64-bit value */ - lo = lo1 + lo2; - hi = hi1 + hi2 + ( lo < lo1 ); - - /* compute the square root of this value */ - { - FT_UInt32 root, rem, test_div; - FT_Int count; - - - root = 0; - - { - rem = 0; - count = 32; - do - { - rem = ( rem << 2 ) | ( (FT_UInt32)hi >> 30 ); - hi = ( hi << 2 ) | ( lo >> 30 ); - lo <<= 2; - root <<= 1; - test_div = ( root << 1 ) + 1; - - if ( rem >= test_div ) - { - rem -= test_div; - root += 1; - } - } while ( --count ); - } - - return (FT_Int32)root; - } - } - -#else - - /* this version uses FT_Vector_Length which computes the same value */ - /* much, much faster.. */ - /* */ - static FT_F26Dot6 - TT_VecLen( FT_F26Dot6 X, - FT_F26Dot6 Y ) - { - FT_Vector v; - - - v.x = X; - v.y = Y; - - return FT_Vector_Length( &v ); + return (FT_Int32)( ( (FT_UInt32)hi << 18 ) | ( l >> 14 ) ); } -#endif +#endif /* TT_DotFix14 */ /*************************************************************************/ @@ -1661,14 +1660,14 @@ else { - FT_Long x, y; + FT_F26Dot6 x, y; - x = TT_MULDIV( CUR.GS.projVector.x, - CUR.tt_metrics.x_ratio, 0x4000 ); - y = TT_MULDIV( CUR.GS.projVector.y, - CUR.tt_metrics.y_ratio, 0x4000 ); - CUR.tt_metrics.ratio = TT_VecLen( x, y ); + x = TT_MulFix14( CUR.tt_metrics.x_ratio, + CUR.GS.projVector.x ); + y = TT_MulFix14( CUR.tt_metrics.y_ratio, + CUR.GS.projVector.y ); + CUR.tt_metrics.ratio = FT_Hypot( x, y ); } } } @@ -1676,10 +1675,17 @@ } - static FT_Long + FT_CALLBACK_DEF( FT_Long ) Current_Ppem( EXEC_OP ) { - return TT_MULFIX( CUR.tt_metrics.ppem, CURRENT_Ratio() ); + return CUR.tt_metrics.ppem; + } + + + FT_CALLBACK_DEF( FT_Long ) + Current_Ppem_Stretched( EXEC_OP ) + { + return FT_MulFix( CUR.tt_metrics.ppem, CURRENT_Ratio() ); } @@ -1700,7 +1706,7 @@ FT_CALLBACK_DEF( FT_F26Dot6 ) Read_CVT_Stretched( EXEC_OP_ FT_ULong idx ) { - return TT_MULFIX( CUR.cvt[idx], CURRENT_Ratio() ); + return FT_MulFix( CUR.cvt[idx], CURRENT_Ratio() ); } @@ -1786,7 +1792,7 @@ if ( aRange < 1 || aRange > 3 ) { - CUR.error = TT_Err_Bad_Argument; + CUR.error = FT_THROW( Bad_Argument ); return FAILURE; } @@ -1794,7 +1800,7 @@ if ( range->base == NULL ) /* invalid coderange */ { - CUR.error = TT_Err_Invalid_CodeRange; + CUR.error = FT_THROW( Invalid_CodeRange ); return FAILURE; } @@ -1804,7 +1810,7 @@ if ( aIP > range->size ) { - CUR.error = TT_Err_Code_Overflow; + CUR.error = FT_THROW( Code_Overflow ); return FAILURE; } @@ -1850,9 +1856,12 @@ if ( v != 0 ) { - zone->cur[point].x += TT_MULDIV( distance, - v * 0x10000L, - CUR.F_dot_P ); +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + if ( !SUBPIXEL_HINTING || + ( !CUR.ignore_x_mode || + ( CUR.sph_tweak_flags & SPH_TWEAK_ALLOW_X_DMOVE ) ) ) +#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */ + zone->cur[point].x += FT_MulDiv( distance, v, CUR.F_dot_P ); zone->tags[point] |= FT_CURVE_TAG_TOUCH_X; } @@ -1861,9 +1870,7 @@ if ( v != 0 ) { - zone->cur[point].y += TT_MULDIV( distance, - v * 0x10000L, - CUR.F_dot_P ); + zone->cur[point].y += FT_MulDiv( distance, v, CUR.F_dot_P ); zone->tags[point] |= FT_CURVE_TAG_TOUCH_Y; } @@ -1902,16 +1909,12 @@ v = CUR.GS.freeVector.x; if ( v != 0 ) - zone->org[point].x += TT_MULDIV( distance, - v * 0x10000L, - CUR.F_dot_P ); + zone->org[point].x += FT_MulDiv( distance, v, CUR.F_dot_P ); v = CUR.GS.freeVector.y; if ( v != 0 ) - zone->org[point].y += TT_MULDIV( distance, - v * 0x10000L, - CUR.F_dot_P ); + zone->org[point].y += FT_MulDiv( distance, v, CUR.F_dot_P ); } @@ -1932,7 +1935,12 @@ { FT_UNUSED_EXEC; - zone->cur[point].x += distance; +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + if ( !SUBPIXEL_HINTING || + !CUR.ignore_x_mode ) +#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */ + zone->cur[point].x += distance; + zone->tags[point] |= FT_CURVE_TAG_TOUCH_X; } @@ -2015,7 +2023,7 @@ if ( distance >= 0 ) { val = distance + compensation; - if ( distance && val < 0 ) + if ( val < 0 ) val = 0; } else @@ -2055,10 +2063,8 @@ if ( distance >= 0 ) { - val = distance + compensation + 32; - if ( distance && val > 0 ) - val &= ~63; - else + val = FT_PIX_ROUND( distance + compensation ); + if ( val < 0 ) val = 0; } else @@ -2100,14 +2106,14 @@ if ( distance >= 0 ) { val = FT_PIX_FLOOR( distance + compensation ) + 32; - if ( distance && val < 0 ) - val = 0; + if ( val < 0 ) + val = 32; } else { val = -( FT_PIX_FLOOR( compensation - distance ) + 32 ); if ( val > 0 ) - val = 0; + val = -32; } return val; @@ -2141,15 +2147,13 @@ if ( distance >= 0 ) { - val = distance + compensation; - if ( distance && val > 0 ) - val &= ~63; - else + val = FT_PIX_FLOOR( distance + compensation ); + if ( val < 0 ) val = 0; } else { - val = -( ( compensation - distance ) & -64 ); + val = -FT_PIX_FLOOR( compensation - distance ); if ( val > 0 ) val = 0; } @@ -2185,15 +2189,13 @@ if ( distance >= 0 ) { - val = distance + compensation + 63; - if ( distance && val > 0 ) - val &= ~63; - else + val = FT_PIX_CEIL( distance + compensation ); + if ( val < 0 ) val = 0; } else { - val = - FT_PIX_CEIL( compensation - distance ); + val = -FT_PIX_CEIL( compensation - distance ); if ( val > 0 ) val = 0; } @@ -2229,10 +2231,8 @@ if ( distance >= 0 ) { - val = distance + compensation + 16; - if ( distance && val > 0 ) - val &= ~31; - else + val = FT_PAD_ROUND( distance + compensation, 32 ); + if ( val < 0 ) val = 0; } else @@ -2279,17 +2279,17 @@ { val = ( distance - CUR.phase + CUR.threshold + compensation ) & -CUR.period; - if ( distance && val < 0 ) - val = 0; val += CUR.phase; + if ( val < 0 ) + val = CUR.phase; } else { val = -( ( CUR.threshold - CUR.phase - distance + compensation ) & -CUR.period ); - if ( val > 0 ) - val = 0; val -= CUR.phase; + if ( val > 0 ) + val = -CUR.phase; } return val; @@ -2327,17 +2327,17 @@ { val = ( ( distance - CUR.phase + CUR.threshold + compensation ) / CUR.period ) * CUR.period; - if ( distance && val < 0 ) - val = 0; val += CUR.phase; + if ( val < 0 ) + val = CUR.phase; } else { val = -( ( ( CUR.threshold - CUR.phase - distance + compensation ) / CUR.period ) * CUR.period ); - if ( val > 0 ) - val = 0; val -= CUR.phase; + if ( val > 0 ) + val = -CUR.phase; } return val; @@ -2404,8 +2404,9 @@ /* Sets Super Round parameters. */ /* */ /* */ - /* GridPeriod :: Grid period */ - /* selector :: SROUND opcode */ + /* GridPeriod :: The grid period. */ + /* */ + /* selector :: The SROUND opcode. */ /* */ static void SetSuperRound( EXEC_OP_ FT_F26Dot6 GridPeriod, @@ -2617,13 +2618,10 @@ if ( CUR.GS.dualVector.x == 0x4000 ) CUR.func_dualproj = Project_x; + else if ( CUR.GS.dualVector.y == 0x4000 ) + CUR.func_dualproj = Project_y; else - { - if ( CUR.GS.dualVector.y == 0x4000 ) - CUR.func_dualproj = Project_y; - else - CUR.func_dualproj = Dual_Project; - } + CUR.func_dualproj = Dual_Project; /* Force recalculation of cached aspect ratio */ CUR.tt_metrics.ratio = 0; @@ -2633,61 +2631,50 @@ #endif /* TT_CONFIG_OPTION_UNPATENTED_HINTING */ if ( CUR.GS.freeVector.x == 0x4000 ) - CUR.F_dot_P = CUR.GS.projVector.x * 0x10000L; + CUR.F_dot_P = CUR.GS.projVector.x; + else if ( CUR.GS.freeVector.y == 0x4000 ) + CUR.F_dot_P = CUR.GS.projVector.y; else - { - if ( CUR.GS.freeVector.y == 0x4000 ) - CUR.F_dot_P = CUR.GS.projVector.y * 0x10000L; - else - CUR.F_dot_P = (FT_Long)CUR.GS.projVector.x * CUR.GS.freeVector.x * 4 + - (FT_Long)CUR.GS.projVector.y * CUR.GS.freeVector.y * 4; - } + CUR.F_dot_P = ( (FT_Long)CUR.GS.projVector.x * CUR.GS.freeVector.x + + (FT_Long)CUR.GS.projVector.y * CUR.GS.freeVector.y ) >> + 14; if ( CUR.GS.projVector.x == 0x4000 ) CUR.func_project = (TT_Project_Func)Project_x; + else if ( CUR.GS.projVector.y == 0x4000 ) + CUR.func_project = (TT_Project_Func)Project_y; else - { - if ( CUR.GS.projVector.y == 0x4000 ) - CUR.func_project = (TT_Project_Func)Project_y; - else - CUR.func_project = (TT_Project_Func)Project; - } + CUR.func_project = (TT_Project_Func)Project; if ( CUR.GS.dualVector.x == 0x4000 ) CUR.func_dualproj = (TT_Project_Func)Project_x; + else if ( CUR.GS.dualVector.y == 0x4000 ) + CUR.func_dualproj = (TT_Project_Func)Project_y; else - { - if ( CUR.GS.dualVector.y == 0x4000 ) - CUR.func_dualproj = (TT_Project_Func)Project_y; - else - CUR.func_dualproj = (TT_Project_Func)Dual_Project; - } + CUR.func_dualproj = (TT_Project_Func)Dual_Project; CUR.func_move = (TT_Move_Func)Direct_Move; CUR.func_move_orig = (TT_Move_Func)Direct_Move_Orig; - if ( CUR.F_dot_P == 0x40000000L ) + if ( CUR.F_dot_P == 0x4000L ) { if ( CUR.GS.freeVector.x == 0x4000 ) { CUR.func_move = (TT_Move_Func)Direct_Move_X; CUR.func_move_orig = (TT_Move_Func)Direct_Move_Orig_X; } - else + else if ( CUR.GS.freeVector.y == 0x4000 ) { - if ( CUR.GS.freeVector.y == 0x4000 ) - { - CUR.func_move = (TT_Move_Func)Direct_Move_Y; - CUR.func_move_orig = (TT_Move_Func)Direct_Move_Orig_Y; - } + CUR.func_move = (TT_Move_Func)Direct_Move_Y; + CUR.func_move_orig = (TT_Move_Func)Direct_Move_Orig_Y; } } /* at small sizes, F_dot_P can become too small, resulting */ /* in overflows and `spikes' in a number of glyphs like `w'. */ - if ( FT_ABS( CUR.F_dot_P ) < 0x4000000L ) - CUR.F_dot_P = 0x40000000L; + if ( FT_ABS( CUR.F_dot_P ) < 0x400L ) + CUR.F_dot_P = 0x4000L; /* Disable cached aspect ratio */ CUR.tt_metrics.ratio = 0; @@ -2716,98 +2703,33 @@ /* In case Vx and Vy are both zero, Normalize() returns SUCCESS, and */ /* R is undefined. */ /* */ - - static FT_Bool Normalize( EXEC_OP_ FT_F26Dot6 Vx, FT_F26Dot6 Vy, FT_UnitVector* R ) { FT_F26Dot6 W; - FT_Bool S1, S2; FT_UNUSED_EXEC; - if ( FT_ABS( Vx ) < 0x10000L && FT_ABS( Vy ) < 0x10000L ) + if ( FT_ABS( Vx ) < 0x4000L && FT_ABS( Vy ) < 0x4000L ) { - Vx *= 0x100; - Vy *= 0x100; - - W = TT_VecLen( Vx, Vy ); - - if ( W == 0 ) + if ( Vx == 0 && Vy == 0 ) { /* XXX: UNDOCUMENTED! It seems that it is possible to try */ /* to normalize the vector (0,0). Return immediately. */ return SUCCESS; } - R->x = (FT_F2Dot14)FT_MulDiv( Vx, 0x4000L, W ); - R->y = (FT_F2Dot14)FT_MulDiv( Vy, 0x4000L, W ); - - return SUCCESS; + Vx *= 0x4000; + Vy *= 0x4000; } - W = TT_VecLen( Vx, Vy ); - - Vx = FT_MulDiv( Vx, 0x4000L, W ); - Vy = FT_MulDiv( Vy, 0x4000L, W ); - - W = Vx * Vx + Vy * Vy; - - /* Now, we want that Sqrt( W ) = 0x4000 */ - /* Or 0x10000000 <= W < 0x10004000 */ + W = FT_Hypot( Vx, Vy ); - if ( Vx < 0 ) - { - Vx = -Vx; - S1 = TRUE; - } - else - S1 = FALSE; - - if ( Vy < 0 ) - { - Vy = -Vy; - S2 = TRUE; - } - else - S2 = FALSE; - - while ( W < 0x10000000L ) - { - /* We need to increase W by a minimal amount */ - if ( Vx < Vy ) - Vx++; - else - Vy++; - - W = Vx * Vx + Vy * Vy; - } - - while ( W >= 0x10004000L ) - { - /* We need to decrease W by a minimal amount */ - if ( Vx < Vy ) - Vx--; - else - Vy--; - - W = Vx * Vx + Vy * Vy; - } - - /* Note that in various cases, we can only */ - /* compute a Sqrt(W) of 0x3FFF, eg. Vx = Vy */ - - if ( S1 ) - Vx = -Vx; - - if ( S2 ) - Vy = -Vy; - - R->x = (FT_F2Dot14)Vx; /* Type conversion */ - R->y = (FT_F2Dot14)Vy; /* Type conversion */ + R->x = (FT_F2Dot14)TT_DivFix14( Vx, W ); + R->y = (FT_F2Dot14)TT_DivFix14( Vy, W ); return SUCCESS; } @@ -2835,7 +2757,7 @@ BOUNDS( aIdx2, CUR.zp1.n_points ) ) { if ( CUR.pedantic_hinting ) - CUR.error = TT_Err_Invalid_Reference; + CUR.error = FT_THROW( Invalid_Reference ); return FAILURE; } @@ -3091,10 +3013,10 @@ CUR.func_round = (TT_Round_Func)Round_Super_45; -#define DO_SLOOP \ - if ( args[0] < 0 ) \ - CUR.error = TT_Err_Bad_Argument; \ - else \ +#define DO_SLOOP \ + if ( args[0] < 0 ) \ + CUR.error = FT_THROW( Bad_Argument ); \ + else \ CUR.GS.loop = args[0]; @@ -3110,14 +3032,9 @@ CUR.GS.single_width_cutin = (FT_F26Dot6)args[0]; - /* XXX: UNDOCUMENTED! or bug in the Windows engine? */ - /* */ - /* It seems that the value that is read here is */ - /* expressed in 16.16 format rather than in font */ - /* units. */ - /* */ -#define DO_SSW \ - CUR.GS.single_width_value = (FT_F26Dot6)( args[0] >> 10 ); +#define DO_SSW \ + CUR.GS.single_width_value = FT_MulFix( args[0], \ + CUR.tt_metrics.scale ); #define DO_FLIPON \ @@ -3128,19 +3045,22 @@ CUR.GS.auto_flip = FALSE; -#define DO_SDB \ - CUR.GS.delta_base = (FT_Short)args[0]; +#define DO_SDB \ + CUR.GS.delta_base = (FT_UShort)args[0]; -#define DO_SDS \ - CUR.GS.delta_shift = (FT_Short)args[0]; +#define DO_SDS \ + if ( (FT_ULong)args[0] > 6UL ) \ + CUR.error = FT_THROW( Bad_Argument ); \ + else \ + CUR.GS.delta_shift = (FT_UShort)args[0]; #define DO_MD /* nothing */ -#define DO_MPPEM \ - args[0] = CURRENT_Ppem(); +#define DO_MPPEM \ + args[0] = CUR_Func_cur_ppem(); /* Note: The pointSize should be irrelevant in a given font program; */ @@ -3152,8 +3072,8 @@ #else -#define DO_MPS \ - args[0] = CURRENT_Ppem(); +#define DO_MPS \ + args[0] = CUR_Func_cur_ppem(); #endif /* 0 */ @@ -3181,60 +3101,60 @@ args[0] = CUR.top; -#define DO_CINDEX \ - { \ - FT_Long L; \ - \ - \ - L = args[0]; \ - \ - if ( L <= 0 || L > CUR.args ) \ - { \ - if ( CUR.pedantic_hinting ) \ - CUR.error = TT_Err_Invalid_Reference; \ - args[0] = 0; \ - } \ - else \ - args[0] = CUR.stack[CUR.args - L]; \ - } - - -#define DO_JROT \ - if ( args[1] != 0 ) \ - { \ - if ( args[0] == 0 && CUR.args == 0 ) \ - CUR.error = TT_Err_Bad_Argument; \ - CUR.IP += args[0]; \ - if ( CUR.IP < 0 || \ - ( CUR.callTop > 0 && \ - CUR.IP > CUR.callStack[CUR.callTop - 1].Cur_End ) ) \ - CUR.error = TT_Err_Bad_Argument; \ - CUR.step_ins = FALSE; \ - } - - -#define DO_JMPR \ - if ( args[0] == 0 && CUR.args == 0 ) \ - CUR.error = TT_Err_Bad_Argument; \ - CUR.IP += args[0]; \ - if ( CUR.IP < 0 || \ - ( CUR.callTop > 0 && \ - CUR.IP > CUR.callStack[CUR.callTop - 1].Cur_End ) ) \ - CUR.error = TT_Err_Bad_Argument; \ +#define DO_CINDEX \ + { \ + FT_Long L; \ + \ + \ + L = args[0]; \ + \ + if ( L <= 0 || L > CUR.args ) \ + { \ + if ( CUR.pedantic_hinting ) \ + CUR.error = FT_THROW( Invalid_Reference ); \ + args[0] = 0; \ + } \ + else \ + args[0] = CUR.stack[CUR.args - L]; \ + } + + +#define DO_JROT \ + if ( args[1] != 0 ) \ + { \ + if ( args[0] == 0 && CUR.args == 0 ) \ + CUR.error = FT_THROW( Bad_Argument ); \ + CUR.IP += args[0]; \ + if ( CUR.IP < 0 || \ + ( CUR.callTop > 0 && \ + CUR.IP > CUR.callStack[CUR.callTop - 1].Def->end ) ) \ + CUR.error = FT_THROW( Bad_Argument ); \ + CUR.step_ins = FALSE; \ + } + + +#define DO_JMPR \ + if ( args[0] == 0 && CUR.args == 0 ) \ + CUR.error = FT_THROW( Bad_Argument ); \ + CUR.IP += args[0]; \ + if ( CUR.IP < 0 || \ + ( CUR.callTop > 0 && \ + CUR.IP > CUR.callStack[CUR.callTop - 1].Def->end ) ) \ + CUR.error = FT_THROW( Bad_Argument ); \ CUR.step_ins = FALSE; -#define DO_JROF \ - if ( args[1] == 0 ) \ - { \ - if ( args[0] == 0 && CUR.args == 0 ) \ - CUR.error = TT_Err_Bad_Argument; \ - CUR.IP += args[0]; \ - if ( CUR.IP < 0 || \ - ( CUR.callTop > 0 && \ - CUR.IP > CUR.callStack[CUR.callTop - 1].Cur_End ) ) \ - CUR.error = TT_Err_Bad_Argument; \ - CUR.step_ins = FALSE; \ +#define DO_JROF \ + if ( args[1] == 0 ) \ + { \ + if ( args[0] == 0 && CUR.args == 0 ) \ + CUR.error = FT_THROW( Bad_Argument ); \ + CUR.IP += args[0]; \ + if ( CUR.IP < 0 || \ + ( CUR.callTop > 0 && \ + CUR.IP > CUR.callStack[CUR.callTop - 1].Def->end ) ) \ + CUR.error = FT_THROW( Bad_Argument ); \ + CUR.step_ins = FALSE; \ } @@ -3292,13 +3212,13 @@ #define DO_DIV \ if ( args[1] == 0 ) \ - CUR.error = TT_Err_Divide_By_Zero; \ + CUR.error = FT_THROW( Divide_By_Zero ); \ else \ - args[0] = TT_MULDIV_NO_ROUND( args[0], 64L, args[1] ); + args[0] = FT_MulDiv_No_Round( args[0], 64L, args[1] ); #define DO_MUL \ - args[0] = TT_MULDIV( args[0], args[1], 64L ); + args[0] = FT_MulDiv( args[0], args[1], 64L ); #define DO_ABS \ @@ -3316,6 +3236,45 @@ #define DO_CEILING \ args[0] = FT_PIX_CEIL( args[0] ); +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + +#define DO_RS \ + { \ + FT_ULong I = (FT_ULong)args[0]; \ + \ + \ + if ( BOUNDSL( I, CUR.storeSize ) ) \ + { \ + if ( CUR.pedantic_hinting ) \ + ARRAY_BOUND_ERROR; \ + else \ + args[0] = 0; \ + } \ + else \ + { \ + /* subpixel hinting - avoid Typeman Dstroke and */ \ + /* IStroke and Vacuform rounds */ \ + \ + if ( SUBPIXEL_HINTING && \ + CUR.ignore_x_mode && \ + ( ( I == 24 && \ + ( CUR.face->sph_found_func_flags & \ + ( SPH_FDEF_SPACING_1 | \ + SPH_FDEF_SPACING_2 ) ) ) || \ + ( I == 22 && \ + ( CUR.sph_in_func_flags & \ + SPH_FDEF_TYPEMAN_STROKES ) ) || \ + ( I == 8 && \ + ( CUR.face->sph_found_func_flags & \ + SPH_FDEF_VACUFORM_ROUND_1 ) && \ + CUR.iup_called ) ) ) \ + args[0] = 0; \ + else \ + args[0] = CUR.storage[I]; \ + } \ + } + +#else /* !TT_CONFIG_OPTION_SUBPIXEL_HINTING */ #define DO_RS \ { \ @@ -3335,6 +3294,8 @@ args[0] = CUR.storage[I]; \ } +#endif /* !TT_CONFIG_OPTION_SUBPIXEL_HINTING */ + #define DO_WS \ { \ @@ -3402,12 +3363,12 @@ } \ } \ else \ - CUR.cvt[I] = TT_MULFIX( args[1], CUR.tt_metrics.scale ); \ + CUR.cvt[I] = FT_MulFix( args[1], CUR.tt_metrics.scale ); \ } -#define DO_DEBUG \ - CUR.error = TT_Err_Debug_OpCode; +#define DO_DEBUG \ + CUR.error = FT_THROW( Debug_OpCode ); #define DO_ROUND \ @@ -3435,10 +3396,10 @@ #undef ARRAY_BOUND_ERROR -#define ARRAY_BOUND_ERROR \ - { \ - CUR.error = TT_Err_Invalid_Reference; \ - return; \ +#define ARRAY_BOUND_ERROR \ + { \ + CUR.error = FT_THROW( Invalid_Reference ); \ + return; \ } @@ -4417,7 +4378,7 @@ if ( L <= 0 || L > CUR.args ) { if ( CUR.pedantic_hinting ) - CUR.error = TT_Err_Invalid_Reference; + CUR.error = FT_THROW( Invalid_Reference ); } else { @@ -4487,7 +4448,7 @@ } Fail_Overflow: - CUR.error = TT_Err_Code_Overflow; + CUR.error = FT_THROW( Code_Overflow ); return FAILURE; } @@ -4592,6 +4553,106 @@ TT_DefRecord* rec; TT_DefRecord* limit; +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + /* arguments to opcodes are skipped by `SKIP_Code' */ + FT_Byte opcode_pattern[9][12] = { + /* #0 inline delta function 1 */ + { + 0x4B, /* PPEM */ + 0x53, /* GTEQ */ + 0x23, /* SWAP */ + 0x4B, /* PPEM */ + 0x51, /* LTEQ */ + 0x5A, /* AND */ + 0x58, /* IF */ + 0x38, /* SHPIX */ + 0x1B, /* ELSE */ + 0x21, /* POP */ + 0x21, /* POP */ + 0x59 /* EIF */ + }, + /* #1 inline delta function 2 */ + { + 0x4B, /* PPEM */ + 0x54, /* EQ */ + 0x58, /* IF */ + 0x38, /* SHPIX */ + 0x1B, /* ELSE */ + 0x21, /* POP */ + 0x21, /* POP */ + 0x59 /* EIF */ + }, + /* #2 diagonal stroke function */ + { + 0x20, /* DUP */ + 0x20, /* DUP */ + 0xB0, /* PUSHB_1 */ + /* 1 */ + 0x60, /* ADD */ + 0x46, /* GC_cur */ + 0xB0, /* PUSHB_1 */ + /* 64 */ + 0x23, /* SWAP */ + 0x42 /* WS */ + }, + /* #3 VacuFormRound function */ + { + 0x45, /* RCVT */ + 0x23, /* SWAP */ + 0x46, /* GC_cur */ + 0x60, /* ADD */ + 0x20, /* DUP */ + 0xB0 /* PUSHB_1 */ + /* 38 */ + }, + /* #4 TTFautohint bytecode (old) */ + { + 0x20, /* DUP */ + 0x64, /* ABS */ + 0xB0, /* PUSHB_1 */ + /* 32 */ + 0x60, /* ADD */ + 0x66, /* FLOOR */ + 0x23, /* SWAP */ + 0xB0 /* PUSHB_1 */ + }, + /* #5 spacing function 1 */ + { + 0x01, /* SVTCA_x */ + 0xB0, /* PUSHB_1 */ + /* 24 */ + 0x43, /* RS */ + 0x58 /* IF */ + }, + /* #6 spacing function 2 */ + { + 0x01, /* SVTCA_x */ + 0x18, /* RTG */ + 0xB0, /* PUSHB_1 */ + /* 24 */ + 0x43, /* RS */ + 0x58 /* IF */ + }, + /* #7 TypeMan Talk DiagEndCtrl function */ + { + 0x01, /* SVTCA_x */ + 0x20, /* DUP */ + 0xB0, /* PUSHB_1 */ + /* 3 */ + 0x25, /* CINDEX */ + }, + /* #8 TypeMan Talk Align */ + { + 0x06, /* SPVTL */ + 0x7D, /* RDTG */ + }, + }; + FT_UShort opcode_patterns = 9; + FT_UShort opcode_pointer[9] = { 0, 0, 0, 0, 0, 0, 0, 0, 0 }; + FT_UShort opcode_size[9] = { 12, 8, 8, 6, 7, 4, 5, 4, 2 }; + FT_UShort i; +#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */ + /* some font programs are broken enough to redefine functions! */ /* We will then parse the current table. */ @@ -4611,7 +4672,7 @@ /* check that there is enough room for new functions */ if ( CUR.numFDefs >= CUR.maxFDefs ) { - CUR.error = TT_Err_Too_Many_Function_Defs; + CUR.error = FT_THROW( Too_Many_Function_Defs ); return; } CUR.numFDefs++; @@ -4621,28 +4682,149 @@ /* func # must be within unsigned 16-bit integer */ if ( n > 0xFFFFU ) { - CUR.error = TT_Err_Too_Many_Function_Defs; + CUR.error = FT_THROW( Too_Many_Function_Defs ); return; } - rec->range = CUR.curRange; - rec->opc = (FT_UInt16)n; - rec->start = CUR.IP + 1; - rec->active = TRUE; + rec->range = CUR.curRange; + rec->opc = (FT_UInt16)n; + rec->start = CUR.IP + 1; + rec->active = TRUE; + rec->inline_delta = FALSE; + rec->sph_fdef_flags = 0x0000; if ( n > CUR.maxFunc ) CUR.maxFunc = (FT_UInt16)n; +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + /* We don't know for sure these are typeman functions, */ + /* however they are only active when RS 22 is called */ + if ( n >= 64 && n <= 66 ) + rec->sph_fdef_flags |= SPH_FDEF_TYPEMAN_STROKES; +#endif + /* Now skip the whole function definition. */ /* We don't allow nested IDEFS & FDEFs. */ while ( SKIP_Code() == SUCCESS ) { + +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + + if ( SUBPIXEL_HINTING ) + { + for ( i = 0; i < opcode_patterns; i++ ) + { + if ( opcode_pointer[i] < opcode_size[i] && + CUR.opcode == opcode_pattern[i][opcode_pointer[i]] ) + { + opcode_pointer[i] += 1; + + if ( opcode_pointer[i] == opcode_size[i] ) + { + FT_TRACE7(( "sph: Function %d, opcode ptrn: %d, %s %s\n", + i, n, + CUR.face->root.family_name, + CUR.face->root.style_name )); + + switch ( i ) + { + case 0: + rec->sph_fdef_flags |= SPH_FDEF_INLINE_DELTA_1; + CUR.face->sph_found_func_flags |= SPH_FDEF_INLINE_DELTA_1; + break; + + case 1: + rec->sph_fdef_flags |= SPH_FDEF_INLINE_DELTA_2; + CUR.face->sph_found_func_flags |= SPH_FDEF_INLINE_DELTA_2; + break; + + case 2: + switch ( n ) + { + /* needs to be implemented still */ + case 58: + rec->sph_fdef_flags |= SPH_FDEF_DIAGONAL_STROKE; + CUR.face->sph_found_func_flags |= SPH_FDEF_DIAGONAL_STROKE; + } + break; + + case 3: + switch ( n ) + { + case 0: + rec->sph_fdef_flags |= SPH_FDEF_VACUFORM_ROUND_1; + CUR.face->sph_found_func_flags |= SPH_FDEF_VACUFORM_ROUND_1; + } + break; + + case 4: + /* probably not necessary to detect anymore */ + rec->sph_fdef_flags |= SPH_FDEF_TTFAUTOHINT_1; + CUR.face->sph_found_func_flags |= SPH_FDEF_TTFAUTOHINT_1; + break; + + case 5: + switch ( n ) + { + case 0: + case 1: + case 2: + case 4: + case 7: + case 8: + rec->sph_fdef_flags |= SPH_FDEF_SPACING_1; + CUR.face->sph_found_func_flags |= SPH_FDEF_SPACING_1; + } + break; + + case 6: + switch ( n ) + { + case 0: + case 1: + case 2: + case 4: + case 7: + case 8: + rec->sph_fdef_flags |= SPH_FDEF_SPACING_2; + CUR.face->sph_found_func_flags |= SPH_FDEF_SPACING_2; + } + break; + + case 7: + rec->sph_fdef_flags |= SPH_FDEF_TYPEMAN_DIAGENDCTRL; + CUR.face->sph_found_func_flags |= SPH_FDEF_TYPEMAN_DIAGENDCTRL; + break; + + case 8: +#if 0 + rec->sph_fdef_flags |= SPH_FDEF_TYPEMAN_DIAGENDCTRL; + CUR.face->sph_found_func_flags |= SPH_FDEF_TYPEMAN_DIAGENDCTRL; +#endif + break; + } + opcode_pointer[i] = 0; + } + } + + else + opcode_pointer[i] = 0; + } + + /* Set sph_compatibility_mode only when deltas are detected */ + CUR.face->sph_compatibility_mode = + ( ( CUR.face->sph_found_func_flags & SPH_FDEF_INLINE_DELTA_1 ) | + ( CUR.face->sph_found_func_flags & SPH_FDEF_INLINE_DELTA_2 ) ); + } + +#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */ + switch ( CUR.opcode ) { case 0x89: /* IDEF */ case 0x2C: /* FDEF */ - CUR.error = TT_Err_Nested_DEFS; + CUR.error = FT_THROW( Nested_DEFS ); return; case 0x2D: /* ENDF */ @@ -4667,9 +4849,13 @@ FT_UNUSED_ARG; +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + CUR.sph_in_func_flags = 0x0000; +#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */ + if ( CUR.callTop <= 0 ) /* We encountered an ENDF without a call */ { - CUR.error = TT_Err_ENDF_In_Exec_Stream; + CUR.error = FT_THROW( ENDF_In_Exec_Stream ); return; } @@ -4684,7 +4870,7 @@ if ( pRec->Cur_Count > 0 ) { CUR.callTop++; - CUR.IP = pRec->Cur_Restart; + CUR.IP = pRec->Def->start; } else /* Loop through the current function */ @@ -4751,10 +4937,21 @@ if ( !def->active ) goto Fail; +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + if ( SUBPIXEL_HINTING && + CUR.ignore_x_mode && + ( ( CUR.iup_called && + ( CUR.sph_tweak_flags & SPH_TWEAK_NO_CALL_AFTER_IUP ) ) || + ( def->sph_fdef_flags & SPH_FDEF_VACUFORM_ROUND_1 ) ) ) + goto Fail; + else + CUR.sph_in_func_flags = def->sph_fdef_flags; +#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */ + /* check the call stack */ if ( CUR.callTop >= CUR.callSize ) { - CUR.error = TT_Err_Stack_Overflow; + CUR.error = FT_THROW( Stack_Overflow ); return; } @@ -4763,8 +4960,7 @@ pCrec->Caller_Range = CUR.curRange; pCrec->Caller_IP = CUR.IP + 1; pCrec->Cur_Count = 1; - pCrec->Cur_Restart = def->start; - pCrec->Cur_End = def->end; + pCrec->Def = def; CUR.callTop++; @@ -4772,10 +4968,11 @@ def->start ); CUR.step_ins = FALSE; + return; Fail: - CUR.error = TT_Err_Invalid_Reference; + CUR.error = FT_THROW( Invalid_Reference ); } @@ -4828,10 +5025,19 @@ if ( !def->active ) goto Fail; +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + if ( SUBPIXEL_HINTING && + CUR.ignore_x_mode && + ( def->sph_fdef_flags & SPH_FDEF_VACUFORM_ROUND_1 ) ) + goto Fail; + else + CUR.sph_in_func_flags = def->sph_fdef_flags; +#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */ + /* check stack */ if ( CUR.callTop >= CUR.callSize ) { - CUR.error = TT_Err_Stack_Overflow; + CUR.error = FT_THROW( Stack_Overflow ); return; } @@ -4842,8 +5048,7 @@ pCrec->Caller_Range = CUR.curRange; pCrec->Caller_IP = CUR.IP + 1; pCrec->Cur_Count = (FT_Int)args[0]; - pCrec->Cur_Restart = def->start; - pCrec->Cur_End = def->end; + pCrec->Def = def; CUR.callTop++; @@ -4851,10 +5056,11 @@ CUR.step_ins = FALSE; } + return; Fail: - CUR.error = TT_Err_Invalid_Reference; + CUR.error = FT_THROW( Invalid_Reference ); } @@ -4885,7 +5091,7 @@ /* check that there is enough room for a new instruction */ if ( CUR.numIDefs >= CUR.maxIDefs ) { - CUR.error = TT_Err_Too_Many_Instruction_Defs; + CUR.error = FT_THROW( Too_Many_Instruction_Defs ); return; } CUR.numIDefs++; @@ -4894,7 +5100,7 @@ /* opcode must be unsigned 8-bit integer */ if ( 0 > args[0] || args[0] > 0x00FF ) { - CUR.error = TT_Err_Too_Many_Instruction_Defs; + CUR.error = FT_THROW( Too_Many_Instruction_Defs ); return; } @@ -4915,7 +5121,7 @@ { case 0x89: /* IDEF */ case 0x2C: /* FDEF */ - CUR.error = TT_Err_Nested_DEFS; + CUR.error = FT_THROW( Nested_DEFS ); return; case 0x2D: /* ENDF */ return; @@ -4949,7 +5155,7 @@ if ( BOUNDS( L, CUR.stackSize + 1 - CUR.top ) ) { - CUR.error = TT_Err_Stack_Overflow; + CUR.error = FT_THROW( Stack_Overflow ); return; } @@ -4976,7 +5182,7 @@ if ( BOUNDS( L, CUR.stackSize + 1 - CUR.top ) ) { - CUR.error = TT_Err_Stack_Overflow; + CUR.error = FT_THROW( Stack_Overflow ); return; } @@ -5006,7 +5212,7 @@ if ( BOUNDS( L, CUR.stackSize + 1 - CUR.top ) ) { - CUR.error = TT_Err_Stack_Overflow; + CUR.error = FT_THROW( Stack_Overflow ); return; } @@ -5031,7 +5237,7 @@ if ( BOUNDS( L, CUR.stackSize + 1 - CUR.top ) ) { - CUR.error = TT_Err_Stack_Overflow; + CUR.error = FT_THROW( Stack_Overflow ); return; } @@ -5074,7 +5280,7 @@ if ( BOUNDSL( L, CUR.zp2.n_points ) ) { if ( CUR.pedantic_hinting ) - CUR.error = TT_Err_Invalid_Reference; + CUR.error = FT_THROW( Invalid_Reference ); R = 0; } else @@ -5111,7 +5317,7 @@ if ( BOUNDS( L, CUR.zp2.n_points ) ) { if ( CUR.pedantic_hinting ) - CUR.error = TT_Err_Invalid_Reference; + CUR.error = FT_THROW( Invalid_Reference ); return; } @@ -5155,7 +5361,7 @@ BOUNDS( K, CUR.zp1.n_points ) ) { if ( CUR.pedantic_hinting ) - CUR.error = TT_Err_Invalid_Reference; + CUR.error = FT_THROW( Invalid_Reference ); D = 0; } else @@ -5184,15 +5390,15 @@ { /* this should be faster */ D = CUR_Func_dualproj( vec1, vec2 ); - D = TT_MULFIX( D, CUR.metrics.x_scale ); + D = FT_MulFix( D, CUR.metrics.x_scale ); } else { FT_Vector vec; - vec.x = TT_MULFIX( vec1->x - vec2->x, CUR.metrics.x_scale ); - vec.y = TT_MULFIX( vec1->y - vec2->y, CUR.metrics.y_scale ); + vec.x = FT_MulFix( vec1->x - vec2->x, CUR.metrics.x_scale ); + vec.y = FT_MulFix( vec1->y - vec2->y, CUR.metrics.y_scale ); D = CUR_fast_dualproj( &vec ); } @@ -5200,6 +5406,13 @@ } } +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + /* Disable Type 2 Vacuform Rounds - e.g. Arial Narrow */ + if ( SUBPIXEL_HINTING && + CUR.ignore_x_mode && FT_ABS( D ) == 64 ) + D += 1; +#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */ + args[0] = D; } @@ -5225,7 +5438,7 @@ BOUNDS( p1, CUR.zp2.n_points ) ) { if ( CUR.pedantic_hinting ) - CUR.error = TT_Err_Invalid_Reference; + CUR.error = FT_THROW( Invalid_Reference ); return; } @@ -5265,6 +5478,12 @@ A = v1->x - v2->x; B = v1->y - v2->y; + + if ( A == 0 && B == 0 ) + { + A = 0x4000; + aOpc = 0; + } } if ( ( aOpc & 1 ) != 0 ) @@ -5303,7 +5522,7 @@ default: if ( CUR.pedantic_hinting ) - CUR.error = TT_Err_Invalid_Reference; + CUR.error = FT_THROW( Invalid_Reference ); return; } @@ -5332,7 +5551,7 @@ default: if ( CUR.pedantic_hinting ) - CUR.error = TT_Err_Invalid_Reference; + CUR.error = FT_THROW( Invalid_Reference ); return; } @@ -5361,7 +5580,7 @@ default: if ( CUR.pedantic_hinting ) - CUR.error = TT_Err_Invalid_Reference; + CUR.error = FT_THROW( Invalid_Reference ); return; } @@ -5390,7 +5609,7 @@ default: if ( CUR.pedantic_hinting ) - CUR.error = TT_Err_Invalid_Reference; + CUR.error = FT_THROW( Invalid_Reference ); return; } @@ -5406,7 +5625,7 @@ /*************************************************************************/ /* */ /* INSTCTRL[]: INSTruction ConTRoL */ - /* Opcode range: 0x8e */ + /* Opcode range: 0x8E */ /* Stack: int32 int32 --> */ /* */ static void @@ -5421,7 +5640,7 @@ if ( K < 1 || K > 2 ) { if ( CUR.pedantic_hinting ) - CUR.error = TT_Err_Invalid_Reference; + CUR.error = FT_THROW( Invalid_Reference ); return; } @@ -5519,7 +5738,7 @@ if ( CUR.top < CUR.GS.loop ) { if ( CUR.pedantic_hinting ) - CUR.error = TT_Err_Too_Few_Arguments; + CUR.error = FT_THROW( Too_Few_Arguments ); goto Fail; } @@ -5533,7 +5752,7 @@ { if ( CUR.pedantic_hinting ) { - CUR.error = TT_Err_Invalid_Reference; + CUR.error = FT_THROW( Invalid_Reference ); return; } } @@ -5568,7 +5787,7 @@ BOUNDS( L, CUR.pts.n_points ) ) { if ( CUR.pedantic_hinting ) - CUR.error = TT_Err_Invalid_Reference; + CUR.error = FT_THROW( Invalid_Reference ); return; } @@ -5596,7 +5815,7 @@ BOUNDS( L, CUR.pts.n_points ) ) { if ( CUR.pedantic_hinting ) - CUR.error = TT_Err_Invalid_Reference; + CUR.error = FT_THROW( Invalid_Reference ); return; } @@ -5630,7 +5849,7 @@ if ( BOUNDS( p, zp.n_points ) ) { if ( CUR.pedantic_hinting ) - CUR.error = TT_Err_Invalid_Reference; + CUR.error = FT_THROW( Invalid_Reference ); *refp = 0; return FAILURE; } @@ -5657,12 +5876,8 @@ else #endif { - *x = TT_MULDIV( d, - (FT_Long)CUR.GS.freeVector.x * 0x10000L, - CUR.F_dot_P ); - *y = TT_MULDIV( d, - (FT_Long)CUR.GS.freeVector.y * 0x10000L, - CUR.F_dot_P ); + *x = FT_MulDiv( d, (FT_Long)CUR.GS.freeVector.x, CUR.F_dot_P ); + *y = FT_MulDiv( d, (FT_Long)CUR.GS.freeVector.y, CUR.F_dot_P ); } return SUCCESS; @@ -5732,7 +5947,7 @@ if ( CUR.top < CUR.GS.loop ) { if ( CUR.pedantic_hinting ) - CUR.error = TT_Err_Invalid_Reference; + CUR.error = FT_THROW( Invalid_Reference ); goto Fail; } @@ -5748,11 +5963,18 @@ { if ( CUR.pedantic_hinting ) { - CUR.error = TT_Err_Invalid_Reference; + CUR.error = FT_THROW( Invalid_Reference ); return; } } else +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + /* doesn't follow Cleartype spec but produces better result */ + if ( SUBPIXEL_HINTING && + CUR.ignore_x_mode ) + MOVE_Zp2_Point( point, 0, dy, TRUE ); + else +#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */ MOVE_Zp2_Point( point, dx, dy, TRUE ); CUR.GS.loop--; @@ -5772,7 +5994,7 @@ /* */ /* UNDOCUMENTED: According to Greg Hitchcock, there is one (virtual) */ /* contour in the twilight zone, namely contour number */ - /* zero. */ + /* zero which includes all points of it. */ /* */ static void Ins_SHC( INS_ARG ) @@ -5791,7 +6013,7 @@ if ( BOUNDS( contour, bounds ) ) { if ( CUR.pedantic_hinting ) - CUR.error = TT_Err_Invalid_Reference; + CUR.error = FT_THROW( Invalid_Reference ); return; } @@ -5839,7 +6061,7 @@ if ( BOUNDS( args[0], 2 ) ) { if ( CUR.pedantic_hinting ) - CUR.error = TT_Err_Invalid_Reference; + CUR.error = FT_THROW( Invalid_Reference ); return; } @@ -5877,12 +6099,15 @@ { FT_F26Dot6 dx, dy; FT_UShort point; +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + FT_Int B1, B2; +#endif if ( CUR.top < CUR.GS.loop + 1 ) { if ( CUR.pedantic_hinting ) - CUR.error = TT_Err_Invalid_Reference; + CUR.error = FT_THROW( Invalid_Reference ); goto Fail; } @@ -5891,13 +6116,13 @@ { if ( CUR.GS.both_x_axis ) { - dx = TT_MulFix14( (FT_UInt32)args[0], 0x4000 ); + dx = (FT_UInt32)args[0]; dy = 0; } else { dx = 0; - dy = TT_MulFix14( (FT_UInt32)args[0], 0x4000 ); + dy = (FT_UInt32)args[0]; } } else @@ -5917,13 +6142,95 @@ { if ( CUR.pedantic_hinting ) { - CUR.error = TT_Err_Invalid_Reference; + CUR.error = FT_THROW( Invalid_Reference ); return; } } else +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + { + /* If not using ignore_x_mode rendering, allow ZP2 move. */ + /* If inline deltas aren't allowed, skip ZP2 move. */ + /* If using ignore_x_mode rendering, allow ZP2 point move if: */ + /* - freedom vector is y and sph_compatibility_mode is off */ + /* - the glyph is composite and the move is in the Y direction */ + /* - the glyph is specifically set to allow SHPIX moves */ + /* - the move is on a previously Y-touched point */ + + if ( SUBPIXEL_HINTING && + CUR.ignore_x_mode ) + { + /* save point for later comparison */ + if ( CUR.GS.freeVector.y != 0 ) + B1 = CUR.zp2.cur[point].y; + else + B1 = CUR.zp2.cur[point].x; + + if ( !CUR.face->sph_compatibility_mode && + CUR.GS.freeVector.y != 0 ) + { + MOVE_Zp2_Point( point, dx, dy, TRUE ); + + /* save new point */ + if ( CUR.GS.freeVector.y != 0 ) + { + B2 = CUR.zp2.cur[point].y; + + /* reverse any disallowed moves */ + if ( ( CUR.sph_tweak_flags & SPH_TWEAK_SKIP_NONPIXEL_Y_MOVES ) && + ( B1 & 63 ) != 0 && + ( B2 & 63 ) != 0 && + B1 != B2 ) + MOVE_Zp2_Point( point, -dx, -dy, TRUE ); + } + } + else if ( CUR.face->sph_compatibility_mode ) + { + if ( CUR.sph_tweak_flags & SPH_TWEAK_ROUND_NONPIXEL_Y_MOVES ) + { + dx = FT_PIX_ROUND( B1 + dx ) - B1; + dy = FT_PIX_ROUND( B1 + dy ) - B1; + } + + /* skip post-iup deltas */ + if ( CUR.iup_called && + ( ( CUR.sph_in_func_flags & SPH_FDEF_INLINE_DELTA_1 ) || + ( CUR.sph_in_func_flags & SPH_FDEF_INLINE_DELTA_2 ) ) ) + goto Skip; + + if ( !( CUR.sph_tweak_flags & SPH_TWEAK_ALWAYS_SKIP_DELTAP ) && + ( ( CUR.is_composite && CUR.GS.freeVector.y != 0 ) || + ( CUR.zp2.tags[point] & FT_CURVE_TAG_TOUCH_Y ) || + ( CUR.sph_tweak_flags & SPH_TWEAK_DO_SHPIX ) ) ) + MOVE_Zp2_Point( point, 0, dy, TRUE ); + + /* save new point */ + if ( CUR.GS.freeVector.y != 0 ) + { + B2 = CUR.zp2.cur[point].y; + + /* reverse any disallowed moves */ + if ( ( B1 & 63 ) == 0 && + ( B2 & 63 ) != 0 && + B1 != B2 ) + MOVE_Zp2_Point( point, 0, -dy, TRUE ); + } + } + else if ( CUR.sph_in_func_flags & SPH_FDEF_TYPEMAN_DIAGENDCTRL ) + MOVE_Zp2_Point( point, dx, dy, TRUE ); + } + else + MOVE_Zp2_Point( point, dx, dy, TRUE ); + } + + Skip: + +#else /* !TT_CONFIG_OPTION_SUBPIXEL_HINTING */ + MOVE_Zp2_Point( point, dx, dy, TRUE ); +#endif /* !TT_CONFIG_OPTION_SUBPIXEL_HINTING */ + CUR.GS.loop--; } @@ -5945,6 +6252,21 @@ FT_UShort point; FT_F26Dot6 distance; +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + FT_F26Dot6 control_value_cutin = 0; /* pacify compiler */ + + + if ( SUBPIXEL_HINTING ) + { + control_value_cutin = CUR.GS.control_value_cutin; + + if ( CUR.ignore_x_mode && + CUR.GS.freeVector.x != 0 && + !( CUR.sph_tweak_flags & SPH_TWEAK_NORMAL_ROUND ) ) + control_value_cutin = 0; + } + +#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */ point = (FT_UShort)args[0]; @@ -5952,7 +6274,7 @@ BOUNDS( CUR.GS.rp0, CUR.zp0.n_points ) ) { if ( CUR.pedantic_hinting ) - CUR.error = TT_Err_Invalid_Reference; + CUR.error = FT_THROW( Invalid_Reference ); return; } @@ -5968,6 +6290,15 @@ distance = CUR_Func_project( CUR.zp1.cur + point, CUR.zp0.cur + CUR.GS.rp0 ); +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + /* subpixel hinting - make MSIRP respect CVT cut-in; */ + if ( SUBPIXEL_HINTING && + CUR.ignore_x_mode && + CUR.GS.freeVector.x != 0 && + FT_ABS( distance - args[1] ) >= control_value_cutin ) + distance = args[1]; +#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */ + CUR_Func_move( &CUR.zp1, point, args[1] - distance ); CUR.GS.rp1 = CUR.GS.rp0; @@ -5988,8 +6319,8 @@ Ins_MDAP( INS_ARG ) { FT_UShort point; - FT_F26Dot6 cur_dist, - distance; + FT_F26Dot6 cur_dist; + FT_F26Dot6 distance; point = (FT_UShort)args[0]; @@ -5997,15 +6328,25 @@ if ( BOUNDS( point, CUR.zp0.n_points ) ) { if ( CUR.pedantic_hinting ) - CUR.error = TT_Err_Invalid_Reference; + CUR.error = FT_THROW( Invalid_Reference ); return; } if ( ( CUR.opcode & 1 ) != 0 ) { cur_dist = CUR_fast_project( &CUR.zp0.cur[point] ); - distance = CUR_Func_round( cur_dist, - CUR.tt_metrics.compensations[0] ) - cur_dist; +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + if ( SUBPIXEL_HINTING && + CUR.ignore_x_mode && + CUR.GS.freeVector.x != 0 ) + distance = ROUND_None( + cur_dist, + CUR.tt_metrics.compensations[0] ) - cur_dist; + else +#endif + distance = CUR_Func_round( + cur_dist, + CUR.tt_metrics.compensations[0] ) - cur_dist; } else distance = 0; @@ -6028,18 +6369,29 @@ { FT_ULong cvtEntry; FT_UShort point; - FT_F26Dot6 distance, - org_dist; + FT_F26Dot6 distance; + FT_F26Dot6 org_dist; + FT_F26Dot6 control_value_cutin; + + control_value_cutin = CUR.GS.control_value_cutin; + cvtEntry = (FT_ULong)args[1]; + point = (FT_UShort)args[0]; - cvtEntry = (FT_ULong)args[1]; - point = (FT_UShort)args[0]; +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + if ( SUBPIXEL_HINTING && + CUR.ignore_x_mode && + CUR.GS.freeVector.x != 0 && + CUR.GS.freeVector.y == 0 && + !( CUR.sph_tweak_flags & SPH_TWEAK_NORMAL_ROUND ) ) + control_value_cutin = 0; +#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */ if ( BOUNDS( point, CUR.zp0.n_points ) || BOUNDSL( cvtEntry, CUR.cvtSize ) ) { if ( CUR.pedantic_hinting ) - CUR.error = TT_Err_Invalid_Reference; + CUR.error = FT_THROW( Invalid_Reference ); goto Fail; } @@ -6067,21 +6419,45 @@ if ( CUR.GS.gep0 == 0 ) /* If in twilight zone */ { - CUR.zp0.org[point].x = TT_MulFix14( (FT_UInt32)distance, - CUR.GS.freeVector.x ); +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + /* Only adjust if not in sph_compatibility_mode or ignore_x_mode. */ + /* Determined via experimentation and may be incorrect... */ + if ( !SUBPIXEL_HINTING || + ( !CUR.ignore_x_mode || + !CUR.face->sph_compatibility_mode ) ) +#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */ + CUR.zp0.org[point].x = TT_MulFix14( (FT_UInt32)distance, + CUR.GS.freeVector.x ); CUR.zp0.org[point].y = TT_MulFix14( (FT_UInt32)distance, CUR.GS.freeVector.y ), CUR.zp0.cur[point] = CUR.zp0.org[point]; } +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + if ( SUBPIXEL_HINTING && + CUR.ignore_x_mode && + ( CUR.sph_tweak_flags & SPH_TWEAK_MIAP_HACK ) && + distance > 0 && + CUR.GS.freeVector.y != 0 ) + distance = 0; +#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */ org_dist = CUR_fast_project( &CUR.zp0.cur[point] ); - if ( ( CUR.opcode & 1 ) != 0 ) /* rounding and control cutin flag */ + if ( ( CUR.opcode & 1 ) != 0 ) /* rounding and control cut-in flag */ { - if ( FT_ABS( distance - org_dist ) > CUR.GS.control_value_cutin ) + if ( FT_ABS( distance - org_dist ) > control_value_cutin ) distance = org_dist; - distance = CUR_Func_round( distance, CUR.tt_metrics.compensations[0] ); +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + if ( SUBPIXEL_HINTING && + CUR.ignore_x_mode && + CUR.GS.freeVector.x != 0 ) + distance = ROUND_None( distance, + CUR.tt_metrics.compensations[0] ); + else +#endif + distance = CUR_Func_round( distance, + CUR.tt_metrics.compensations[0] ); } CUR_Func_move( &CUR.zp0, point, distance - org_dist ); @@ -6102,8 +6478,18 @@ Ins_MDRP( INS_ARG ) { FT_UShort point; - FT_F26Dot6 org_dist, distance; + FT_F26Dot6 org_dist, distance, minimum_distance; + + + minimum_distance = CUR.GS.minimum_distance; +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + if ( SUBPIXEL_HINTING && + CUR.ignore_x_mode && + CUR.GS.freeVector.x != 0 && + !( CUR.sph_tweak_flags & SPH_TWEAK_NORMAL_ROUND ) ) + minimum_distance = 0; +#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */ point = (FT_UShort)args[0]; @@ -6111,7 +6497,7 @@ BOUNDS( CUR.GS.rp0, CUR.zp0.n_points ) ) { if ( CUR.pedantic_hinting ) - CUR.error = TT_Err_Invalid_Reference; + CUR.error = FT_THROW( Invalid_Reference ); goto Fail; } @@ -6138,15 +6524,15 @@ { /* this should be faster */ org_dist = CUR_Func_dualproj( vec1, vec2 ); - org_dist = TT_MULFIX( org_dist, CUR.metrics.x_scale ); + org_dist = FT_MulFix( org_dist, CUR.metrics.x_scale ); } else { FT_Vector vec; - vec.x = TT_MULFIX( vec1->x - vec2->x, CUR.metrics.x_scale ); - vec.y = TT_MULFIX( vec1->y - vec2->y, CUR.metrics.y_scale ); + vec.x = FT_MulFix( vec1->x - vec2->x, CUR.metrics.x_scale ); + vec.y = FT_MulFix( vec1->y - vec2->y, CUR.metrics.y_scale ); org_dist = CUR_fast_dualproj( &vec ); } @@ -6166,9 +6552,20 @@ /* round flag */ if ( ( CUR.opcode & 4 ) != 0 ) + { +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + if ( SUBPIXEL_HINTING && + CUR.ignore_x_mode && + CUR.GS.freeVector.x != 0 ) + distance = ROUND_None( + org_dist, + CUR.tt_metrics.compensations[CUR.opcode & 3] ); + else +#endif distance = CUR_Func_round( org_dist, CUR.tt_metrics.compensations[CUR.opcode & 3] ); + } else distance = ROUND_None( org_dist, @@ -6180,13 +6577,13 @@ { if ( org_dist >= 0 ) { - if ( distance < CUR.GS.minimum_distance ) - distance = CUR.GS.minimum_distance; + if ( distance < minimum_distance ) + distance = minimum_distance; } else { - if ( distance > -CUR.GS.minimum_distance ) - distance = -CUR.GS.minimum_distance; + if ( distance > -minimum_distance ) + distance = -minimum_distance; } } @@ -6221,11 +6618,28 @@ FT_F26Dot6 cvt_dist, distance, cur_dist, - org_dist; - - - point = (FT_UShort)args[0]; - cvtEntry = (FT_ULong)( args[1] + 1 ); + org_dist, + control_value_cutin, + minimum_distance; +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + FT_Int B1 = 0; /* pacify compiler */ + FT_Int B2 = 0; + FT_Bool reverse_move = FALSE; +#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */ + + + minimum_distance = CUR.GS.minimum_distance; + control_value_cutin = CUR.GS.control_value_cutin; + point = (FT_UShort)args[0]; + cvtEntry = (FT_ULong)( args[1] + 1 ); + +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + if ( SUBPIXEL_HINTING && + CUR.ignore_x_mode && + CUR.GS.freeVector.x != 0 && + !( CUR.sph_tweak_flags & SPH_TWEAK_NORMAL_ROUND ) ) + control_value_cutin = minimum_distance = 0; +#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */ /* XXX: UNDOCUMENTED! cvt[-1] = 0 always */ @@ -6234,7 +6648,7 @@ BOUNDS( CUR.GS.rp0, CUR.zp0.n_points ) ) { if ( CUR.pedantic_hinting ) - CUR.error = TT_Err_Invalid_Reference; + CUR.error = FT_THROW( Invalid_Reference ); goto Fail; } @@ -6280,7 +6694,20 @@ cvt_dist = -cvt_dist; } - /* control value cutin and round */ +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + if ( SUBPIXEL_HINTING && + CUR.ignore_x_mode && + CUR.GS.freeVector.y != 0 && + ( CUR.sph_tweak_flags & SPH_TWEAK_TIMES_NEW_ROMAN_HACK ) ) + { + if ( cur_dist < -64 ) + cvt_dist -= 16; + else if ( cur_dist > 64 && cur_dist < 84 ) + cvt_dist += 32; + } +#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */ + + /* control value cut-in and round */ if ( ( CUR.opcode & 4 ) != 0 ) { @@ -6301,7 +6728,7 @@ /* `ttinst2.doc', version 1.66, is thus incorrect since */ /* it implies `>=' instead of `>'. */ - if ( FT_ABS( cvt_dist - org_dist ) > CUR.GS.control_value_cutin ) + if ( FT_ABS( cvt_dist - org_dist ) > control_value_cutin ) cvt_dist = org_dist; } @@ -6310,9 +6737,23 @@ CUR.tt_metrics.compensations[CUR.opcode & 3] ); } else + { + +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + /* do cvt cut-in always in MIRP for sph */ + if ( SUBPIXEL_HINTING && + CUR.ignore_x_mode && + CUR.GS.gep0 == CUR.GS.gep1 ) + { + if ( FT_ABS( cvt_dist - org_dist ) > control_value_cutin ) + cvt_dist = org_dist; + } +#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */ + distance = ROUND_None( cvt_dist, CUR.tt_metrics.compensations[CUR.opcode & 3] ); + } /* minimum distance test */ @@ -6320,18 +6761,65 @@ { if ( org_dist >= 0 ) { - if ( distance < CUR.GS.minimum_distance ) - distance = CUR.GS.minimum_distance; + if ( distance < minimum_distance ) + distance = minimum_distance; } else { - if ( distance > -CUR.GS.minimum_distance ) - distance = -CUR.GS.minimum_distance; + if ( distance > -minimum_distance ) + distance = -minimum_distance; } } +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + if ( SUBPIXEL_HINTING ) + { + B1 = CUR.zp1.cur[point].y; + + /* Round moves if necessary */ + if ( CUR.ignore_x_mode && + CUR.GS.freeVector.y != 0 && + ( CUR.sph_tweak_flags & SPH_TWEAK_ROUND_NONPIXEL_Y_MOVES ) ) + distance = FT_PIX_ROUND( B1 + distance - cur_dist ) - B1 + cur_dist; + + if ( CUR.ignore_x_mode && + CUR.GS.freeVector.y != 0 && + ( CUR.opcode & 16 ) == 0 && + ( CUR.opcode & 8 ) == 0 && + ( CUR.sph_tweak_flags & SPH_TWEAK_COURIER_NEW_2_HACK ) ) + distance += 64; + } +#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */ + CUR_Func_move( &CUR.zp1, point, distance - cur_dist ); +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + if ( SUBPIXEL_HINTING ) + { + B2 = CUR.zp1.cur[point].y; + + /* Reverse move if necessary */ + if ( CUR.ignore_x_mode ) + { + if ( CUR.face->sph_compatibility_mode && + CUR.GS.freeVector.y != 0 && + ( B1 & 63 ) == 0 && + ( B2 & 63 ) != 0 ) + reverse_move = TRUE; + + if ( ( CUR.sph_tweak_flags & SPH_TWEAK_SKIP_NONPIXEL_Y_MOVES ) && + CUR.GS.freeVector.y != 0 && + ( B2 & 63 ) != 0 && + ( B1 & 63 ) != 0 ) + reverse_move = TRUE; + } + + if ( reverse_move ) + CUR_Func_move( &CUR.zp1, point, -( distance - cur_dist ) ); + } + +#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */ + Fail: CUR.GS.rp1 = CUR.GS.rp0; @@ -6357,11 +6845,22 @@ FT_UNUSED_ARG; +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + if ( SUBPIXEL_HINTING && + CUR.ignore_x_mode && + CUR.iup_called && + ( CUR.sph_tweak_flags & SPH_TWEAK_NO_ALIGNRP_AFTER_IUP ) ) + { + CUR.error = FT_THROW( Invalid_Reference ); + goto Fail; + } +#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */ + if ( CUR.top < CUR.GS.loop || BOUNDS( CUR.GS.rp0, CUR.zp0.n_points ) ) { if ( CUR.pedantic_hinting ) - CUR.error = TT_Err_Invalid_Reference; + CUR.error = FT_THROW( Invalid_Reference ); goto Fail; } @@ -6375,7 +6874,7 @@ { if ( CUR.pedantic_hinting ) { - CUR.error = TT_Err_Invalid_Reference; + CUR.error = FT_THROW( Invalid_Reference ); return; } } @@ -6409,7 +6908,7 @@ a0, a1, b0, b1; - FT_F26Dot6 discriminant; + FT_F26Dot6 discriminant, dotproduct; FT_F26Dot6 dx, dy, dax, day, @@ -6434,10 +6933,12 @@ BOUNDS( point, CUR.zp2.n_points ) ) { if ( CUR.pedantic_hinting ) - CUR.error = TT_Err_Invalid_Reference; + CUR.error = FT_THROW( Invalid_Reference ); return; } + /* Cramer's rule */ + dbx = CUR.zp0.cur[b1].x - CUR.zp0.cur[b0].x; dby = CUR.zp0.cur[b1].y - CUR.zp0.cur[b0].y; @@ -6449,15 +6950,25 @@ CUR.zp2.tags[point] |= FT_CURVE_TAG_TOUCH_BOTH; - discriminant = TT_MULDIV( dax, -dby, 0x40 ) + - TT_MULDIV( day, dbx, 0x40 ); + discriminant = FT_MulDiv( dax, -dby, 0x40 ) + + FT_MulDiv( day, dbx, 0x40 ); + dotproduct = FT_MulDiv( dax, dbx, 0x40 ) + + FT_MulDiv( day, dby, 0x40 ); - if ( FT_ABS( discriminant ) >= 0x40 ) + /* The discriminant above is actually a cross product of vectors */ + /* da and db. Together with the dot product, they can be used as */ + /* surrogates for sine and cosine of the angle between the vectors. */ + /* Indeed, */ + /* dotproduct = |da||db|cos(angle) */ + /* discriminant = |da||db|sin(angle) . */ + /* We use these equations to reject grazing intersections by */ + /* thresholding abs(tan(angle)) at 1/19, corresponding to 3 degrees. */ + if ( 19 * FT_ABS( discriminant ) > FT_ABS( dotproduct ) ) { - val = TT_MULDIV( dx, -dby, 0x40 ) + TT_MULDIV( dy, dbx, 0x40 ); + val = FT_MulDiv( dx, -dby, 0x40 ) + FT_MulDiv( dy, dbx, 0x40 ); - R.x = TT_MULDIV( val, dax, discriminant ); - R.y = TT_MULDIV( val, day, discriminant ); + R.x = FT_MulDiv( val, dax, discriminant ); + R.y = FT_MulDiv( val, day, discriminant ); CUR.zp2.cur[point].x = CUR.zp1.cur[a0].x + R.x; CUR.zp2.cur[point].y = CUR.zp1.cur[a0].y + R.y; @@ -6498,7 +7009,7 @@ BOUNDS( p2, CUR.zp0.n_points ) ) { if ( CUR.pedantic_hinting ) - CUR.error = TT_Err_Invalid_Reference; + CUR.error = FT_THROW( Invalid_Reference ); return; } @@ -6533,7 +7044,7 @@ if ( CUR.top < CUR.GS.loop ) { if ( CUR.pedantic_hinting ) - CUR.error = TT_Err_Invalid_Reference; + CUR.error = FT_THROW( Invalid_Reference ); goto Fail; } @@ -6547,7 +7058,7 @@ if ( BOUNDS( CUR.GS.rp1, CUR.zp0.n_points ) ) { if ( CUR.pedantic_hinting ) - CUR.error = TT_Err_Invalid_Reference; + CUR.error = FT_THROW( Invalid_Reference ); goto Fail; } @@ -6581,9 +7092,9 @@ FT_Vector vec; - vec.x = TT_MULFIX( CUR.zp1.orus[CUR.GS.rp2].x - orus_base->x, + vec.x = FT_MulFix( CUR.zp1.orus[CUR.GS.rp2].x - orus_base->x, CUR.metrics.x_scale ); - vec.y = TT_MULFIX( CUR.zp1.orus[CUR.GS.rp2].y - orus_base->y, + vec.y = FT_MulFix( CUR.zp1.orus[CUR.GS.rp2].y - orus_base->y, CUR.metrics.y_scale ); old_range = CUR_fast_dualproj( &vec ); @@ -6603,7 +7114,7 @@ { if ( CUR.pedantic_hinting ) { - CUR.error = TT_Err_Invalid_Reference; + CUR.error = FT_THROW( Invalid_Reference ); return; } continue; @@ -6618,20 +7129,41 @@ FT_Vector vec; - vec.x = TT_MULFIX( CUR.zp2.orus[point].x - orus_base->x, + vec.x = FT_MulFix( CUR.zp2.orus[point].x - orus_base->x, CUR.metrics.x_scale ); - vec.y = TT_MULFIX( CUR.zp2.orus[point].y - orus_base->y, + vec.y = FT_MulFix( CUR.zp2.orus[point].y - orus_base->y, CUR.metrics.y_scale ); org_dist = CUR_fast_dualproj( &vec ); } - cur_dist = CUR_Func_project ( &CUR.zp2.cur[point], cur_base ); + cur_dist = CUR_Func_project( &CUR.zp2.cur[point], cur_base ); if ( org_dist ) - new_dist = ( old_range != 0 ) - ? TT_MULDIV( org_dist, cur_range, old_range ) - : cur_dist; + { + if ( old_range ) + new_dist = FT_MulDiv( org_dist, cur_range, old_range ); + else + { + /* This is the same as what MS does for the invalid case: */ + /* */ + /* delta = (Original_Pt - Original_RP1) - */ + /* (Current_Pt - Current_RP1) ; */ + /* */ + /* In FreeType speak: */ + /* */ + /* delta = org_dist - cur_dist . */ + /* */ + /* We move `point' by `new_dist - cur_dist' after leaving */ + /* this block, thus we have */ + /* */ + /* new_dist - cur_dist = delta , */ + /* new_dist - cur_dist = org_dist - cur_dist , */ + /* new_dist = org_dist . */ + + new_dist = org_dist; + } + } else new_dist = 0; @@ -6662,7 +7194,7 @@ if ( BOUNDS( point, CUR.zp0.n_points ) ) { if ( CUR.pedantic_hinting ) - CUR.error = TT_Err_Invalid_Reference; + CUR.error = FT_THROW( Invalid_Reference ); return; } @@ -6791,12 +7323,12 @@ if ( !scale_valid ) { scale_valid = 1; - scale = TT_MULDIV( org2 + delta2 - ( org1 + delta1 ), - 0x10000L, orus2 - orus1 ); + scale = FT_DivFix( org2 + delta2 - ( org1 + delta1 ), + orus2 - orus1 ); } x = ( org1 + delta1 ) + - TT_MULFIX( worker->orus[i].x - orus1, scale ); + FT_MulFix( worker->orus[i].x - orus1, scale ); } worker->curs[i].x = x; } @@ -6851,6 +7383,16 @@ contour = 0; point = 0; +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + if ( SUBPIXEL_HINTING && + CUR.ignore_x_mode ) + { + CUR.iup_called = TRUE; + if ( CUR.sph_tweak_flags & SPH_TWEAK_SKIP_IUP ) + return; + } +#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */ + do { end_point = CUR.pts.contours[contour] - CUR.pts.first_point; @@ -6916,10 +7458,20 @@ static void Ins_DELTAP( INS_ARG ) { - FT_ULong k, nump; + FT_ULong nump, k; FT_UShort A; - FT_ULong C; + FT_ULong C, P; FT_Long B; +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + FT_UShort B1, B2; + + + if ( SUBPIXEL_HINTING && + CUR.ignore_x_mode && + CUR.iup_called && + ( CUR.sph_tweak_flags & SPH_TWEAK_NO_DELTAP_AFTER_IUP ) ) + goto Fail; +#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */ #ifdef TT_CONFIG_OPTION_UNPATENTED_HINTING @@ -6932,7 +7484,7 @@ if ( CUR.args < n ) { if ( CUR.pedantic_hinting ) - CUR.error = TT_Err_Too_Few_Arguments; + CUR.error = FT_THROW( Too_Few_Arguments ); n = CUR.args; } @@ -6942,6 +7494,7 @@ } #endif + P = (FT_ULong)CUR_Func_cur_ppem(); nump = (FT_ULong)args[0]; /* some points theoretically may occur more than once, thus UShort isn't enough */ @@ -6950,7 +7503,7 @@ if ( CUR.args < 2 ) { if ( CUR.pedantic_hinting ) - CUR.error = TT_Err_Too_Few_Arguments; + CUR.error = FT_THROW( Too_Few_Arguments ); CUR.args = 0; goto Fail; } @@ -6986,19 +7539,80 @@ C += CUR.GS.delta_base; - if ( CURRENT_Ppem() == (FT_Long)C ) + if ( P == C ) { B = ( (FT_ULong)B & 0xF ) - 8; if ( B >= 0 ) B++; - B = B * 64 / ( 1L << CUR.GS.delta_shift ); + B *= 1L << ( 6 - CUR.GS.delta_shift ); + +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + + if ( SUBPIXEL_HINTING ) + { + /* + * Allow delta move if + * + * - not using ignore_x_mode rendering, + * - glyph is specifically set to allow it, or + * - glyph is composite and freedom vector is not in subpixel + * direction. + */ + if ( !CUR.ignore_x_mode || + ( CUR.sph_tweak_flags & SPH_TWEAK_ALWAYS_DO_DELTAP ) || + ( CUR.is_composite && CUR.GS.freeVector.y != 0 ) ) + CUR_Func_move( &CUR.zp0, A, B ); + + /* Otherwise, apply subpixel hinting and compatibility mode */ + /* rules, always skipping deltas in subpixel direction. */ + else if ( CUR.ignore_x_mode && CUR.GS.freeVector.y != 0 ) + { + /* save the y value of the point now; compare after move */ + B1 = (FT_UShort)CUR.zp0.cur[A].y; + + /* Standard subpixel hinting: Allow y move for y-touched */ + /* points. This messes up DejaVu ... */ + if ( !CUR.face->sph_compatibility_mode && + ( CUR.zp0.tags[A] & FT_CURVE_TAG_TOUCH_Y ) ) + CUR_Func_move( &CUR.zp0, A, B ); + + /* compatibility mode */ + else if ( CUR.face->sph_compatibility_mode && + !( CUR.sph_tweak_flags & SPH_TWEAK_ALWAYS_SKIP_DELTAP ) ) + { + if ( CUR.sph_tweak_flags & SPH_TWEAK_ROUND_NONPIXEL_Y_MOVES ) + B = FT_PIX_ROUND( B1 + B ) - B1; + + /* Allow delta move if using sph_compatibility_mode, */ + /* IUP has not been called, and point is touched on Y. */ + if ( !CUR.iup_called && + ( CUR.zp0.tags[A] & FT_CURVE_TAG_TOUCH_Y ) ) + CUR_Func_move( &CUR.zp0, A, B ); + } + + B2 = (FT_UShort)CUR.zp0.cur[A].y; + + /* Reverse this move if it results in a disallowed move */ + if ( CUR.GS.freeVector.y != 0 && + ( ( CUR.face->sph_compatibility_mode && + ( B1 & 63 ) == 0 && + ( B2 & 63 ) != 0 ) || + ( ( CUR.sph_tweak_flags & + SPH_TWEAK_SKIP_NONPIXEL_Y_MOVES_DELTAP ) && + ( B1 & 63 ) != 0 && + ( B2 & 63 ) != 0 ) ) ) + CUR_Func_move( &CUR.zp0, A, -B ); + } + } + else +#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */ - CUR_Func_move( &CUR.zp0, A, B ); + CUR_Func_move( &CUR.zp0, A, B ); } } else if ( CUR.pedantic_hinting ) - CUR.error = TT_Err_Invalid_Reference; + CUR.error = FT_THROW( Invalid_Reference ); } Fail: @@ -7016,7 +7630,7 @@ Ins_DELTAC( INS_ARG ) { FT_ULong nump, k; - FT_ULong A, C; + FT_ULong A, C, P; FT_Long B; @@ -7030,7 +7644,7 @@ if ( CUR.args < n ) { if ( CUR.pedantic_hinting ) - CUR.error = TT_Err_Too_Few_Arguments; + CUR.error = FT_THROW( Too_Few_Arguments ); n = CUR.args; } @@ -7040,6 +7654,7 @@ } #endif + P = (FT_ULong)CUR_Func_cur_ppem(); nump = (FT_ULong)args[0]; for ( k = 1; k <= nump; k++ ) @@ -7047,7 +7662,7 @@ if ( CUR.args < 2 ) { if ( CUR.pedantic_hinting ) - CUR.error = TT_Err_Too_Few_Arguments; + CUR.error = FT_THROW( Too_Few_Arguments ); CUR.args = 0; goto Fail; } @@ -7061,7 +7676,7 @@ { if ( CUR.pedantic_hinting ) { - CUR.error = TT_Err_Invalid_Reference; + CUR.error = FT_THROW( Invalid_Reference ); return; } } @@ -7085,12 +7700,12 @@ C += CUR.GS.delta_base; - if ( CURRENT_Ppem() == (FT_Long)C ) + if ( P == C ) { B = ( (FT_ULong)B & 0xF ) - 8; if ( B >= 0 ) B++; - B = B * 64 / ( 1L << CUR.GS.delta_shift ); + B *= 1L << ( 6 - CUR.GS.delta_shift ); CUR_Func_move_cvt( A, B ); } @@ -7123,22 +7738,109 @@ K = 0; - /* We return MS rasterizer version 1.7 for the font scaler. */ - if ( ( args[0] & 1 ) != 0 ) - K = 35; - - /* Has the glyph been rotated? */ +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + /********************************/ + /* RASTERIZER VERSION */ + /* Selector Bit: 0 */ + /* Return Bit(s): 0-7 */ + /* */ + if ( SUBPIXEL_HINTING && + ( args[0] & 1 ) != 0 && + CUR.ignore_x_mode ) + { + K = CUR.rasterizer_version; + FT_TRACE7(( "Setting rasterizer version %d\n", + CUR.rasterizer_version )); + } + else +#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */ + if ( ( args[0] & 1 ) != 0 ) + K = TT_INTERPRETER_VERSION_35; + + /********************************/ + /* GLYPH ROTATED */ + /* Selector Bit: 1 */ + /* Return Bit(s): 8 */ + /* */ if ( ( args[0] & 2 ) != 0 && CUR.tt_metrics.rotated ) K |= 0x80; - /* Has the glyph been stretched? */ + /********************************/ + /* GLYPH STRETCHED */ + /* Selector Bit: 2 */ + /* Return Bit(s): 9 */ + /* */ if ( ( args[0] & 4 ) != 0 && CUR.tt_metrics.stretched ) K |= 1 << 8; - /* Are we hinting for grayscale? */ + /********************************/ + /* HINTING FOR GRAYSCALE */ + /* Selector Bit: 5 */ + /* Return Bit(s): 12 */ + /* */ if ( ( args[0] & 32 ) != 0 && CUR.grayscale ) K |= 1 << 12; +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + + if ( SUBPIXEL_HINTING && + CUR.ignore_x_mode && + CUR.rasterizer_version >= TT_INTERPRETER_VERSION_35 ) + { + + if ( CUR.rasterizer_version >= 37 ) + { + /********************************/ + /* HINTING FOR SUBPIXEL */ + /* Selector Bit: 6 */ + /* Return Bit(s): 13 */ + /* */ + if ( ( args[0] & 64 ) != 0 && CUR.subpixel ) + K |= 1 << 13; + + /********************************/ + /* COMPATIBLE WIDTHS ENABLED */ + /* Selector Bit: 7 */ + /* Return Bit(s): 14 */ + /* */ + /* Functionality still needs to be added */ + if ( ( args[0] & 128 ) != 0 && CUR.compatible_widths ) + K |= 1 << 14; + + /********************************/ + /* SYMMETRICAL SMOOTHING */ + /* Selector Bit: 8 */ + /* Return Bit(s): 15 */ + /* */ + /* Functionality still needs to be added */ + if ( ( args[0] & 256 ) != 0 && CUR.symmetrical_smoothing ) + K |= 1 << 15; + + /********************************/ + /* HINTING FOR BGR? */ + /* Selector Bit: 9 */ + /* Return Bit(s): 16 */ + /* */ + /* Functionality still needs to be added */ + if ( ( args[0] & 512 ) != 0 && CUR.bgr ) + K |= 1 << 16; + + if ( CUR.rasterizer_version >= 38 ) + { + /********************************/ + /* SUBPIXEL POSITIONED? */ + /* Selector Bit: 10 */ + /* Return Bit(s): 17 */ + /* */ + /* Functionality still needs to be added */ + if ( ( args[0] & 1024 ) != 0 && CUR.subpixel_positioned ) + K |= 1 << 17; + } + } + } + +#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */ + args[0] = K; } @@ -7161,7 +7863,7 @@ if ( CUR.callTop >= CUR.callSize ) { - CUR.error = TT_Err_Stack_Overflow; + CUR.error = FT_THROW( Stack_Overflow ); return; } @@ -7170,8 +7872,7 @@ call->Caller_Range = CUR.curRange; call->Caller_IP = CUR.IP + 1; call->Cur_Count = 1; - call->Cur_Restart = def->start; - call->Cur_End = def->end; + call->Def = def; INS_Goto_CodeRange( def->range, def->start ); @@ -7180,7 +7881,7 @@ } } - CUR.error = TT_Err_Invalid_Opcode; + CUR.error = FT_THROW( Invalid_Opcode ); } @@ -7507,18 +8208,40 @@ FT_EXPORT_DEF( FT_Error ) TT_RunIns( TT_ExecContext exc ) { - FT_Long ins_counter = 0; /* executed instructions counter */ + FT_Long ins_counter = 0; /* executed instructions counter */ + FT_UShort i; + +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + FT_Byte opcode_pattern[1][2] = { + /* #8 TypeMan Talk Align */ + { + 0x06, /* SPVTL */ + 0x7D, /* RDTG */ + }, + }; + FT_UShort opcode_patterns = 1; + FT_UShort opcode_pointer[1] = { 0 }; + FT_UShort opcode_size[1] = { 1 }; +#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */ #ifdef TT_CONFIG_OPTION_STATIC_RASTER + if ( !exc ) + return FT_THROW( Invalid_Argument ); + cur = *exc; #endif - /* set CVT functions */ +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + CUR.iup_called = FALSE; +#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */ + + /* set PPEM and CVT functions */ CUR.tt_metrics.ratio = 0; if ( CUR.metrics.x_ppem != CUR.metrics.y_ppem ) { /* non-square pixels, use the stretched routines */ + CUR.func_cur_ppem = Current_Ppem_Stretched; CUR.func_read_cvt = Read_CVT_Stretched; CUR.func_write_cvt = Write_CVT_Stretched; CUR.func_move_cvt = Move_CVT_Stretched; @@ -7526,6 +8249,7 @@ else { /* square pixels, use normal routines */ + CUR.func_cur_ppem = Current_Ppem; CUR.func_read_cvt = Read_CVT; CUR.func_write_cvt = Write_CVT; CUR.func_move_cvt = Move_CVT; @@ -7560,12 +8284,9 @@ /* One can also interpret it as the index of the last argument. */ if ( CUR.args < 0 ) { - FT_UShort i; - - if ( CUR.pedantic_hinting ) { - CUR.error = TT_Err_Too_Few_Arguments; + CUR.error = FT_THROW( Too_Few_Arguments ); goto LErrorLabel_; } @@ -7582,12 +8303,45 @@ /* statement. */ if ( CUR.new_top > CUR.stackSize ) { - CUR.error = TT_Err_Stack_Overflow; + CUR.error = FT_THROW( Stack_Overflow ); goto LErrorLabel_; } CUR.step_ins = TRUE; - CUR.error = TT_Err_Ok; + CUR.error = FT_Err_Ok; + +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + + if ( SUBPIXEL_HINTING ) + { + for ( i = 0; i < opcode_patterns; i++ ) + { + if ( opcode_pointer[i] < opcode_size[i] && + CUR.opcode == opcode_pattern[i][opcode_pointer[i]] ) + { + opcode_pointer[i] += 1; + + if ( opcode_pointer[i] == opcode_size[i] ) + { + FT_TRACE7(( "sph: opcode ptrn: %d, %s %s\n", + i, + CUR.face->root.family_name, + CUR.face->root.style_name )); + + switch ( i ) + { + case 0: + break; + } + opcode_pointer[i] = 0; + } + } + else + opcode_pointer[i] = 0; + } + } + +#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */ #ifdef TT_CONFIG_OPTION_INTERPRETER_SWITCH @@ -7801,7 +8555,6 @@ Ins_MDAP( EXEC_ARG_ args ); break; - case 0x30: /* IUP */ case 0x31: /* IUP */ Ins_IUP( EXEC_ARG_ args ); @@ -7861,7 +8614,7 @@ break; Set_Invalid_Ref: - CUR.error = TT_Err_Invalid_Reference; + CUR.error = FT_THROW( Invalid_Reference ); break; case 0x43: /* RS */ @@ -8151,11 +8904,12 @@ #endif /* TT_CONFIG_OPTION_INTERPRETER_SWITCH */ - if ( CUR.error != TT_Err_Ok ) + if ( CUR.error ) { switch ( CUR.error ) { - case TT_Err_Invalid_Opcode: /* looking for redefined instructions */ + /* looking for redefined instructions */ + case FT_ERR( Invalid_Opcode ): { TT_DefRecord* def = CUR.IDefs; TT_DefRecord* limit = def + CUR.numIDefs; @@ -8170,7 +8924,7 @@ if ( CUR.callTop >= CUR.callSize ) { - CUR.error = TT_Err_Invalid_Reference; + CUR.error = FT_THROW( Invalid_Reference ); goto LErrorLabel_; } @@ -8179,8 +8933,7 @@ callrec->Caller_Range = CUR.curRange; callrec->Caller_IP = CUR.IP + 1; callrec->Cur_Count = 1; - callrec->Cur_Restart = def->start; - callrec->Cur_End = def->end; + callrec->Def = def; if ( INS_Goto_CodeRange( def->range, def->start ) == FAILURE ) goto LErrorLabel_; @@ -8190,7 +8943,7 @@ } } - CUR.error = TT_Err_Invalid_Opcode; + CUR.error = FT_THROW( Invalid_Opcode ); goto LErrorLabel_; #if 0 @@ -8216,14 +8969,14 @@ /* increment instruction counter and check if we didn't */ /* run this program for too long (e.g. infinite loops). */ if ( ++ins_counter > MAX_RUNNABLE_OPCODES ) - return TT_Err_Execution_Too_Long; + return FT_THROW( Execution_Too_Long ); LSuiteLabel_: if ( CUR.IP >= CUR.codeSize ) { if ( CUR.callTop > 0 ) { - CUR.error = TT_Err_Code_Overflow; + CUR.error = FT_THROW( Code_Overflow ); goto LErrorLabel_; } else @@ -8237,10 +8990,10 @@ *exc = cur; #endif - return TT_Err_Ok; + return FT_Err_Ok; LErrorCodeOverflow_: - CUR.error = TT_Err_Code_Overflow; + CUR.error = FT_THROW( Code_Overflow ); LErrorLabel_: @@ -8251,10 +9004,13 @@ /* If any errors have occurred, function tables may be broken. */ /* Force a re-execution of `prep' and `fpgm' tables if no */ /* bytecode debugger is run. */ - if ( CUR.error && !CUR.instruction_trap ) + if ( CUR.error && + !CUR.instruction_trap && + CUR.curRange == tt_coderange_glyph ) { FT_TRACE1(( " The interpreter returned error 0x%x\n", CUR.error )); - exc->size->cvt_ready = FALSE; + exc->size->bytecode_ready = -1; + exc->size->cvt_ready = -1; } return CUR.error; diff --git a/src/truetype/ttinterp.h b/src/truetype/ttinterp.h index 6d0fc03..333decc 100644 --- a/src/truetype/ttinterp.h +++ b/src/truetype/ttinterp.h @@ -4,7 +4,7 @@ /* */ /* TrueType bytecode interpreter (specification). */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2010 by */ +/* Copyright 1996-2007, 2010, 2012-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -81,6 +81,10 @@ FT_BEGIN_HEADER (*TT_Project_Func)( EXEC_OP_ FT_Pos dx, FT_Pos dy ); + /* getting current ppem. Take care of non-square pixels if necessary */ + typedef FT_Long + (*TT_Cur_Ppem_Func)( EXEC_OP ); + /* reading a cvt value. Take care of non-square pixels if necessary */ typedef FT_F26Dot6 (*TT_Get_CVT_Func)( EXEC_OP_ FT_ULong idx ); @@ -101,12 +105,54 @@ FT_BEGIN_HEADER FT_Int Caller_Range; FT_Long Caller_IP; FT_Long Cur_Count; - FT_Long Cur_Restart; - FT_Long Cur_End; + + TT_DefRecord *Def; /* either FDEF or IDEF */ } TT_CallRec, *TT_CallStack; +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + + /*************************************************************************/ + /* */ + /* These structures define rules used to tweak subpixel hinting for */ + /* various fonts. "", 0, "", NULL value indicates to match any value. */ + /* */ + +#define SPH_MAX_NAME_SIZE 32 +#define SPH_MAX_CLASS_MEMBERS 100 + + typedef struct SPH_TweakRule_ + { + const char family[SPH_MAX_NAME_SIZE]; + const FT_UInt ppem; + const char style[SPH_MAX_NAME_SIZE]; + const FT_ULong glyph; + + } SPH_TweakRule; + + + typedef struct SPH_ScaleRule_ + { + const char family[SPH_MAX_NAME_SIZE]; + const FT_UInt ppem; + const char style[SPH_MAX_NAME_SIZE]; + const FT_ULong glyph; + const FT_ULong scale; + + } SPH_ScaleRule; + + + typedef struct SPH_Font_Class_ + { + const char name[SPH_MAX_NAME_SIZE]; + const char member[SPH_MAX_CLASS_MEMBERS][SPH_MAX_NAME_SIZE]; + + } SPH_Font_Class; + +#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */ + + /*************************************************************************/ /* */ /* The main structure for the interpreter which collects all necessary */ @@ -186,11 +232,6 @@ FT_BEGIN_HEADER FT_F26Dot6 phase; /* `SuperRounding' */ FT_F26Dot6 threshold; -#if 0 - /* this seems to be unused */ - FT_Int cur_ppem; /* ppem along the current proj vector */ -#endif - FT_Bool instruction_trap; /* If `True', the interpreter will */ /* exit after each instruction */ @@ -212,30 +253,61 @@ FT_BEGIN_HEADER TT_Move_Func func_move; /* current point move function */ TT_Move_Func func_move_orig; /* move original position function */ + TT_Cur_Ppem_Func func_cur_ppem; /* get current proj. ppem value */ + TT_Get_CVT_Func func_read_cvt; /* read a cvt entry */ TT_Set_CVT_Func func_write_cvt; /* write a cvt entry (in pixels) */ TT_Set_CVT_Func func_move_cvt; /* incr a cvt entry (in pixels) */ FT_Bool grayscale; /* are we hinting for grayscale? */ +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + TT_Round_Func func_round_sphn; /* subpixel rounding function */ + + FT_Bool subpixel; /* Using subpixel hinting? */ + FT_Bool ignore_x_mode; /* Standard rendering mode for */ + /* subpixel hinting. On if gray */ + /* or subpixel hinting is on. */ + + /* The following 4 aren't fully implemented but here for MS rasterizer */ + /* compatibility. */ + FT_Bool compatible_widths; /* compatible widths? */ + FT_Bool symmetrical_smoothing; /* symmetrical_smoothing? */ + FT_Bool bgr; /* bgr instead of rgb? */ + FT_Bool subpixel_positioned; /* subpixel positioned */ + /* (DirectWrite ClearType)? */ + + FT_Int rasterizer_version; /* MS rasterizer version */ + + FT_Bool iup_called; /* IUP called for glyph? */ + + FT_ULong sph_tweak_flags; /* flags to control */ + /* hint tweaks */ + + FT_ULong sph_in_func_flags; /* flags to indicate if in */ + /* special functions */ + +#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */ + } TT_ExecContextRec; extern const TT_GraphicsState tt_default_graphics_state; - FT_LOCAL( FT_Error ) +#ifdef TT_USE_BYTECODE_INTERPRETER + FT_LOCAL( void ) TT_Goto_CodeRange( TT_ExecContext exec, FT_Int range, FT_Long IP ); - FT_LOCAL( FT_Error ) + FT_LOCAL( void ) TT_Set_CodeRange( TT_ExecContext exec, FT_Int range, void* base, FT_Long length ); - FT_LOCAL( FT_Error ) + FT_LOCAL( void ) TT_Clear_CodeRange( TT_ExecContext exec, FT_Int range ); @@ -246,6 +318,7 @@ FT_BEGIN_HEADER FT_Long multiplier, void* _pbuff, FT_ULong new_max ); +#endif /* TT_USE_BYTECODE_INTERPRETER */ /*************************************************************************/ @@ -270,7 +343,9 @@ FT_BEGIN_HEADER FT_EXPORT( TT_ExecContext ) TT_New_Context( TT_Driver driver ); - FT_LOCAL( FT_Error ) + +#ifdef TT_USE_BYTECODE_INTERPRETER + FT_LOCAL( void ) TT_Done_Context( TT_ExecContext exec ); FT_LOCAL( FT_Error ) @@ -278,13 +353,14 @@ FT_BEGIN_HEADER TT_Face face, TT_Size size ); - FT_LOCAL( FT_Error ) + FT_LOCAL( void ) TT_Save_Context( TT_ExecContext exec, TT_Size ins ); FT_LOCAL( FT_Error ) TT_Run_Context( TT_ExecContext exec, FT_Bool debug ); +#endif /* TT_USE_BYTECODE_INTERPRETER */ /*************************************************************************/ diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c index 814c713..4707dfe 100644 --- a/src/truetype/ttobjs.c +++ b/src/truetype/ttobjs.c @@ -4,7 +4,7 @@ /* */ /* Objects manager (body). */ /* */ -/* Copyright 1996-2011 */ +/* Copyright 1996-2013 */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -21,6 +21,7 @@ #include FT_INTERNAL_STREAM_H #include FT_TRUETYPE_TAGS_H #include FT_INTERNAL_SFNT_H +#include FT_TRUETYPE_DRIVER_H #include "ttgload.h" #include "ttpload.h" @@ -149,20 +150,21 @@ tt_check_trickyness_family( FT_String* name ) { -#define TRICK_NAMES_MAX_CHARACTERS 16 -#define TRICK_NAMES_COUNT 8 +#define TRICK_NAMES_MAX_CHARACTERS 19 +#define TRICK_NAMES_COUNT 9 static const char trick_names[TRICK_NAMES_COUNT] [TRICK_NAMES_MAX_CHARACTERS + 1] = { - "DFKaiSho-SB", /* dfkaisb.ttf */ + "DFKaiSho-SB", /* dfkaisb.ttf */ "DFKaiShu", - "DFKai-SB", /* kaiu.ttf */ - "HuaTianKaiTi?", /* htkt2.ttf */ - "HuaTianSongTi?", /* htst3.ttf */ - "MingLiU", /* mingliu.ttf & mingliu.ttc */ - "PMingLiU", /* mingliu.ttc */ - "MingLi43", /* mingli.ttf */ + "DFKai-SB", /* kaiu.ttf */ + "HuaTianKaiTi?", /* htkt2.ttf */ + "HuaTianSongTi?", /* htst3.ttf */ + "Ming(for ISO10646)", /* hkscsiic.ttf & iicore.ttf */ + "MingLiU", /* mingliu.ttf & mingliu.ttc */ + "PMingLiU", /* mingliu.ttc */ + "MingLi43", /* mingli.ttf */ }; int nn; @@ -244,7 +246,7 @@ tt_check_trickyness_sfnt_ids( TT_Face face ) { #define TRICK_SFNT_IDS_PER_FACE 3 -#define TRICK_SFNT_IDS_NUM_FACES 13 +#define TRICK_SFNT_IDS_NUM_FACES 17 static const tt_sfnt_id_rec sfnt_id[TRICK_SFNT_IDS_NUM_FACES] [TRICK_SFNT_IDS_PER_FACE] = { @@ -254,69 +256,89 @@ #define TRICK_SFNT_ID_prep 2 { /* MingLiU 1995 */ - { 0x05bcf058, 0x000002e4 }, /* cvt */ - { 0x28233bf1, 0x000087c4 }, /* fpgm */ - { 0xa344a1ea, 0x000001e1 } /* prep */ + { 0x05BCF058UL, 0x000002E4UL }, /* cvt */ + { 0x28233BF1UL, 0x000087C4UL }, /* fpgm */ + { 0xA344A1EAUL, 0x000001E1UL } /* prep */ }, { /* MingLiU 1996- */ - { 0x05bcf058, 0x000002e4 }, /* cvt */ - { 0x28233bf1, 0x000087c4 }, /* fpgm */ - { 0xa344a1eb, 0x000001e1 } /* prep */ + { 0x05BCF058UL, 0x000002E4UL }, /* cvt */ + { 0x28233BF1UL, 0x000087C4UL }, /* fpgm */ + { 0xA344A1EBUL, 0x000001E1UL } /* prep */ }, { /* DFKaiShu */ - { 0x11e5ead4, 0x00000350 }, /* cvt */ - { 0x5a30ca3b, 0x00009063 }, /* fpgm */ - { 0x13a42602, 0x0000007e } /* prep */ + { 0x11E5EAD4UL, 0x00000350UL }, /* cvt */ + { 0x5A30CA3BUL, 0x00009063UL }, /* fpgm */ + { 0x13A42602UL, 0x0000007EUL } /* prep */ }, { /* HuaTianKaiTi */ - { 0xfffbfffc, 0x00000008 }, /* cvt */ - { 0x9c9e48b8, 0x0000bea2 }, /* fpgm */ - { 0x70020112, 0x00000008 } /* prep */ + { 0xFFFBFFFCUL, 0x00000008UL }, /* cvt */ + { 0x9C9E48B8UL, 0x0000BEA2UL }, /* fpgm */ + { 0x70020112UL, 0x00000008UL } /* prep */ }, { /* HuaTianSongTi */ - { 0xfffbfffc, 0x00000008 }, /* cvt */ - { 0x0a5a0483, 0x00017c39 }, /* fpgm */ - { 0x70020112, 0x00000008 } /* prep */ + { 0xFFFBFFFCUL, 0x00000008UL }, /* cvt */ + { 0x0A5A0483UL, 0x00017C39UL }, /* fpgm */ + { 0x70020112UL, 0x00000008UL } /* prep */ }, { /* NEC fadpop7.ttf */ - { 0x00000000, 0x00000000 }, /* cvt */ - { 0x40c92555, 0x000000e5 }, /* fpgm */ - { 0xa39b58e3, 0x0000117c } /* prep */ + { 0x00000000UL, 0x00000000UL }, /* cvt */ + { 0x40C92555UL, 0x000000E5UL }, /* fpgm */ + { 0xA39B58E3UL, 0x0000117CUL } /* prep */ }, { /* NEC fadrei5.ttf */ - { 0x00000000, 0x00000000 }, /* cvt */ - { 0x33c41652, 0x000000e5 }, /* fpgm */ - { 0x26d6c52a, 0x00000f6a } /* prep */ + { 0x00000000UL, 0x00000000UL }, /* cvt */ + { 0x33C41652UL, 0x000000E5UL }, /* fpgm */ + { 0x26D6C52AUL, 0x00000F6AUL } /* prep */ }, { /* NEC fangot7.ttf */ - { 0x00000000, 0x00000000 }, /* cvt */ - { 0x6db1651d, 0x0000019d }, /* fpgm */ - { 0x6c6e4b03, 0x00002492 } /* prep */ + { 0x00000000UL, 0x00000000UL }, /* cvt */ + { 0x6DB1651DUL, 0x0000019DUL }, /* fpgm */ + { 0x6C6E4B03UL, 0x00002492UL } /* prep */ }, { /* NEC fangyo5.ttf */ - { 0x00000000, 0x00000000 }, /* cvt */ - { 0x40c92555, 0x000000e5 }, /* fpgm */ - { 0xde51fad0, 0x0000117c } /* prep */ + { 0x00000000UL, 0x00000000UL }, /* cvt */ + { 0x40C92555UL, 0x000000E5UL }, /* fpgm */ + { 0xDE51FAD0UL, 0x0000117CUL } /* prep */ }, { /* NEC fankyo5.ttf */ - { 0x00000000, 0x00000000 }, /* cvt */ - { 0x85e47664, 0x000000e5 }, /* fpgm */ - { 0xa6c62831, 0x00001caa } /* prep */ + { 0x00000000UL, 0x00000000UL }, /* cvt */ + { 0x85E47664UL, 0x000000E5UL }, /* fpgm */ + { 0xA6C62831UL, 0x00001CAAUL } /* prep */ }, { /* NEC fanrgo5.ttf */ - { 0x00000000, 0x00000000 }, /* cvt */ - { 0x2d891cfd, 0x0000019d }, /* fpgm */ - { 0xa0604633, 0x00001de8 } /* prep */ + { 0x00000000UL, 0x00000000UL }, /* cvt */ + { 0x2D891CFDUL, 0x0000019DUL }, /* fpgm */ + { 0xA0604633UL, 0x00001DE8UL } /* prep */ }, { /* NEC fangot5.ttc */ - { 0x00000000, 0x00000000 }, /* cvt */ - { 0x40aa774c, 0x000001cb }, /* fpgm */ - { 0x9b5caa96, 0x00001f9a } /* prep */ + { 0x00000000UL, 0x00000000UL }, /* cvt */ + { 0x40AA774CUL, 0x000001CBUL }, /* fpgm */ + { 0x9B5CAA96UL, 0x00001F9AUL } /* prep */ }, { /* NEC fanmin3.ttc */ - { 0x00000000, 0x00000000 }, /* cvt */ - { 0x0d3de9cb, 0x00000141 }, /* fpgm */ - { 0xd4127766, 0x00002280 } /* prep */ + { 0x00000000UL, 0x00000000UL }, /* cvt */ + { 0x0D3DE9CBUL, 0x00000141UL }, /* fpgm */ + { 0xD4127766UL, 0x00002280UL } /* prep */ + }, + { /* NEC FA-Gothic, 1996 */ + { 0x00000000UL, 0x00000000UL }, /* cvt */ + { 0x4A692698UL, 0x000001F0UL }, /* fpgm */ + { 0x340D4346UL, 0x00001FCAUL } /* prep */ + }, + { /* NEC FA-Minchou, 1996 */ + { 0x00000000UL, 0x00000000UL }, /* cvt */ + { 0xCD34C604UL, 0x00000166UL }, /* fpgm */ + { 0x6CF31046UL, 0x000022B0UL } /* prep */ + }, + { /* NEC FA-RoundGothicB, 1996 */ + { 0x00000000UL, 0x00000000UL }, /* cvt */ + { 0x5DA75315UL, 0x0000019DUL }, /* fpgm */ + { 0x40745A5FUL, 0x000022E0UL } /* prep */ + }, + { /* NEC FA-RoundGothicM, 1996 */ + { 0x00000000UL, 0x00000000UL }, /* cvt */ + { 0xF055FC48UL, 0x000001C2UL }, /* fpgm */ + { 0x3900DED3UL, 0x00001E18UL } /* prep */ } }; @@ -501,7 +523,7 @@ if ( !sfnt ) { FT_ERROR(( "tt_face_init: cannot access `sfnt' module\n" )); - error = TT_Err_Missing_Module; + error = FT_THROW( Missing_Module ); goto Exit; } @@ -511,6 +533,10 @@ /* check that we have a valid TrueType file */ error = sfnt->init_face( stream, face, face_index, num_params, params ); + + /* Stream may have changed. */ + stream = face->root.stream; + if ( error ) goto Exit; @@ -531,7 +557,7 @@ /* If we are performing a simple font format check, exit immediately. */ if ( face_index < 0 ) - return TT_Err_Ok; + return FT_Err_Ok; /* Load font directory */ error = sfnt->load_face( stream, face, face_index, num_params, params ); @@ -631,7 +657,7 @@ return error; Bad_Format: - error = TT_Err_Unknown_File_Format; + error = FT_THROW( Unknown_File_Format ); goto Exit; } @@ -732,9 +758,11 @@ exec = ( (TT_Driver)FT_FACE_DRIVER( face ) )->context; if ( !exec ) - return TT_Err_Could_Not_Find_Context; + return FT_THROW( Could_Not_Find_Context ); - TT_Load_Context( exec, face, size ); + error = TT_Load_Context( exec, face, size ); + if ( error ) + return error; exec->callTop = 0; exec->top = 0; @@ -744,7 +772,7 @@ exec->threshold = 0; exec->instruction_trap = FALSE; - exec->F_dot_P = 0x10000L; + exec->F_dot_P = 0x4000L; exec->pedantic_hinting = pedantic; @@ -775,17 +803,15 @@ if ( face->font_program_size > 0 ) { - error = TT_Goto_CodeRange( exec, tt_coderange_font, 0 ); + TT_Goto_CodeRange( exec, tt_coderange_font, 0 ); - if ( !error ) - { - FT_TRACE4(( "Executing `fpgm' table.\n" )); - - error = face->interpreter( exec ); - } + FT_TRACE4(( "Executing `fpgm' table.\n" )); + error = face->interpreter( exec ); } else - error = TT_Err_Ok; + error = FT_Err_Ok; + + size->bytecode_ready = error; if ( !error ) TT_Save_Context( exec, size ); @@ -826,9 +852,11 @@ exec = ( (TT_Driver)FT_FACE_DRIVER( face ) )->context; if ( !exec ) - return TT_Err_Could_Not_Find_Context; + return FT_THROW( Could_Not_Find_Context ); - TT_Load_Context( exec, face, size ); + error = TT_Load_Context( exec, face, size ); + if ( error ) + return error; exec->callTop = 0; exec->top = 0; @@ -846,9 +874,9 @@ if ( face->cvt_program_size > 0 ) { - error = TT_Goto_CodeRange( exec, tt_coderange_cvt, 0 ); + TT_Goto_CodeRange( exec, tt_coderange_cvt, 0 ); - if ( !error && !size->debug ) + if ( !size->debug ) { FT_TRACE4(( "Executing `prep' table.\n" )); @@ -856,7 +884,29 @@ } } else - error = TT_Err_Ok; + error = FT_Err_Ok; + + size->cvt_ready = error; + + /* UNDOCUMENTED! The MS rasterizer doesn't allow the following */ + /* graphics state variables to be modified by the CVT program. */ + + exec->GS.dualVector.x = 0x4000; + exec->GS.dualVector.y = 0; + exec->GS.projVector.x = 0x4000; + exec->GS.projVector.y = 0x0; + exec->GS.freeVector.x = 0x4000; + exec->GS.freeVector.y = 0x0; + + exec->GS.rp0 = 0; + exec->GS.rp1 = 0; + exec->GS.rp2 = 0; + + exec->GS.gep0 = 1; + exec->GS.gep1 = 1; + exec->GS.gep2 = 1; + + exec->GS.loop = 1; /* save as default graphics state */ size->GS = exec->GS; @@ -866,10 +916,6 @@ return error; } -#endif /* TT_USE_BYTECODE_INTERPRETER */ - - -#ifdef TT_USE_BYTECODE_INTERPRETER static void tt_size_done_bytecode( FT_Size ftsize ) @@ -907,8 +953,8 @@ size->max_func = 0; size->max_ins = 0; - size->bytecode_ready = 0; - size->cvt_ready = 0; + size->bytecode_ready = -1; + size->cvt_ready = -1; } @@ -922,14 +968,13 @@ TT_Size size = (TT_Size)ftsize; TT_Face face = (TT_Face)ftsize->face; FT_Memory memory = face->root.memory; - FT_Int i; FT_UShort n_twilight; TT_MaxProfile* maxp = &face->max_profile; - size->bytecode_ready = 1; - size->cvt_ready = 0; + size->bytecode_ready = -1; + size->cvt_ready = -1; size->max_function_defs = maxp->maxFunctionDefs; size->max_instruction_defs = maxp->maxInstructionDefs; @@ -951,9 +996,11 @@ metrics->rotated = FALSE; metrics->stretched = FALSE; - /* set default compensation (all 0) */ - for ( i = 0; i < 4; i++ ) - metrics->compensations[i] = 0; + /* set default engine compensation */ + metrics->compensations[0] = 0; /* gray */ + metrics->compensations[1] = 0; /* black */ + metrics->compensations[2] = 0; /* white */ + metrics->compensations[3] = 0; /* reserved */ } /* allocate function defs, instruction defs, cvt, and storage area */ @@ -1003,18 +1050,17 @@ tt_size_ready_bytecode( TT_Size size, FT_Bool pedantic ) { - FT_Error error = TT_Err_Ok; + FT_Error error = FT_Err_Ok; - if ( !size->bytecode_ready ) - { + if ( size->bytecode_ready < 0 ) error = tt_size_init_bytecode( (FT_Size)size, pedantic ); - if ( error ) - goto Exit; - } + + if ( error || size->bytecode_ready ) + goto Exit; /* rescale CVT when needed */ - if ( !size->cvt_ready ) + if ( size->cvt_ready < 0 ) { FT_UInt i; TT_Face face = (TT_Face)size->root.face; @@ -1041,8 +1087,6 @@ size->GS = tt_default_graphics_state; error = tt_size_run_prep( size, pedantic ); - if ( !error ) - size->cvt_ready = 1; } Exit: @@ -1070,11 +1114,12 @@ tt_size_init( FT_Size ttsize ) /* TT_Size */ { TT_Size size = (TT_Size)ttsize; - FT_Error error = TT_Err_Ok; + FT_Error error = FT_Err_Ok; + #ifdef TT_USE_BYTECODE_INTERPRETER - size->bytecode_ready = 0; - size->cvt_ready = 0; + size->bytecode_ready = -1; + size->cvt_ready = -1; #endif size->ttmetrics.valid = FALSE; @@ -1102,8 +1147,7 @@ #ifdef TT_USE_BYTECODE_INTERPRETER - if ( size->bytecode_ready ) - tt_size_done_bytecode( ttsize ); + tt_size_done_bytecode( ttsize ); #endif size->ttmetrics.valid = FALSE; @@ -1126,7 +1170,7 @@ tt_size_reset( TT_Size size ) { TT_Face face; - FT_Error error = TT_Err_Ok; + FT_Error error = FT_Err_Ok; FT_Size_Metrics* metrics; @@ -1140,7 +1184,7 @@ *metrics = size->root.metrics; if ( metrics->x_ppem < 1 || metrics->y_ppem < 1 ) - return TT_Err_Invalid_PPem; + return FT_THROW( Invalid_PPem ); /* This bit flag, if set, indicates that the ppems must be */ /* rounded to integers. Nearly all TrueType fonts have this bit */ @@ -1170,22 +1214,20 @@ size->ttmetrics.scale = metrics->x_scale; size->ttmetrics.ppem = metrics->x_ppem; size->ttmetrics.x_ratio = 0x10000L; - size->ttmetrics.y_ratio = FT_MulDiv( metrics->y_ppem, - 0x10000L, + size->ttmetrics.y_ratio = FT_DivFix( metrics->y_ppem, metrics->x_ppem ); } else { size->ttmetrics.scale = metrics->y_scale; size->ttmetrics.ppem = metrics->y_ppem; - size->ttmetrics.x_ratio = FT_MulDiv( metrics->x_ppem, - 0x10000L, + size->ttmetrics.x_ratio = FT_DivFix( metrics->x_ppem, metrics->y_ppem ); size->ttmetrics.y_ratio = 0x10000L; } #ifdef TT_USE_BYTECODE_INTERPRETER - size->cvt_ready = 0; + size->cvt_ready = -1; #endif /* TT_USE_BYTECODE_INTERPRETER */ if ( !error ) @@ -1219,15 +1261,21 @@ if ( !TT_New_Context( driver ) ) - return TT_Err_Could_Not_Find_Context; + return FT_THROW( Could_Not_Find_Context ); +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + driver->interpreter_version = TT_INTERPRETER_VERSION_38; #else + driver->interpreter_version = TT_INTERPRETER_VERSION_35; +#endif + +#else /* !TT_USE_BYTECODE_INTERPRETER */ FT_UNUSED( ttdriver ); -#endif +#endif /* !TT_USE_BYTECODE_INTERPRETER */ - return TT_Err_Ok; + return FT_Err_Ok; } diff --git a/src/truetype/ttobjs.h b/src/truetype/ttobjs.h index 47e4129..859164f 100644 --- a/src/truetype/ttobjs.h +++ b/src/truetype/ttobjs.h @@ -4,7 +4,7 @@ /* */ /* Objects manager (specification). */ /* */ -/* Copyright 1996-2009, 2011-2012 by */ +/* Copyright 1996-2009, 2011-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -95,8 +95,8 @@ FT_BEGIN_HEADER FT_F26Dot6 control_value_cutin; FT_F26Dot6 single_width_cutin; FT_F26Dot6 single_width_value; - FT_Short delta_base; - FT_Short delta_shift; + FT_UShort delta_base; + FT_UShort delta_shift; FT_Byte instruct_control; /* According to Greg Hitchcock from Microsoft, the `scan_control' */ @@ -173,11 +173,13 @@ FT_BEGIN_HEADER /* */ typedef struct TT_DefRecord_ { - FT_Int range; /* in which code range is it located? */ - FT_Long start; /* where does it start? */ - FT_Long end; /* where does it end? */ - FT_UInt opc; /* function #, or instruction code */ - FT_Bool active; /* is it active? */ + FT_Int range; /* in which code range is it located? */ + FT_Long start; /* where does it start? */ + FT_Long end; /* where does it end? */ + FT_UInt opc; /* function #, or instruction code */ + FT_Bool active; /* is it active? */ + FT_Bool inline_delta; /* is function that defines inline delta? */ + FT_ULong sph_fdef_flags; /* flags to identify special functions */ } TT_DefRecord, *TT_DefArray; @@ -190,7 +192,7 @@ FT_BEGIN_HEADER { FT_Fixed xx, xy; /* transformation matrix coefficients */ FT_Fixed yx, yy; - FT_F26Dot6 ox, oy; /* offsets */ + FT_F26Dot6 ox, oy; /* offsets */ } TT_Transform; @@ -331,8 +333,10 @@ FT_BEGIN_HEADER FT_Bool debug; TT_ExecContext context; - FT_Bool bytecode_ready; - FT_Bool cvt_ready; + /* if negative, `fpgm' (resp. `prep'), wasn't executed yet; */ + /* otherwise it is the returned error code */ + FT_Error bytecode_ready; + FT_Error cvt_ready; #endif /* TT_USE_BYTECODE_INTERPRETER */ @@ -345,11 +349,12 @@ FT_BEGIN_HEADER /* */ typedef struct TT_DriverRec_ { - FT_DriverRec root; + FT_DriverRec root; + TT_ExecContext context; /* execution context */ TT_GlyphZoneRec zone; /* glyph loader points zone */ - void* extension_component; + FT_UInt interpreter_version; } TT_DriverRec; @@ -427,6 +432,10 @@ FT_BEGIN_HEADER tt_slot_init( FT_GlyphSlot slot ); + /* auxiliary */ +#define IS_HINTED( flags ) ( ( flags & FT_LOAD_NO_HINTING ) == 0 ) + + FT_END_HEADER #endif /* __TTOBJS_H__ */ diff --git a/src/truetype/ttpic.c b/src/truetype/ttpic.c index 65ca845..edefae7 100644 --- a/src/truetype/ttpic.c +++ b/src/truetype/ttpic.c @@ -4,7 +4,7 @@ /* */ /* The FreeType position independent code services for truetype module. */ /* */ -/* Copyright 2009, 2010 by */ +/* Copyright 2009, 2010, 2012, 2013 by */ /* Oran Agra and Mickey Gabel. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -22,30 +22,29 @@ #include "ttpic.h" #include "tterrors.h" + #ifdef FT_CONFIG_OPTION_PIC /* forward declaration of PIC init functions from ttdriver.c */ FT_Error FT_Create_Class_tt_services( FT_Library library, FT_ServiceDescRec** output_class ); - void FT_Destroy_Class_tt_services( FT_Library library, FT_ServiceDescRec* clazz ); - void FT_Init_Class_tt_service_gx_multi_masters( FT_Service_MultiMastersRec* sv_mm ); - void FT_Init_Class_tt_service_truetype_glyf( FT_Service_TTGlyfRec* sv_ttglyf ); + void tt_driver_class_pic_free( FT_Library library ) { FT_PIC_Container* pic_container = &library->pic_container; - FT_Memory memory = library->memory; + FT_Memory memory = library->memory; if ( pic_container->truetype ) @@ -66,18 +65,19 @@ tt_driver_class_pic_init( FT_Library library ) { FT_PIC_Container* pic_container = &library->pic_container; - FT_Error error = TT_Err_Ok; - TTModulePIC* container; + FT_Error error = FT_Err_Ok; + TTModulePIC* container = NULL; FT_Memory memory = library->memory; /* allocate pointer, clear and set global container pointer */ - if ( FT_ALLOC ( container, sizeof ( *container ) ) ) + if ( FT_ALLOC( container, sizeof ( *container ) ) ) return error; FT_MEM_SET( container, 0, sizeof ( *container ) ); pic_container->truetype = container; - /* initialize pointer table - this is how the module usually expects this data */ + /* initialize pointer table - this is how the module usually */ + /* expects this data */ error = FT_Create_Class_tt_services( library, &container->tt_services ); if ( error ) @@ -88,7 +88,8 @@ #endif FT_Init_Class_tt_service_truetype_glyf( &container->tt_service_truetype_glyf ); -Exit: + + Exit: if ( error ) tt_driver_class_pic_free( library ); return error; diff --git a/src/truetype/ttpic.h b/src/truetype/ttpic.h index 48f43a5..cfb4ee6 100644 --- a/src/truetype/ttpic.h +++ b/src/truetype/ttpic.h @@ -4,7 +4,7 @@ /* */ /* The FreeType position independent code services for truetype module. */ /* */ -/* Copyright 2009 by */ +/* Copyright 2009, 2012, 2013 by */ /* Oran Agra and Mickey Gabel. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -23,29 +23,43 @@ FT_BEGIN_HEADER #ifndef FT_CONFIG_OPTION_PIC -#define FT_TT_SERVICES_GET tt_services -#define FT_TT_SERVICE_GX_MULTI_MASTERS_GET tt_service_gx_multi_masters -#define FT_TT_SERVICE_TRUETYPE_GLYF_GET tt_service_truetype_glyf + +#define TT_SERVICES_GET tt_services +#define TT_SERVICE_GX_MULTI_MASTERS_GET tt_service_gx_multi_masters +#define TT_SERVICE_TRUETYPE_GLYF_GET tt_service_truetype_glyf +#define TT_SERVICE_PROPERTIES_GET tt_service_properties #else /* FT_CONFIG_OPTION_PIC */ #include FT_MULTIPLE_MASTERS_H #include FT_SERVICE_MULTIPLE_MASTERS_H #include FT_SERVICE_TRUETYPE_GLYF_H +#include FT_SERVICE_PROPERTIES_H + - typedef struct TTModulePIC_ + typedef struct TTModulePIC_ { - FT_ServiceDescRec* tt_services; + FT_ServiceDescRec* tt_services; #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT - FT_Service_MultiMastersRec tt_service_gx_multi_masters; + FT_Service_MultiMastersRec tt_service_gx_multi_masters; #endif - FT_Service_TTGlyfRec tt_service_truetype_glyf; + FT_Service_TTGlyfRec tt_service_truetype_glyf; + FT_Service_PropertiesRec tt_service_properties; + } TTModulePIC; -#define GET_PIC(lib) ((TTModulePIC*)((lib)->pic_container.truetype)) -#define FT_TT_SERVICES_GET (GET_PIC(library)->tt_services) -#define FT_TT_SERVICE_GX_MULTI_MASTERS_GET (GET_PIC(library)->tt_service_gx_multi_masters) -#define FT_TT_SERVICE_TRUETYPE_GLYF_GET (GET_PIC(library)->tt_service_truetype_glyf) + +#define GET_PIC( lib ) \ + ( (TTModulePIC*)((lib)->pic_container.truetype) ) +#define TT_SERVICES_GET \ + ( GET_PIC( library )->tt_services ) +#define TT_SERVICE_GX_MULTI_MASTERS_GET \ + ( GET_PIC( library )->tt_service_gx_multi_masters ) +#define TT_SERVICE_TRUETYPE_GLYF_GET \ + ( GET_PIC( library )->tt_service_truetype_glyf ) +#define TT_SERVICE_PROPERTIES_GET \ + ( GET_PIC( library )->tt_service_properties ) + /* see ttpic.c for the implementation */ void @@ -58,6 +72,7 @@ FT_BEGIN_HEADER /* */ + FT_END_HEADER #endif /* __TTPIC_H__ */ diff --git a/src/truetype/ttpload.c b/src/truetype/ttpload.c index bb6005d..9991925 100644 --- a/src/truetype/ttpload.c +++ b/src/truetype/ttpload.c @@ -4,7 +4,7 @@ /* */ /* TrueType-specific tables loader (body). */ /* */ -/* Copyright 1996-2002, 2004-2012 by */ +/* Copyright 1996-2002, 2004-2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -72,7 +72,7 @@ /* it is possible that a font doesn't have a glyf table at all */ /* or its size is zero */ - if ( error == TT_Err_Table_Missing ) + if ( FT_ERR_EQ( error, Table_Missing ) ) face->glyf_len = 0; else if ( error ) goto Exit; @@ -81,7 +81,7 @@ error = face->goto_table( face, TTAG_loca, stream, &table_len ); if ( error ) { - error = TT_Err_Locations_Missing; + error = FT_THROW( Locations_Missing ); goto Exit; } @@ -92,7 +92,7 @@ if ( table_len >= 0x40000L ) { FT_TRACE2(( "table too large\n" )); - error = TT_Err_Invalid_Table; + error = FT_THROW( Invalid_Table ); goto Exit; } face->num_locations = table_len >> shift; @@ -104,7 +104,7 @@ if ( table_len >= 0x20000L ) { FT_TRACE2(( "table too large\n" )); - error = TT_Err_Invalid_Table; + error = FT_THROW( Invalid_Table ); goto Exit; } face->num_locations = table_len >> shift; @@ -296,7 +296,7 @@ face->cvt_size = 0; face->cvt = NULL; - error = TT_Err_Ok; + error = FT_Err_Ok; goto Exit; } @@ -334,7 +334,7 @@ FT_UNUSED( face ); FT_UNUSED( stream ); - return TT_Err_Ok; + return FT_Err_Ok; #endif } @@ -375,7 +375,7 @@ { face->font_program = NULL; face->font_program_size = 0; - error = TT_Err_Ok; + error = FT_Err_Ok; FT_TRACE2(( "is missing\n" )); } @@ -396,7 +396,7 @@ FT_UNUSED( face ); FT_UNUSED( stream ); - return TT_Err_Ok; + return FT_Err_Ok; #endif } @@ -436,7 +436,7 @@ { face->cvt_program = NULL; face->cvt_program_size = 0; - error = TT_Err_Ok; + error = FT_Err_Ok; FT_TRACE2(( "is missing\n" )); } @@ -457,7 +457,7 @@ FT_UNUSED( face ); FT_UNUSED( stream ); - return TT_Err_Ok; + return FT_Err_Ok; #endif } @@ -495,7 +495,7 @@ /* this table is optional */ error = face->goto_table( face, TTAG_hdmx, stream, &table_size ); if ( error || table_size < 8 ) - return TT_Err_Ok; + return FT_Err_Ok; if ( FT_FRAME_EXTRACT( table_size, face->hdmx_table ) ) goto Exit; @@ -508,9 +508,9 @@ record_size = FT_NEXT_ULONG( p ); /* The maximum number of bytes in an hdmx device record is the */ - /* maximum number of glyphs + 2; this is 0xFFFF + 2; this is */ - /* the reason why `record_size' is a long (which we read as */ - /* unsigned long for convenience). In practice, two bytes */ + /* maximum number of glyphs + 2; this is 0xFFFF + 2, thus */ + /* explaining why `record_size' is a long (which we read as */ + /* unsigned long for convenience). In practice, two bytes are */ /* sufficient to hold the size value. */ /* */ /* There are at least two fonts, HANNOM-A and HANNOM-B version */ @@ -522,10 +522,12 @@ record_size &= 0xFFFFU; /* The limit for `num_records' is a heuristic value. */ - - if ( version != 0 || num_records > 255 || record_size > 0x10001L ) + if ( version != 0 || + num_records > 255 || + record_size > 0x10001L || + record_size < 4 ) { - error = TT_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Fail; } diff --git a/src/truetype/ttsubpix.c b/src/truetype/ttsubpix.c new file mode 100644 index 0000000..ca60451 --- /dev/null +++ b/src/truetype/ttsubpix.c @@ -0,0 +1,1011 @@ +/***************************************************************************/ +/* */ +/* ttsubpix.c */ +/* */ +/* TrueType Subpixel Hinting. */ +/* */ +/* Copyright 2010-2013 by */ +/* David Turner, Robert Wilhelm, and Werner Lemberg. */ +/* */ +/* This file is part of the FreeType project, and may only be used, */ +/* modified, and distributed under the terms of the FreeType project */ +/* license, LICENSE.TXT. By continuing to use, modify, or distribute */ +/* this file you indicate that you have read the license and */ +/* understand and accept it fully. */ +/* */ +/***************************************************************************/ + +#include +#include FT_INTERNAL_DEBUG_H +#include FT_INTERNAL_CALC_H +#include FT_INTERNAL_STREAM_H +#include FT_INTERNAL_SFNT_H +#include FT_TRUETYPE_TAGS_H +#include FT_OUTLINE_H +#include FT_TRUETYPE_DRIVER_H + +#include "ttsubpix.h" + + +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + + /*************************************************************************/ + /* */ + /* These rules affect how the TT Interpreter does hinting, with the */ + /* goal of doing subpixel hinting by (in general) ignoring x moves. */ + /* Some of these rules are fixes that go above and beyond the */ + /* stated techniques in the MS whitepaper on Cleartype, due to */ + /* artifacts in many glyphs. So, these rules make some glyphs render */ + /* better than they do in the MS rasterizer. */ + /* */ + /* "" string or 0 int/char indicates to apply to all glyphs. */ + /* "-" used as dummy placeholders, but any non-matching string works. */ + /* */ + /* Some of this could arguably be implemented in fontconfig, however: */ + /* */ + /* - Fontconfig can't set things on a glyph-by-glyph basis. */ + /* - The tweaks that happen here are very low-level, from an average */ + /* user's point of view and are best implemented in the hinter. */ + /* */ + /* The goal is to make the subpixel hinting techniques as generalized */ + /* as possible across all fonts to prevent the need for extra rules such */ + /* as these. */ + /* */ + /* The rule structure is designed so that entirely new rules can easily */ + /* be added when a new compatibility feature is discovered. */ + /* */ + /* The rule structures could also use some enhancement to handle ranges. */ + /* */ + /* ****************** WORK IN PROGRESS ******************* */ + /* */ + + /* These are `classes' of fonts that can be grouped together and used in */ + /* rules below. A blank entry "" is required at the end of these! */ +#define FAMILY_CLASS_RULES_SIZE 7 + + static const SPH_Font_Class FAMILY_CLASS_Rules + [FAMILY_CLASS_RULES_SIZE] = + { + { "MS Legacy Fonts", + { "Aharoni", + "Andale Mono", + "Andalus", + "Angsana New", + "AngsanaUPC", + "Arabic Transparent", + "Arial Black", + "Arial Narrow", + "Arial Unicode MS", + "Arial", + "Batang", + "Browallia New", + "BrowalliaUPC", + "Comic Sans MS", + "Cordia New", + "CordiaUPC", + "Courier New", + "DFKai-SB", + "David Transparent", + "David", + "DilleniaUPC", + "Estrangelo Edessa", + "EucrosiaUPC", + "FangSong_GB2312", + "Fixed Miriam Transparent", + "FrankRuehl", + "Franklin Gothic Medium", + "FreesiaUPC", + "Garamond", + "Gautami", + "Georgia", + "Gulim", + "Impact", + "IrisUPC", + "JasmineUPC", + "KaiTi_GB2312", + "KodchiangUPC", + "Latha", + "Levenim MT", + "LilyUPC", + "Lucida Console", + "Lucida Sans Unicode", + "MS Gothic", + "MS Mincho", + "MV Boli", + "Mangal", + "Marlett", + "Microsoft Sans Serif", + "Mingliu", + "Miriam Fixed", + "Miriam Transparent", + "Miriam", + "Narkisim", + "Palatino Linotype", + "Raavi", + "Rod Transparent", + "Rod", + "Shruti", + "SimHei", + "Simplified Arabic Fixed", + "Simplified Arabic", + "Simsun", + "Sylfaen", + "Symbol", + "Tahoma", + "Times New Roman", + "Traditional Arabic", + "Trebuchet MS", + "Tunga", + "Verdana", + "Webdings", + "Wingdings", + "", + }, + }, + { "Core MS Legacy Fonts", + { "Arial Black", + "Arial Narrow", + "Arial Unicode MS", + "Arial", + "Comic Sans MS", + "Courier New", + "Garamond", + "Georgia", + "Impact", + "Lucida Console", + "Lucida Sans Unicode", + "Microsoft Sans Serif", + "Palatino Linotype", + "Tahoma", + "Times New Roman", + "Trebuchet MS", + "Verdana", + "", + }, + }, + { "Apple Legacy Fonts", + { "Geneva", + "Times", + "Monaco", + "Century", + "Chalkboard", + "Lobster", + "Century Gothic", + "Optima", + "Lucida Grande", + "Gill Sans", + "Baskerville", + "Helvetica", + "Helvetica Neue", + "", + }, + }, + { "Legacy Sans Fonts", + { "Andale Mono", + "Arial Unicode MS", + "Arial", + "Century Gothic", + "Comic Sans MS", + "Franklin Gothic Medium", + "Geneva", + "Lucida Console", + "Lucida Grande", + "Lucida Sans Unicode", + "Lucida Sans Typewriter", + "Microsoft Sans Serif", + "Monaco", + "Tahoma", + "Trebuchet MS", + "Verdana", + "", + }, + }, + + { "Misc Legacy Fonts", + { "Dark Courier", "", }, }, + { "Verdana Clones", + { "DejaVu Sans", + "Bitstream Vera Sans", "", }, }, + { "Verdana and Clones", + { "DejaVu Sans", + "Bitstream Vera Sans", + "Verdana", "", }, }, + }; + + + /* Define this to force natural (i.e. not bitmap-compatible) widths. */ + /* The default leans strongly towards natural widths except for a few */ + /* legacy fonts where a selective combination produces nicer results. */ +/* #define FORCE_NATURAL_WIDTHS */ + + + /* Define `classes' of styles that can be grouped together and used in */ + /* rules below. A blank entry "" is required at the end of these! */ +#define STYLE_CLASS_RULES_SIZE 5 + + const SPH_Font_Class STYLE_CLASS_Rules + [STYLE_CLASS_RULES_SIZE] = + { + { "Regular Class", + { "Regular", + "Book", + "Medium", + "Roman", + "Normal", + "", + }, + }, + { "Regular/Italic Class", + { "Regular", + "Book", + "Medium", + "Italic", + "Oblique", + "Roman", + "Normal", + "", + }, + }, + { "Bold/BoldItalic Class", + { "Bold", + "Bold Italic", + "Black", + "", + }, + }, + { "Bold/Italic/BoldItalic Class", + { "Bold", + "Bold Italic", + "Black", + "Italic", + "Oblique", + "", + }, + }, + { "Regular/Bold Class", + { "Regular", + "Book", + "Medium", + "Normal", + "Roman", + "Bold", + "Black", + "", + }, + }, + }; + + + /* Force special legacy fixes for fonts. */ +#define COMPATIBILITY_MODE_RULES_SIZE 1 + + const SPH_TweakRule COMPATIBILITY_MODE_Rules + [COMPATIBILITY_MODE_RULES_SIZE] = + { + { "Verdana Clones", 0, "", 0 }, + }; + + + /* Don't do subpixel (ignore_x_mode) hinting; do normal hinting. */ +#define PIXEL_HINTING_RULES_SIZE 2 + + const SPH_TweakRule PIXEL_HINTING_Rules + [PIXEL_HINTING_RULES_SIZE] = + { + /* these characters are almost always safe */ + { "Courier New", 12, "Italic", 'z' }, + { "Courier New", 11, "Italic", 'z' }, + }; + + + /* Subpixel hinting ignores SHPIX rules on X. Force SHPIX for these. */ +#define DO_SHPIX_RULES_SIZE 1 + + const SPH_TweakRule DO_SHPIX_Rules + [DO_SHPIX_RULES_SIZE] = + { + { "-", 0, "", 0 }, + }; + + + /* Skip Y moves that start with a point that is not on a Y pixel */ + /* boundary and don't move that point to a Y pixel boundary. */ +#define SKIP_NONPIXEL_Y_MOVES_RULES_SIZE 4 + + const SPH_TweakRule SKIP_NONPIXEL_Y_MOVES_Rules + [SKIP_NONPIXEL_Y_MOVES_RULES_SIZE] = + { + /* fix vwxyz thinness*/ + { "Consolas", 0, "", 0 }, + /* Fix thin middle stems */ + { "Core MS Legacy Fonts", 0, "Regular", 0 }, + /* Cyrillic small letter I */ + { "Legacy Sans Fonts", 0, "", 0 }, + /* Fix artifacts with some Regular & Bold */ + { "Verdana Clones", 0, "", 0 }, + }; + + +#define SKIP_NONPIXEL_Y_MOVES_RULES_EXCEPTIONS_SIZE 1 + + const SPH_TweakRule SKIP_NONPIXEL_Y_MOVES_Rules_Exceptions + [SKIP_NONPIXEL_Y_MOVES_RULES_EXCEPTIONS_SIZE] = + { + /* Fixes < and > */ + { "Courier New", 0, "Regular", 0 }, + }; + + + /* Skip Y moves that start with a point that is not on a Y pixel */ + /* boundary and don't move that point to a Y pixel boundary. */ +#define SKIP_NONPIXEL_Y_MOVES_DELTAP_RULES_SIZE 2 + + const SPH_TweakRule SKIP_NONPIXEL_Y_MOVES_DELTAP_Rules + [SKIP_NONPIXEL_Y_MOVES_DELTAP_RULES_SIZE] = + { + /* Maintain thickness of diagonal in 'N' */ + { "Times New Roman", 0, "Regular/Bold Class", 'N' }, + { "Georgia", 0, "Regular/Bold Class", 'N' }, + }; + + + /* Skip Y moves that move a point off a Y pixel boundary. */ +#define SKIP_OFFPIXEL_Y_MOVES_RULES_SIZE 1 + + const SPH_TweakRule SKIP_OFFPIXEL_Y_MOVES_Rules + [SKIP_OFFPIXEL_Y_MOVES_RULES_SIZE] = + { + { "-", 0, "", 0 }, + }; + + +#define SKIP_OFFPIXEL_Y_MOVES_RULES_EXCEPTIONS_SIZE 1 + + const SPH_TweakRule SKIP_OFFPIXEL_Y_MOVES_Rules_Exceptions + [SKIP_OFFPIXEL_Y_MOVES_RULES_EXCEPTIONS_SIZE] = + { + { "-", 0, "", 0 }, + }; + + + /* Round moves that don't move a point to a Y pixel boundary. */ +#define ROUND_NONPIXEL_Y_MOVES_RULES_SIZE 2 + + const SPH_TweakRule ROUND_NONPIXEL_Y_MOVES_Rules + [ROUND_NONPIXEL_Y_MOVES_RULES_SIZE] = + { + /* Droid font instructions don't snap Y to pixels */ + { "Droid Sans", 0, "Regular/Italic Class", 0 }, + { "Droid Sans Mono", 0, "", 0 }, + }; + + +#define ROUND_NONPIXEL_Y_MOVES_RULES_EXCEPTIONS_SIZE 1 + + const SPH_TweakRule ROUND_NONPIXEL_Y_MOVES_Rules_Exceptions + [ROUND_NONPIXEL_Y_MOVES_RULES_EXCEPTIONS_SIZE] = + { + { "-", 0, "", 0 }, + }; + + + /* Allow a Direct_Move along X freedom vector if matched. */ +#define ALLOW_X_DMOVE_RULES_SIZE 1 + + const SPH_TweakRule ALLOW_X_DMOVE_Rules + [ALLOW_X_DMOVE_RULES_SIZE] = + { + /* Fixes vanishing diagonal in 4 */ + { "Verdana", 0, "Regular", '4' }, + }; + + + /* Return MS rasterizer version 35 if matched. */ +#define RASTERIZER_35_RULES_SIZE 8 + + const SPH_TweakRule RASTERIZER_35_Rules + [RASTERIZER_35_RULES_SIZE] = + { + /* This seems to be the only way to make these look good */ + { "Times New Roman", 0, "Regular", 'i' }, + { "Times New Roman", 0, "Regular", 'j' }, + { "Times New Roman", 0, "Regular", 'm' }, + { "Times New Roman", 0, "Regular", 'r' }, + { "Times New Roman", 0, "Regular", 'a' }, + { "Times New Roman", 0, "Regular", 'n' }, + { "Times New Roman", 0, "Regular", 'p' }, + { "Times", 0, "", 0 }, + }; + + + /* Don't round to the subpixel grid. Round to pixel grid. */ +#define NORMAL_ROUND_RULES_SIZE 1 + + const SPH_TweakRule NORMAL_ROUND_Rules + [NORMAL_ROUND_RULES_SIZE] = + { + /* Fix serif thickness for certain ppems */ + /* Can probably be generalized somehow */ + { "Courier New", 0, "", 0 }, + }; + + + /* Skip IUP instructions if matched. */ +#define SKIP_IUP_RULES_SIZE 1 + + const SPH_TweakRule SKIP_IUP_Rules + [SKIP_IUP_RULES_SIZE] = + { + { "Arial", 13, "Regular", 'a' }, + }; + + + /* Skip MIAP Twilight hack if matched. */ +#define MIAP_HACK_RULES_SIZE 1 + + const SPH_TweakRule MIAP_HACK_Rules + [MIAP_HACK_RULES_SIZE] = + { + { "Geneva", 12, "", 0 }, + }; + + + /* Skip DELTAP instructions if matched. */ +#define ALWAYS_SKIP_DELTAP_RULES_SIZE 23 + + const SPH_TweakRule ALWAYS_SKIP_DELTAP_Rules + [ALWAYS_SKIP_DELTAP_RULES_SIZE] = + { + { "Georgia", 0, "Regular", 'k' }, + /* fix various problems with e in different versions */ + { "Trebuchet MS", 14, "Regular", 'e' }, + { "Trebuchet MS", 13, "Regular", 'e' }, + { "Trebuchet MS", 15, "Regular", 'e' }, + { "Trebuchet MS", 0, "Italic", 'v' }, + { "Trebuchet MS", 0, "Italic", 'w' }, + { "Trebuchet MS", 0, "Regular", 'Y' }, + { "Arial", 11, "Regular", 's' }, + /* prevent problems with '3' and others */ + { "Verdana", 10, "Regular", 0 }, + { "Verdana", 9, "Regular", 0 }, + /* Cyrillic small letter short I */ + { "Legacy Sans Fonts", 0, "", 0x438 }, + { "Legacy Sans Fonts", 0, "", 0x439 }, + { "Arial", 10, "Regular", '6' }, + { "Arial", 0, "Bold/BoldItalic Class", 'a' }, + /* Make horizontal stems consistent with the rest */ + { "Arial", 24, "Bold", 'a' }, + { "Arial", 25, "Bold", 'a' }, + { "Arial", 24, "Bold", 's' }, + { "Arial", 25, "Bold", 's' }, + { "Arial", 34, "Bold", 's' }, + { "Arial", 35, "Bold", 's' }, + { "Arial", 36, "Bold", 's' }, + { "Arial", 25, "Regular", 's' }, + { "Arial", 26, "Regular", 's' }, + }; + + + /* Always do DELTAP instructions if matched. */ +#define ALWAYS_DO_DELTAP_RULES_SIZE 1 + + const SPH_TweakRule ALWAYS_DO_DELTAP_Rules + [ALWAYS_DO_DELTAP_RULES_SIZE] = + { + { "-", 0, "", 0 }, + }; + + + /* Don't allow ALIGNRP after IUP. */ +#define NO_ALIGNRP_AFTER_IUP_RULES_SIZE 1 + + static const SPH_TweakRule NO_ALIGNRP_AFTER_IUP_Rules + [NO_ALIGNRP_AFTER_IUP_RULES_SIZE] = + { + /* Prevent creation of dents in outline */ + { "-", 0, "", 0 }, + }; + + + /* Don't allow DELTAP after IUP. */ +#define NO_DELTAP_AFTER_IUP_RULES_SIZE 1 + + static const SPH_TweakRule NO_DELTAP_AFTER_IUP_Rules + [NO_DELTAP_AFTER_IUP_RULES_SIZE] = + { + { "-", 0, "", 0 }, + }; + + + /* Don't allow CALL after IUP. */ +#define NO_CALL_AFTER_IUP_RULES_SIZE 1 + + static const SPH_TweakRule NO_CALL_AFTER_IUP_Rules + [NO_CALL_AFTER_IUP_RULES_SIZE] = + { + /* Prevent creation of dents in outline */ + { "-", 0, "", 0 }, + }; + + + /* De-embolden these glyphs slightly. */ +#define DEEMBOLDEN_RULES_SIZE 9 + + static const SPH_TweakRule DEEMBOLDEN_Rules + [DEEMBOLDEN_RULES_SIZE] = + { + { "Courier New", 0, "Bold", 'A' }, + { "Courier New", 0, "Bold", 'W' }, + { "Courier New", 0, "Bold", 'w' }, + { "Courier New", 0, "Bold", 'M' }, + { "Courier New", 0, "Bold", 'X' }, + { "Courier New", 0, "Bold", 'K' }, + { "Courier New", 0, "Bold", 'x' }, + { "Courier New", 0, "Bold", 'z' }, + { "Courier New", 0, "Bold", 'v' }, + }; + + + /* Embolden these glyphs slightly. */ +#define EMBOLDEN_RULES_SIZE 2 + + static const SPH_TweakRule EMBOLDEN_Rules + [EMBOLDEN_RULES_SIZE] = + { + { "Courier New", 0, "Regular", 0 }, + { "Courier New", 0, "Italic", 0 }, + }; + + + /* This is a CVT hack that makes thick horizontal stems on 2, 5, 7 */ + /* similar to Windows XP. */ +#define TIMES_NEW_ROMAN_HACK_RULES_SIZE 12 + + static const SPH_TweakRule TIMES_NEW_ROMAN_HACK_Rules + [TIMES_NEW_ROMAN_HACK_RULES_SIZE] = + { + { "Times New Roman", 16, "Italic", '2' }, + { "Times New Roman", 16, "Italic", '5' }, + { "Times New Roman", 16, "Italic", '7' }, + { "Times New Roman", 16, "Regular", '2' }, + { "Times New Roman", 16, "Regular", '5' }, + { "Times New Roman", 16, "Regular", '7' }, + { "Times New Roman", 17, "Italic", '2' }, + { "Times New Roman", 17, "Italic", '5' }, + { "Times New Roman", 17, "Italic", '7' }, + { "Times New Roman", 17, "Regular", '2' }, + { "Times New Roman", 17, "Regular", '5' }, + { "Times New Roman", 17, "Regular", '7' }, + }; + + + /* This fudges distance on 2 to get rid of the vanishing stem issue. */ + /* A real solution to this is certainly welcome. */ +#define COURIER_NEW_2_HACK_RULES_SIZE 15 + + static const SPH_TweakRule COURIER_NEW_2_HACK_Rules + [COURIER_NEW_2_HACK_RULES_SIZE] = + { + { "Courier New", 10, "Regular", '2' }, + { "Courier New", 11, "Regular", '2' }, + { "Courier New", 12, "Regular", '2' }, + { "Courier New", 13, "Regular", '2' }, + { "Courier New", 14, "Regular", '2' }, + { "Courier New", 15, "Regular", '2' }, + { "Courier New", 16, "Regular", '2' }, + { "Courier New", 17, "Regular", '2' }, + { "Courier New", 18, "Regular", '2' }, + { "Courier New", 19, "Regular", '2' }, + { "Courier New", 20, "Regular", '2' }, + { "Courier New", 21, "Regular", '2' }, + { "Courier New", 22, "Regular", '2' }, + { "Courier New", 23, "Regular", '2' }, + { "Courier New", 24, "Regular", '2' }, + }; + + +#ifndef FORCE_NATURAL_WIDTHS + + /* Use compatible widths with these glyphs. Compatible widths is always */ + /* on when doing B/W TrueType instructing, but is used selectively here, */ + /* typically on glyphs with 3 or more vertical stems. */ +#define COMPATIBLE_WIDTHS_RULES_SIZE 38 + + static const SPH_TweakRule COMPATIBLE_WIDTHS_Rules + [COMPATIBLE_WIDTHS_RULES_SIZE] = + { + { "Arial Unicode MS", 12, "Regular Class", 'm' }, + { "Arial Unicode MS", 14, "Regular Class", 'm' }, + /* Cyrillic small letter sha */ + { "Arial", 10, "Regular Class", 0x448 }, + { "Arial", 11, "Regular Class", 'm' }, + { "Arial", 12, "Regular Class", 'm' }, + /* Cyrillic small letter sha */ + { "Arial", 12, "Regular Class", 0x448 }, + { "Arial", 13, "Regular Class", 0x448 }, + { "Arial", 14, "Regular Class", 'm' }, + /* Cyrillic small letter sha */ + { "Arial", 14, "Regular Class", 0x448 }, + { "Arial", 15, "Regular Class", 0x448 }, + { "Arial", 17, "Regular Class", 'm' }, + { "DejaVu Sans", 15, "Regular Class", 0 }, + { "Microsoft Sans Serif", 11, "Regular Class", 0 }, + { "Microsoft Sans Serif", 12, "Regular Class", 0 }, + { "Segoe UI", 11, "Regular Class", 0 }, + { "Monaco", 0, "Regular Class", 0 }, + { "Segoe UI", 12, "Regular Class", 'm' }, + { "Segoe UI", 14, "Regular Class", 'm' }, + { "Tahoma", 11, "Regular Class", 0 }, + { "Times New Roman", 16, "Regular Class", 'c' }, + { "Times New Roman", 16, "Regular Class", 'm' }, + { "Times New Roman", 16, "Regular Class", 'o' }, + { "Times New Roman", 16, "Regular Class", 'w' }, + { "Trebuchet MS", 11, "Regular Class", 0 }, + { "Trebuchet MS", 12, "Regular Class", 0 }, + { "Trebuchet MS", 14, "Regular Class", 0 }, + { "Trebuchet MS", 15, "Regular Class", 0 }, + { "Ubuntu", 12, "Regular Class", 'm' }, + /* Cyrillic small letter sha */ + { "Verdana", 10, "Regular Class", 0x448 }, + { "Verdana", 11, "Regular Class", 0x448 }, + { "Verdana and Clones", 12, "Regular Class", 'i' }, + { "Verdana and Clones", 12, "Regular Class", 'j' }, + { "Verdana and Clones", 12, "Regular Class", 'l' }, + { "Verdana and Clones", 12, "Regular Class", 'm' }, + { "Verdana and Clones", 13, "Regular Class", 'i' }, + { "Verdana and Clones", 13, "Regular Class", 'j' }, + { "Verdana and Clones", 13, "Regular Class", 'l' }, + { "Verdana and Clones", 14, "Regular Class", 'm' }, + }; + + + /* Scaling slightly in the x-direction prior to hinting results in */ + /* more visually pleasing glyphs in certain cases. */ + /* This sometimes needs to be coordinated with compatible width rules. */ + /* A value of 1000 corresponds to a scaled value of 1.0. */ + +#define X_SCALING_RULES_SIZE 50 + + static const SPH_ScaleRule X_SCALING_Rules[X_SCALING_RULES_SIZE] = + { + { "DejaVu Sans", 12, "Regular Class", 'm', 950 }, + { "Verdana and Clones", 12, "Regular Class", 'a', 1100 }, + { "Verdana and Clones", 13, "Regular Class", 'a', 1050 }, + { "Arial", 11, "Regular Class", 'm', 975 }, + { "Arial", 12, "Regular Class", 'm', 1050 }, + /* Cyrillic small letter el */ + { "Arial", 13, "Regular Class", 0x43B, 950 }, + { "Arial", 13, "Regular Class", 'o', 950 }, + { "Arial", 13, "Regular Class", 'e', 950 }, + { "Arial", 14, "Regular Class", 'm', 950 }, + /* Cyrillic small letter el */ + { "Arial", 15, "Regular Class", 0x43B, 925 }, + { "Bitstream Vera Sans", 10, "Regular/Italic Class", 0, 1100 }, + { "Bitstream Vera Sans", 12, "Regular/Italic Class", 0, 1050 }, + { "Bitstream Vera Sans", 16, "Regular Class", 0, 1050 }, + { "Bitstream Vera Sans", 9, "Regular/Italic Class", 0, 1050 }, + { "DejaVu Sans", 12, "Regular Class", 'l', 975 }, + { "DejaVu Sans", 12, "Regular Class", 'i', 975 }, + { "DejaVu Sans", 12, "Regular Class", 'j', 975 }, + { "DejaVu Sans", 13, "Regular Class", 'l', 950 }, + { "DejaVu Sans", 13, "Regular Class", 'i', 950 }, + { "DejaVu Sans", 13, "Regular Class", 'j', 950 }, + { "DejaVu Sans", 10, "Regular/Italic Class", 0, 1100 }, + { "DejaVu Sans", 12, "Regular/Italic Class", 0, 1050 }, + { "Georgia", 10, "", 0, 1050 }, + { "Georgia", 11, "", 0, 1100 }, + { "Georgia", 12, "", 0, 1025 }, + { "Georgia", 13, "", 0, 1050 }, + { "Georgia", 16, "", 0, 1050 }, + { "Georgia", 17, "", 0, 1030 }, + { "Liberation Sans", 12, "Regular Class", 'm', 1100 }, + { "Lucida Grande", 11, "Regular Class", 'm', 1100 }, + { "Microsoft Sans Serif", 11, "Regular Class", 'm', 950 }, + { "Microsoft Sans Serif", 12, "Regular Class", 'm', 1050 }, + { "Segoe UI", 12, "Regular Class", 'H', 1050 }, + { "Segoe UI", 12, "Regular Class", 'm', 1050 }, + { "Segoe UI", 14, "Regular Class", 'm', 1050 }, + { "Tahoma", 11, "Regular Class", 'i', 975 }, + { "Tahoma", 11, "Regular Class", 'l', 975 }, + { "Tahoma", 11, "Regular Class", 'j', 900 }, + { "Tahoma", 11, "Regular Class", 'm', 918 }, + { "Verdana", 10, "Regular/Italic Class", 0, 1100 }, + { "Verdana", 12, "Regular Class", 'm', 975 }, + { "Verdana", 12, "Regular/Italic Class", 0, 1050 }, + { "Verdana", 13, "Regular/Italic Class", 'i', 950 }, + { "Verdana", 13, "Regular/Italic Class", 'j', 950 }, + { "Verdana", 13, "Regular/Italic Class", 'l', 950 }, + { "Verdana", 16, "Regular Class", 0, 1050 }, + { "Verdana", 9, "Regular/Italic Class", 0, 1050 }, + { "Times New Roman", 16, "Regular Class", 'm', 918 }, + { "Trebuchet MS", 11, "Regular Class", 'm', 800 }, + { "Trebuchet MS", 12, "Regular Class", 'm', 800 }, + }; + +#else + +#define COMPATIBLE_WIDTHS_RULES_SIZE 1 + + static const SPH_TweakRule COMPATIBLE_WIDTHS_Rules + [COMPATIBLE_WIDTHS_RULES_SIZE] = + { + { "-", 0, "", 0 }, + }; + + +#define X_SCALING_RULES_SIZE 1 + + static const SPH_ScaleRule X_SCALING_Rules + [X_SCALING_RULES_SIZE] = + { + { "-", 0, "", 0, 1000 }, + }; + +#endif /* FORCE_NATURAL_WIDTHS */ + + + FT_LOCAL_DEF( FT_Bool ) + is_member_of_family_class( const FT_String* detected_font_name, + const FT_String* rule_font_name ) + { + FT_UInt i, j; + + + /* Does font name match rule family? */ + if ( strcmp( detected_font_name, rule_font_name ) == 0 ) + return TRUE; + + /* Is font name a wildcard ""? */ + if ( strcmp( rule_font_name, "" ) == 0 ) + return TRUE; + + /* Is font name contained in a class list? */ + for ( i = 0; i < FAMILY_CLASS_RULES_SIZE; i++ ) + { + if ( strcmp( FAMILY_CLASS_Rules[i].name, rule_font_name ) == 0 ) + { + for ( j = 0; j < SPH_MAX_CLASS_MEMBERS; j++ ) + { + if ( strcmp( FAMILY_CLASS_Rules[i].member[j], "" ) == 0 ) + continue; + if ( strcmp( FAMILY_CLASS_Rules[i].member[j], + detected_font_name ) == 0 ) + return TRUE; + } + } + } + + return FALSE; + } + + + FT_LOCAL_DEF( FT_Bool ) + is_member_of_style_class( const FT_String* detected_font_style, + const FT_String* rule_font_style ) + { + FT_UInt i, j; + + + /* Does font style match rule style? */ + if ( strcmp( detected_font_style, rule_font_style ) == 0 ) + return TRUE; + + /* Is font style a wildcard ""? */ + if ( strcmp( rule_font_style, "" ) == 0 ) + return TRUE; + + /* Is font style contained in a class list? */ + for ( i = 0; i < STYLE_CLASS_RULES_SIZE; i++ ) + { + if ( strcmp( STYLE_CLASS_Rules[i].name, rule_font_style ) == 0 ) + { + for ( j = 0; j < SPH_MAX_CLASS_MEMBERS; j++ ) + { + if ( strcmp( STYLE_CLASS_Rules[i].member[j], "" ) == 0 ) + continue; + if ( strcmp( STYLE_CLASS_Rules[i].member[j], + detected_font_style ) == 0 ) + return TRUE; + } + } + } + + return FALSE; + } + + + FT_LOCAL_DEF( FT_Bool ) + sph_test_tweak( TT_Face face, + const FT_String* family, + FT_UInt ppem, + const FT_String* style, + FT_UInt glyph_index, + const SPH_TweakRule* rule, + FT_UInt num_rules ) + { + FT_UInt i; + + + /* rule checks may be able to be optimized further */ + for ( i = 0; i < num_rules; i++ ) + { + if ( family && + ( is_member_of_family_class ( family, rule[i].family ) ) ) + if ( rule[i].ppem == 0 || + rule[i].ppem == ppem ) + if ( style && + is_member_of_style_class ( style, rule[i].style ) ) + if ( rule[i].glyph == 0 || + FT_Get_Char_Index( (FT_Face)face, + rule[i].glyph ) == glyph_index ) + return TRUE; + } + + return FALSE; + } + + + static FT_UInt + scale_test_tweak( TT_Face face, + const FT_String* family, + FT_UInt ppem, + const FT_String* style, + FT_UInt glyph_index, + const SPH_ScaleRule* rule, + FT_UInt num_rules ) + { + FT_UInt i; + + + /* rule checks may be able to be optimized further */ + for ( i = 0; i < num_rules; i++ ) + { + if ( family && + ( is_member_of_family_class ( family, rule[i].family ) ) ) + if ( rule[i].ppem == 0 || + rule[i].ppem == ppem ) + if ( style && + is_member_of_style_class( style, rule[i].style ) ) + if ( rule[i].glyph == 0 || + FT_Get_Char_Index( (FT_Face)face, + rule[i].glyph ) == glyph_index ) + return rule[i].scale; + } + + return 1000; + } + + + FT_LOCAL_DEF( FT_UInt ) + sph_test_tweak_x_scaling( TT_Face face, + const FT_String* family, + FT_UInt ppem, + const FT_String* style, + FT_UInt glyph_index ) + { + return scale_test_tweak( face, family, ppem, style, glyph_index, + X_SCALING_Rules, X_SCALING_RULES_SIZE ); + } + + +#define TWEAK_RULES( x ) \ + if ( sph_test_tweak( face, family, ppem, style, glyph_index, \ + x##_Rules, x##_RULES_SIZE ) ) \ + loader->exec->sph_tweak_flags |= SPH_TWEAK_##x; + +#define TWEAK_RULES_EXCEPTIONS( x ) \ + if ( sph_test_tweak( face, family, ppem, style, glyph_index, \ + x##_Rules_Exceptions, x##_RULES_EXCEPTIONS_SIZE ) ) \ + loader->exec->sph_tweak_flags &= ~SPH_TWEAK_##x; + + + FT_LOCAL_DEF( void ) + sph_set_tweaks( TT_Loader loader, + FT_UInt glyph_index ) + { + TT_Face face = (TT_Face)loader->face; + FT_String* family = face->root.family_name; + int ppem = loader->size->metrics.x_ppem; + FT_String* style = face->root.style_name; + + + /* don't apply rules if style isn't set */ + if ( !face->root.style_name ) + return; + +#ifdef SPH_DEBUG_MORE_VERBOSE + printf( "%s,%d,%s,%c=%d ", + family, ppem, style, glyph_index, glyph_index ); +#endif + + TWEAK_RULES( PIXEL_HINTING ); + + if ( loader->exec->sph_tweak_flags & SPH_TWEAK_PIXEL_HINTING ) + { + loader->exec->ignore_x_mode = FALSE; + return; + } + + TWEAK_RULES( ALLOW_X_DMOVE ); + TWEAK_RULES( ALWAYS_DO_DELTAP ); + TWEAK_RULES( ALWAYS_SKIP_DELTAP ); + TWEAK_RULES( DEEMBOLDEN ); + TWEAK_RULES( DO_SHPIX ); + TWEAK_RULES( EMBOLDEN ); + TWEAK_RULES( MIAP_HACK ); + TWEAK_RULES( NORMAL_ROUND ); + TWEAK_RULES( NO_ALIGNRP_AFTER_IUP ); + TWEAK_RULES( NO_CALL_AFTER_IUP ); + TWEAK_RULES( NO_DELTAP_AFTER_IUP ); + TWEAK_RULES( RASTERIZER_35 ); + TWEAK_RULES( SKIP_IUP ); + + TWEAK_RULES( SKIP_OFFPIXEL_Y_MOVES ); + TWEAK_RULES_EXCEPTIONS( SKIP_OFFPIXEL_Y_MOVES ); + + TWEAK_RULES( SKIP_NONPIXEL_Y_MOVES_DELTAP ); + + TWEAK_RULES( SKIP_NONPIXEL_Y_MOVES ); + TWEAK_RULES_EXCEPTIONS( SKIP_NONPIXEL_Y_MOVES ); + + TWEAK_RULES( ROUND_NONPIXEL_Y_MOVES ); + TWEAK_RULES_EXCEPTIONS( ROUND_NONPIXEL_Y_MOVES ); + + if ( loader->exec->sph_tweak_flags & SPH_TWEAK_RASTERIZER_35 ) + { + if ( loader->exec->rasterizer_version != TT_INTERPRETER_VERSION_35 ) + { + loader->exec->rasterizer_version = TT_INTERPRETER_VERSION_35; + loader->exec->size->cvt_ready = -1; + + tt_size_ready_bytecode( + loader->exec->size, + FT_BOOL( loader->load_flags & FT_LOAD_PEDANTIC ) ); + } + else + loader->exec->rasterizer_version = TT_INTERPRETER_VERSION_35; + } + else + { + if ( loader->exec->rasterizer_version != + SPH_OPTION_SET_RASTERIZER_VERSION ) + { + loader->exec->rasterizer_version = SPH_OPTION_SET_RASTERIZER_VERSION; + loader->exec->size->cvt_ready = -1; + + tt_size_ready_bytecode( + loader->exec->size, + FT_BOOL( loader->load_flags & FT_LOAD_PEDANTIC ) ); + } + else + loader->exec->rasterizer_version = SPH_OPTION_SET_RASTERIZER_VERSION; + } + + if ( IS_HINTED( loader->load_flags ) ) + { + TWEAK_RULES( TIMES_NEW_ROMAN_HACK ); + TWEAK_RULES( COURIER_NEW_2_HACK ); + } + + if ( sph_test_tweak( face, family, ppem, style, glyph_index, + COMPATIBILITY_MODE_Rules, COMPATIBILITY_MODE_RULES_SIZE ) ) + loader->exec->face->sph_compatibility_mode = TRUE; + + + if ( IS_HINTED( loader->load_flags ) ) + { + if ( sph_test_tweak( face, family, ppem, style, glyph_index, + COMPATIBLE_WIDTHS_Rules, COMPATIBLE_WIDTHS_RULES_SIZE ) ) + loader->exec->compatible_widths |= TRUE; + } + } + +#else /* !TT_CONFIG_OPTION_SUBPIXEL_HINTING */ + + /* ANSI C doesn't like empty source files */ + typedef int _tt_subpix_dummy; + +#endif /* !TT_CONFIG_OPTION_SUBPIXEL_HINTING */ + + +/* END */ diff --git a/src/truetype/ttsubpix.h b/src/truetype/ttsubpix.h new file mode 100644 index 0000000..8a54fc7 --- /dev/null +++ b/src/truetype/ttsubpix.h @@ -0,0 +1,110 @@ +/***************************************************************************/ +/* */ +/* ttsubpix.h */ +/* */ +/* TrueType Subpixel Hinting. */ +/* */ +/* Copyright 2010-2013 by */ +/* David Turner, Robert Wilhelm, and Werner Lemberg. */ +/* */ +/* This file is part of the FreeType project, and may only be used, */ +/* modified, and distributed under the terms of the FreeType project */ +/* license, LICENSE.TXT. By continuing to use, modify, or distribute */ +/* this file you indicate that you have read the license and */ +/* understand and accept it fully. */ +/* */ +/***************************************************************************/ + + +#ifndef __TTSUBPIX_H__ +#define __TTSUBPIX_H__ + +#include +#include "ttobjs.h" +#include "ttinterp.h" + + +FT_BEGIN_HEADER + + +#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING + + /*************************************************************************/ + /* */ + /* ID flags to identify special functions at FDEF and runtime. */ + /* */ + /* */ +#define SPH_FDEF_INLINE_DELTA_1 0x0000001 +#define SPH_FDEF_INLINE_DELTA_2 0x0000002 +#define SPH_FDEF_DIAGONAL_STROKE 0x0000004 +#define SPH_FDEF_VACUFORM_ROUND_1 0x0000008 +#define SPH_FDEF_TTFAUTOHINT_1 0x0000010 +#define SPH_FDEF_SPACING_1 0x0000020 +#define SPH_FDEF_SPACING_2 0x0000040 +#define SPH_FDEF_TYPEMAN_STROKES 0x0000080 +#define SPH_FDEF_TYPEMAN_DIAGENDCTRL 0x0000100 + + + /*************************************************************************/ + /* */ + /* Tweak flags that are set for each glyph by the below rules. */ + /* */ + /* */ +#define SPH_TWEAK_ALLOW_X_DMOVE 0x0000001 +#define SPH_TWEAK_ALWAYS_DO_DELTAP 0x0000002 +#define SPH_TWEAK_ALWAYS_SKIP_DELTAP 0x0000004 +#define SPH_TWEAK_COURIER_NEW_2_HACK 0x0000008 +#define SPH_TWEAK_DEEMBOLDEN 0x0000010 +#define SPH_TWEAK_DO_SHPIX 0x0000020 +#define SPH_TWEAK_EMBOLDEN 0x0000040 +#define SPH_TWEAK_MIAP_HACK 0x0000080 +#define SPH_TWEAK_NORMAL_ROUND 0x0000100 +#define SPH_TWEAK_NO_ALIGNRP_AFTER_IUP 0x0000200 +#define SPH_TWEAK_NO_CALL_AFTER_IUP 0x0000400 +#define SPH_TWEAK_NO_DELTAP_AFTER_IUP 0x0000800 +#define SPH_TWEAK_PIXEL_HINTING 0x0001000 +#define SPH_TWEAK_RASTERIZER_35 0x0002000 +#define SPH_TWEAK_ROUND_NONPIXEL_Y_MOVES 0x0004000 +#define SPH_TWEAK_SKIP_IUP 0x0008000 +#define SPH_TWEAK_SKIP_NONPIXEL_Y_MOVES 0x0010000 +#define SPH_TWEAK_SKIP_OFFPIXEL_Y_MOVES 0x0020000 +#define SPH_TWEAK_TIMES_NEW_ROMAN_HACK 0x0040000 +#define SPH_TWEAK_SKIP_NONPIXEL_Y_MOVES_DELTAP 0x0080000 + + + FT_LOCAL( FT_Bool ) + sph_test_tweak( TT_Face face, + const FT_String* family, + FT_UInt ppem, + const FT_String* style, + FT_UInt glyph_index, + const SPH_TweakRule* rule, + FT_UInt num_rules ); + + FT_LOCAL( FT_UInt ) + sph_test_tweak_x_scaling( TT_Face face, + const FT_String* family, + FT_UInt ppem, + const FT_String* style, + FT_UInt glyph_index ); + + FT_LOCAL( void ) + sph_set_tweaks( TT_Loader loader, + FT_UInt glyph_index ); + + + /* These macros are defined absent a method for setting them */ +#define SPH_OPTION_BITMAP_WIDTHS FALSE +#define SPH_OPTION_SET_SUBPIXEL TRUE +#define SPH_OPTION_SET_GRAYSCALE FALSE +#define SPH_OPTION_SET_COMPATIBLE_WIDTHS FALSE +#define SPH_OPTION_SET_RASTERIZER_VERSION 38 + +#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */ + + +FT_END_HEADER + +#endif /* __TTSUBPIX_H__ */ + +/* END */ diff --git a/src/type1/t1afm.c b/src/type1/t1afm.c index 1fff15d..de9c199 100644 --- a/src/type1/t1afm.c +++ b/src/type1/t1afm.c @@ -4,7 +4,7 @@ /* */ /* AFM support for Type 1 fonts (body). */ /* */ -/* Copyright 1996-2011 by */ +/* Copyright 1996-2011, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -18,9 +18,10 @@ #include #include "t1afm.h" -#include "t1errors.h" +#include FT_INTERNAL_DEBUG_H #include FT_INTERNAL_STREAM_H #include FT_INTERNAL_POSTSCRIPT_AUX_H +#include "t1errors.h" /*************************************************************************/ @@ -107,7 +108,7 @@ FT_Stream stream, AFM_FontInfo fi ) { - FT_Error error = T1_Err_Ok; + FT_Error error = FT_Err_Ok; FT_Memory memory = stream->memory; FT_Byte* start; FT_Byte* limit; @@ -121,14 +122,13 @@ start = (FT_Byte*)stream->cursor; limit = (FT_Byte*)stream->limit; - p = start; /* Figure out how long the width table is. */ /* This info is a little-endian short at offset 99. */ p = start + 99; if ( p + 2 > limit ) { - error = T1_Err_Unknown_File_Format; + error = FT_THROW( Unknown_File_Format ); goto Exit; } width_table_length = FT_PEEK_USHORT_LE( p ); @@ -148,7 +148,7 @@ if ( p + 2 > limit ) { - error = T1_Err_Unknown_File_Format; + error = FT_THROW( Unknown_File_Format ); goto Exit; } @@ -156,7 +156,7 @@ p += 2; if ( p + 4 * fi->NumKernPair > limit ) { - error = T1_Err_Unknown_File_Format; + error = FT_THROW( Unknown_File_Format ); goto Exit; } @@ -238,7 +238,7 @@ FT_Memory memory = stream->memory; AFM_ParserRec parser; AFM_FontInfo fi = NULL; - FT_Error error = T1_Err_Unknown_File_Format; + FT_Error error = FT_ERR( Unknown_File_Format ); T1_Font t1_font = &( (T1_Face)t1_face )->type1; @@ -269,7 +269,7 @@ } } - if ( error == T1_Err_Unknown_File_Format ) + if ( FT_ERR_EQ( error, Unknown_File_Format ) ) { FT_Byte* start = stream->cursor; @@ -366,7 +366,7 @@ if ( !fi ) - return T1_Err_Invalid_Argument; + return FT_THROW( Invalid_Argument ); for ( i = 0; i < fi->NumTrackKern; i++ ) { @@ -389,7 +389,7 @@ } } - return T1_Err_Ok; + return FT_Err_Ok; } diff --git a/src/type1/t1driver.c b/src/type1/t1driver.c index e35d7b1..2602bdb 100644 --- a/src/type1/t1driver.c +++ b/src/type1/t1driver.c @@ -4,7 +4,7 @@ /* */ /* Type 1 driver interface (body). */ /* */ -/* Copyright 1996-2004, 2006, 2007, 2009, 2011 by */ +/* Copyright 1996-2004, 2006, 2007, 2009, 2011, 2013, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -61,7 +61,7 @@ { FT_STRCPYN( buffer, face->type1.glyph_names[glyph_index], buffer_max ); - return T1_Err_Ok; + return FT_Err_Ok; } @@ -69,13 +69,13 @@ t1_get_name_index( T1_Face face, FT_String* glyph_name ) { - FT_Int i; - FT_String* gname; + FT_Int i; for ( i = 0; i < face->type1.num_glyphs; i++ ) { - gname = face->type1.glyph_names[i]; + FT_String* gname = face->type1.glyph_names[i]; + if ( !ft_strcmp( glyph_name, gname ) ) return (FT_UInt)i; @@ -138,7 +138,7 @@ { *afont_info = ((T1_Face)face)->type1.font_info; - return T1_Err_Ok; + return FT_Err_Ok; } @@ -148,7 +148,7 @@ { *afont_extra = ((T1_Face)face)->type1.font_extra; - return T1_Err_Ok; + return FT_Err_Ok; } @@ -167,7 +167,7 @@ { *afont_private = ((T1_Face)face)->type1.private_dict; - return T1_Err_Ok; + return FT_Err_Ok; } @@ -258,7 +258,7 @@ break; case PS_DICT_FONT_NAME: - retval = ft_strlen( type1->font_name ) + 1; + retval = (FT_Long)( ft_strlen( type1->font_name ) + 1 ); if ( value && value_len >= retval ) ft_memcpy( value, (void *)( type1->font_name ), retval ); break; @@ -278,7 +278,7 @@ case PS_DICT_CHAR_STRING_KEY: if ( idx < (FT_UInt)type1->num_glyphs ) { - retval = ft_strlen( type1->glyph_names[idx] ) + 1; + retval = (FT_Long)( ft_strlen( type1->glyph_names[idx] ) + 1 ); if ( value && value_len >= retval ) { ft_memcpy( value, (void *)( type1->glyph_names[idx] ), retval ); @@ -290,7 +290,7 @@ case PS_DICT_CHAR_STRING: if ( idx < (FT_UInt)type1->num_glyphs ) { - retval = type1->charstrings_len[idx] + 1; + retval = (FT_Long)( type1->charstrings_len[idx] + 1 ); if ( value && value_len >= retval ) { ft_memcpy( value, (void *)( type1->charstrings[idx] ), @@ -310,7 +310,7 @@ if ( type1->encoding_type == T1_ENCODING_TYPE_ARRAY && idx < (FT_UInt)type1->encoding.num_chars ) { - retval = ft_strlen( type1->encoding.char_name[idx] ) + 1; + retval = (FT_Long)( ft_strlen( type1->encoding.char_name[idx] ) + 1 ); if ( value && value_len >= retval ) { ft_memcpy( value, (void *)( type1->encoding.char_name[idx] ), @@ -329,7 +329,7 @@ case PS_DICT_SUBR: if ( idx < (FT_UInt)type1->num_subrs ) { - retval = type1->subrs_len[idx] + 1; + retval = (FT_Long)( type1->subrs_len[idx] + 1 ); if ( value && value_len >= retval ) { ft_memcpy( value, (void *)( type1->subrs[idx] ), retval - 1 ); @@ -523,31 +523,31 @@ break; case PS_DICT_VERSION: - retval = ft_strlen( type1->font_info.version ) + 1; + retval = (FT_Long)( ft_strlen( type1->font_info.version ) + 1 ); if ( value && value_len >= retval ) ft_memcpy( value, (void *)( type1->font_info.version ), retval ); break; case PS_DICT_NOTICE: - retval = ft_strlen( type1->font_info.notice ) + 1; + retval = (FT_Long)( ft_strlen( type1->font_info.notice ) + 1 ); if ( value && value_len >= retval ) ft_memcpy( value, (void *)( type1->font_info.notice ), retval ); break; case PS_DICT_FULL_NAME: - retval = ft_strlen( type1->font_info.full_name ) + 1; + retval = (FT_Long)( ft_strlen( type1->font_info.full_name ) + 1 ); if ( value && value_len >= retval ) ft_memcpy( value, (void *)( type1->font_info.full_name ), retval ); break; case PS_DICT_FAMILY_NAME: - retval = ft_strlen( type1->font_info.family_name ) + 1; + retval = (FT_Long)( ft_strlen( type1->font_info.family_name ) + 1 ); if ( value && value_len >= retval ) ft_memcpy( value, (void *)( type1->font_info.family_name ), retval ); break; case PS_DICT_WEIGHT: - retval = ft_strlen( type1->font_info.weight ) + 1; + retval = (FT_Long)( ft_strlen( type1->font_info.weight ) + 1 ); if ( value && value_len >= retval ) ft_memcpy( value, (void *)( type1->font_info.weight ), retval ); break; @@ -557,9 +557,6 @@ if ( value && value_len >= retval ) *((FT_Long *)value) = type1->font_info.italic_angle; break; - - default: - break; } return retval; @@ -669,7 +666,7 @@ right_glyph, kerning ); - return T1_Err_Ok; + return FT_Err_Ok; } @@ -708,10 +705,6 @@ T1_GlyphSlot_Init, T1_GlyphSlot_Done, -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS - ft_stub_set_char_sizes, - ft_stub_set_pixel_sizes, -#endif T1_Load_Glyph, #ifdef T1_CONFIG_OPTION_NO_AFM diff --git a/src/type1/t1gload.c b/src/type1/t1gload.c index 80e5453..af102fd 100644 --- a/src/type1/t1gload.c +++ b/src/type1/t1gload.c @@ -4,7 +4,7 @@ /* */ /* Type 1 Glyph Loader (body). */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010 by */ +/* Copyright 1996-2006, 2008-2010, 2013, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -61,7 +61,7 @@ { T1_Face face = (T1_Face)decoder->builder.face; T1_Font type1 = &face->type1; - FT_Error error = T1_Err_Ok; + FT_Error error = FT_Err_Ok; #ifdef FT_CONFIG_OPTION_INCREMENTAL FT_Incremental_InterfaceRec *inc = @@ -194,7 +194,7 @@ for ( glyph_index = 0; glyph_index < type1->num_glyphs; glyph_index++ ) { /* now get load the unscaled outline */ - error = T1_Parse_Glyph( &decoder, glyph_index ); + (void)T1_Parse_Glyph( &decoder, glyph_index ); if ( glyph_index == 0 || decoder.builder.advance.x > *max_advance ) *max_advance = decoder.builder.advance.x; @@ -203,7 +203,7 @@ psaux->t1_decoder_funcs->done( &decoder ); - return T1_Err_Ok; + return FT_Err_Ok; } @@ -227,7 +227,7 @@ for ( nn = 0; nn < count; nn++ ) advances[nn] = 0; - return T1_Err_Ok; + return FT_Err_Ok; } error = psaux->t1_decoder_funcs->init( &decoder, @@ -261,7 +261,7 @@ advances[nn] = 0; } - return T1_Err_Ok; + return FT_Err_Ok; } @@ -296,10 +296,12 @@ if ( glyph_index >= (FT_UInt)face->root.num_glyphs ) #endif /* FT_CONFIG_OPTION_INCREMENTAL */ { - error = T1_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Exit; } + FT_TRACE1(( "T1_Load_Glyph: glyph index %d\n", glyph_index )); + FT_ASSERT( ( face->len_buildchar == 0 ) == ( face->buildchar == NULL ) ); if ( load_flags & FT_LOAD_NO_RECURSE ) diff --git a/src/type1/t1load.c b/src/type1/t1load.c index a0adfd4..22b3f6b 100644 --- a/src/type1/t1load.c +++ b/src/type1/t1load.c @@ -4,7 +4,7 @@ /* */ /* Type 1 font loader (body). */ /* */ -/* Copyright 1996-2012 by */ +/* Copyright 1996-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -71,6 +71,13 @@ #include "t1errors.h" +#ifdef FT_CONFIG_OPTION_INCREMENTAL +#define IS_INCREMENTAL (FT_Bool)( face->root.internal->incremental_interface != 0 ) +#else +#define IS_INCREMENTAL 0 +#endif + + /*************************************************************************/ /* */ /* The macro FT_COMPONENT is used in trace mode. It is an implicit */ @@ -99,7 +106,7 @@ { PS_Blend blend; FT_Memory memory = face->root.memory; - FT_Error error = T1_Err_Ok; + FT_Error error = FT_Err_Ok; blend = face->blend; @@ -123,8 +130,8 @@ /* allocate the blend `private' and `font_info' dictionaries */ if ( FT_NEW_ARRAY( blend->font_infos[1], num_designs ) || - FT_NEW_ARRAY( blend->privates[1], num_designs ) || - FT_NEW_ARRAY( blend->bboxes[1], num_designs ) || + FT_NEW_ARRAY( blend->privates [1], num_designs ) || + FT_NEW_ARRAY( blend->bboxes [1], num_designs ) || FT_NEW_ARRAY( blend->weight_vector, num_designs * 2 ) ) goto Exit; @@ -136,12 +143,12 @@ for ( nn = 2; nn <= num_designs; nn++ ) { - blend->privates[nn] = blend->privates [nn - 1] + 1; blend->font_infos[nn] = blend->font_infos[nn - 1] + 1; - blend->bboxes[nn] = blend->bboxes [nn - 1] + 1; + blend->privates [nn] = blend->privates [nn - 1] + 1; + blend->bboxes [nn] = blend->bboxes [nn - 1] + 1; } - blend->num_designs = num_designs; + blend->num_designs = num_designs; } else if ( blend->num_designs != num_designs ) goto Fail; @@ -175,7 +182,7 @@ return error; Fail: - error = T1_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } @@ -189,7 +196,7 @@ FT_Error error; - error = T1_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); if ( blend ) { @@ -207,7 +214,7 @@ axis->maximum = map->design_points[map->num_points - 1]; } - error = T1_Err_Ok; + error = FT_Err_Ok; } return error; @@ -232,18 +239,11 @@ for ( j = 1; j < axismap->num_points; ++j ) { if ( ncv <= axismap->blend_points[j] ) - { - FT_Fixed t = FT_MulDiv( ncv - axismap->blend_points[j - 1], - 0x10000L, - axismap->blend_points[j] - - axismap->blend_points[j - 1] ); - return INT_TO_FIXED( axismap->design_points[j - 1] ) + - FT_MulDiv( t, - axismap->design_points[j] - - axismap->design_points[j - 1], - 1L ); - } + ( axismap->design_points[j] - axismap->design_points[j - 1] ) * + FT_DivFix( ncv - axismap->blend_points[j - 1], + axismap->blend_points[j] - + axismap->blend_points[j - 1] ); } return INT_TO_FIXED( axismap->design_points[axismap->num_points - 1] ); @@ -320,7 +320,7 @@ mmvar->num_axis = mmaster.num_axis; mmvar->num_designs = mmaster.num_designs; - mmvar->num_namedstyles = (FT_UInt)-1; /* Does not apply */ + mmvar->num_namedstyles = ~0U; /* Does not apply */ mmvar->axis = (FT_Var_Axis*)&mmvar[1]; /* Point to axes after MM_Var struct */ mmvar->namedstyle = NULL; @@ -333,8 +333,8 @@ mmvar->axis[i].def = ( mmvar->axis[i].minimum + mmvar->axis[i].maximum ) / 2; /* Does not apply. But this value is in range */ - mmvar->axis[i].strid = (FT_UInt)-1; /* Does not apply */ - mmvar->axis[i].tag = (FT_ULong)-1; /* Does not apply */ + mmvar->axis[i].strid = ~0U; /* Does not apply */ + mmvar->axis[i].tag = ~0U; /* Does not apply */ if ( ft_strcmp( mmvar->axis[i].name, "Weight" ) == 0 ) mmvar->axis[i].tag = FT_MAKE_TAG( 'w', 'g', 'h', 't' ); @@ -372,13 +372,11 @@ FT_UInt n, m; - error = T1_Err_Invalid_Argument; + error = FT_ERR( Invalid_Argument ); if ( blend && blend->num_axis == num_coords ) { /* recompute the weight vector from the blend coordinates */ - error = T1_Err_Ok; - for ( n = 0; n < blend->num_designs; n++ ) { FT_Fixed result = 0x10000L; /* 1.0 fixed */ @@ -391,8 +389,10 @@ /* get current blend axis position */ factor = coords[m]; - if ( factor < 0 ) factor = 0; - if ( factor > 0x10000L ) factor = 0x10000L; + if ( factor < 0 ) + factor = 0; + if ( factor > 0x10000L ) + factor = 0x10000L; if ( ( n & ( 1 << m ) ) == 0 ) factor = 0x10000L - factor; @@ -402,7 +402,7 @@ blend->weight_vector[n] = result; } - error = T1_Err_Ok; + error = FT_Err_Ok; } return error; @@ -419,7 +419,7 @@ FT_UInt n, p; - error = T1_Err_Invalid_Argument; + error = FT_ERR( Invalid_Argument ); if ( blend && blend->num_axis == num_coords ) { /* compute the blend coordinates through the blend design map */ @@ -495,7 +495,7 @@ FT_Error error; - error = T1_Err_Invalid_Argument; + error = FT_ERR( Invalid_Argument ); if ( num_coords <= 4 && num_coords > 0 ) { for ( i = 0; i < num_coords; ++i ) @@ -524,7 +524,7 @@ /* release design pos table */ FT_FREE( blend->design_pos[0] ); for ( n = 1; n < num_designs; n++ ) - blend->design_pos[n] = 0; + blend->design_pos[n] = NULL; /* release blend `private' and `font info' dictionaries */ FT_FREE( blend->privates[1] ); @@ -533,14 +533,14 @@ for ( n = 0; n < num_designs; n++ ) { - blend->privates [n] = 0; - blend->font_infos[n] = 0; - blend->bboxes [n] = 0; + blend->privates [n] = NULL; + blend->font_infos[n] = NULL; + blend->bboxes [n] = NULL; } /* release weight vectors */ FT_FREE( blend->weight_vector ); - blend->default_weight_vector = 0; + blend->default_weight_vector = NULL; /* release axis names */ for ( n = 0; n < num_axis; n++ ) @@ -567,7 +567,7 @@ { T1_TokenRec axis_tokens[T1_MAX_MM_AXIS]; FT_Int n, num_axis; - FT_Error error = T1_Err_Ok; + FT_Error error = FT_Err_Ok; PS_Blend blend; FT_Memory memory; @@ -577,14 +577,14 @@ T1_MAX_MM_AXIS, &num_axis ); if ( num_axis < 0 ) { - error = T1_Err_Ignore; + error = FT_ERR( Ignore ); goto Exit; } if ( num_axis == 0 || num_axis > T1_MAX_MM_AXIS ) { FT_ERROR(( "parse_blend_axis_types: incorrect number of axes: %d\n", num_axis )); - error = T1_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } @@ -611,16 +611,16 @@ len = token->limit - token->start; if ( len == 0 ) { - error = T1_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } - if ( FT_ALLOC( blend->axis_names[n], len + 1 ) ) + if ( FT_ALLOC( blend->axis_names[n], (FT_Long)( len + 1 ) ) ) goto Exit; name = (FT_Byte*)blend->axis_names[n]; FT_MEM_COPY( name, token->start, len ); - name[len] = 0; + name[len] = '\0'; } Exit: @@ -637,7 +637,7 @@ FT_Int num_axis; T1_Parser parser = &loader->parser; - FT_Error error = T1_Err_Ok; + FT_Error error = FT_Err_Ok; PS_Blend blend; @@ -646,7 +646,7 @@ T1_MAX_MM_DESIGNS, &num_designs ); if ( num_designs < 0 ) { - error = T1_Err_Ignore; + error = FT_ERR( Ignore ); goto Exit; } if ( num_designs == 0 || num_designs > T1_MAX_MM_DESIGNS ) @@ -654,7 +654,7 @@ FT_ERROR(( "parse_blend_design_positions:" " incorrect number of designs: %d\n", num_designs )); - error = T1_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } @@ -687,7 +687,7 @@ FT_ERROR(( "parse_blend_design_positions:" " invalid number of axes: %d\n", n_axis )); - error = T1_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } @@ -700,7 +700,7 @@ else if ( n_axis != num_axis ) { FT_ERROR(( "parse_blend_design_positions: incorrect table\n" )); - error = T1_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } @@ -729,7 +729,7 @@ parse_blend_design_map( T1_Face face, T1_Loader loader ) { - FT_Error error = T1_Err_Ok; + FT_Error error = FT_Err_Ok; T1_Parser parser = &loader->parser; PS_Blend blend; T1_TokenRec axis_tokens[T1_MAX_MM_AXIS]; @@ -743,14 +743,14 @@ T1_MAX_MM_AXIS, &num_axis ); if ( num_axis < 0 ) { - error = T1_Err_Ignore; + error = FT_ERR( Ignore ); goto Exit; } if ( num_axis == 0 || num_axis > T1_MAX_MM_AXIS ) { FT_ERROR(( "parse_blend_design_map: incorrect number of axes: %d\n", num_axis )); - error = T1_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } @@ -781,7 +781,7 @@ if ( num_points <= 0 || num_points > T1_MAX_MM_MAP_POINTS ) { FT_ERROR(( "parse_blend_design_map: incorrect table\n" )); - error = T1_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } @@ -821,7 +821,7 @@ { T1_TokenRec design_tokens[T1_MAX_MM_DESIGNS]; FT_Int num_designs; - FT_Error error = T1_Err_Ok; + FT_Error error = FT_Err_Ok; T1_Parser parser = &loader->parser; PS_Blend blend = face->blend; T1_Token token; @@ -834,7 +834,7 @@ T1_MAX_MM_DESIGNS, &num_designs ); if ( num_designs < 0 ) { - error = T1_Err_Ignore; + error = FT_ERR( Ignore ); goto Exit; } if ( num_designs == 0 || num_designs > T1_MAX_MM_DESIGNS ) @@ -842,7 +842,7 @@ FT_ERROR(( "parse_weight_vector:" " incorrect number of designs: %d\n", num_designs )); - error = T1_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } @@ -859,7 +859,7 @@ " /BlendDesignPosition and /WeightVector have\n" " " " different number of elements\n" )); - error = T1_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } @@ -1004,13 +1004,24 @@ max_objects = 0; } - if ( field->type == T1_FIELD_TYPE_INTEGER_ARRAY || - field->type == T1_FIELD_TYPE_FIXED_ARRAY ) - error = T1_Load_Field_Table( &loader->parser, field, - objects, max_objects, 0 ); + if ( *objects ) + { + if ( field->type == T1_FIELD_TYPE_INTEGER_ARRAY || + field->type == T1_FIELD_TYPE_FIXED_ARRAY ) + error = T1_Load_Field_Table( &loader->parser, field, + objects, max_objects, 0 ); + else + error = T1_Load_Field( &loader->parser, field, + objects, max_objects, 0 ); + } else - error = T1_Load_Field( &loader->parser, field, - objects, max_objects, 0 ); + { + FT_TRACE1(( "t1_load_keyword: ignoring keyword `%s'" + " which is not valid at this point\n" + " (probably due to missing keywords)\n", + field->ident )); + error = FT_Err_Ok; + } Exit: return error; @@ -1030,7 +1041,8 @@ static int read_binary_data( T1_Parser parser, FT_Long* size, - FT_Byte** base ) + FT_Byte** base, + FT_Bool incremental ) { FT_Byte* cur; FT_Byte* limit = parser->root.limit; @@ -1065,8 +1077,12 @@ } } - FT_ERROR(( "read_binary_data: invalid size field\n" )); - parser->root.error = T1_Err_Invalid_File_Format; + if( !incremental ) + { + FT_ERROR(( "read_binary_data: invalid size field\n" )); + parser->root.error = FT_THROW( Invalid_File_Format ); + } + return 0; } @@ -1089,9 +1105,9 @@ result = T1_ToFixedArray( parser, 6, temp, 3 ); - if ( result < 0 ) + if ( result < 6 ) { - parser->root.error = T1_Err_Invalid_File_Format; + parser->root.error = FT_THROW( Invalid_File_Format ); return; } @@ -1100,7 +1116,7 @@ if ( temp_scale == 0 ) { FT_ERROR(( "t1_parse_font_matrix: invalid font matrix\n" )); - parser->root.error = T1_Err_Invalid_File_Format; + parser->root.error = FT_THROW( Invalid_File_Format ); return; } @@ -1108,8 +1124,7 @@ /* 1000 / temp_scale, because temp_scale was already multiplied by */ /* 1000 (in t1_tofixed, from psobjs.c). */ - root->units_per_EM = (FT_UShort)( FT_DivFix( 1000 * 0x10000L, - temp_scale ) >> 16 ); + root->units_per_EM = (FT_UShort)FT_DivFix( 1000, temp_scale ); /* we need to scale the values by 1.0/temp_scale */ if ( temp_scale != 0x10000L ) @@ -1149,7 +1164,7 @@ if ( cur >= limit ) { FT_ERROR(( "parse_encoding: out of bounds\n" )); - parser->root.error = T1_Err_Invalid_File_Format; + parser->root.error = FT_THROW( Invalid_File_Format ); return; } @@ -1196,7 +1211,7 @@ char* notdef = (char *)".notdef"; - T1_Add_Table( char_table, n, notdef, 8 ); + (void)T1_Add_Table( char_table, n, notdef, 8 ); } /* Now we need to read records of the form */ @@ -1257,11 +1272,18 @@ { charcode = (FT_Int)T1_ToInt( parser ); T1_Skip_Spaces( parser ); + + /* protect against invalid charcode */ + if ( cur == parser->root.cursor ) + { + parser->root.error = FT_THROW( Unknown_File_Format ); + return; + } } cur = parser->root.cursor; - if ( *cur == '/' && cur + 2 < limit && n < count ) + if ( cur + 2 < limit && *cur == '/' && n < count ) { FT_PtrDist len; @@ -1270,6 +1292,8 @@ parser->root.cursor = cur; T1_Skip_PS_Token( parser ); + if ( parser->root.cursor >= limit ) + return; if ( parser->root.error ) return; @@ -1293,7 +1317,7 @@ /* specification (it might be an encoding for a CID type1 */ /* font, however), so we conclude that this font is NOT a */ /* type1 font. */ - parser->root.error = FT_Err_Unknown_File_Format; + parser->root.error = FT_THROW( Unknown_File_Format ); return; } } @@ -1328,7 +1352,7 @@ face->type1.encoding_type = T1_ENCODING_TYPE_ISOLATIN1; else - parser->root.error = T1_Err_Ignore; + parser->root.error = FT_ERR( Ignore ); } } @@ -1356,7 +1380,7 @@ T1_Skip_Spaces ( parser ); if ( parser->root.cursor >= parser->root.limit || *parser->root.cursor != ']' ) - parser->root.error = T1_Err_Invalid_File_Format; + parser->root.error = FT_THROW( Invalid_File_Format ); return; } @@ -1387,16 +1411,17 @@ FT_Byte* base; - /* If the next token isn't `dup' we are done. */ - if ( parser->root.cursor + 4 < parser->root.limit && - ft_strncmp( (char*)parser->root.cursor, "dup", 3 ) != 0 ) + /* If we are out of data, or if the next token isn't `dup', */ + /* we are done. */ + if ( parser->root.cursor + 4 >= parser->root.limit || + ft_strncmp( (char*)parser->root.cursor, "dup", 3 ) != 0 ) break; T1_Skip_PS_Token( parser ); /* `dup' */ idx = T1_ToInt( parser ); - if ( !read_binary_data( parser, &size, &base ) ) + if ( !read_binary_data( parser, &size, &base, IS_INCREMENTAL ) ) return; /* The binary string is followed by one token, e.g. `NP' */ @@ -1434,7 +1459,7 @@ /* least contain a `return'), but we support them anyway */ if ( size < face->type1.private_dict.lenIV ) { - error = T1_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Fail; } @@ -1488,6 +1513,12 @@ num_glyphs = (FT_Int)T1_ToInt( parser ); + if ( num_glyphs < 0 ) + { + error = FT_THROW( Invalid_File_Format ); + goto Fail; + } + /* some fonts like Optima-Oblique not only define the /CharStrings */ /* array but access it also */ if ( num_glyphs == 0 || parser->root.error ) @@ -1565,6 +1596,11 @@ } T1_Skip_PS_Token( parser ); + if ( parser->root.cursor >= limit ) + { + error = FT_THROW( Invalid_File_Format ); + goto Fail; + } if ( parser->root.error ) return; @@ -1573,16 +1609,16 @@ FT_PtrDist len; - if ( cur + 1 >= limit ) + if ( cur + 2 >= limit ) { - error = T1_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Fail; } cur++; /* skip `/' */ len = parser->root.cursor - cur; - if ( !read_binary_data( parser, &size, &base ) ) + if ( !read_binary_data( parser, &size, &base, IS_INCREMENTAL ) ) return; /* for some non-standard fonts like `Optima' which provides */ @@ -1615,7 +1651,7 @@ if ( size <= face->type1.private_dict.lenIV ) { - error = T1_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Fail; } @@ -1819,7 +1855,7 @@ parser->root.cursor = base; parser->root.limit = base + size; - parser->root.error = T1_Err_Ok; + parser->root.error = FT_Err_Ok; limit = parser->root.limit; @@ -1871,8 +1907,8 @@ parser->root.cursor = start_binary; - if ( !read_binary_data( parser, &s, &b ) ) - return T1_Err_Invalid_File_Format; + if ( !read_binary_data( parser, &s, &b, IS_INCREMENTAL ) ) + return FT_THROW( Invalid_File_Format ); have_integer = 0; } @@ -1884,8 +1920,8 @@ parser->root.cursor = start_binary; - if ( !read_binary_data( parser, &s, &b ) ) - return T1_Err_Invalid_File_Format; + if ( !read_binary_data( parser, &s, &b, IS_INCREMENTAL ) ) + return FT_THROW( Invalid_File_Format ); have_integer = 0; } @@ -1957,8 +1993,8 @@ if ( !( dict & keyword->dict ) ) { - FT_TRACE1(( "parse_dict: found %s but ignoring it " - "since it is in the wrong dictionary\n", + FT_TRACE1(( "parse_dict: found `%s' but ignoring it" + " since it is in the wrong dictionary\n", keyword->ident )); break; } @@ -1970,10 +2006,10 @@ parser->root.error = t1_load_keyword( face, loader, keyword ); - if ( parser->root.error != T1_Err_Ok ) + if ( parser->root.error != FT_Err_Ok ) { - if ( FT_ERROR_BASE( parser->root.error ) == FT_Err_Ignore ) - parser->root.error = T1_Err_Ok; + if ( FT_ERR_EQ( parser->root.error, Ignore ) ) + parser->root.error = FT_Err_Ok; else return parser->root.error; } @@ -2160,13 +2196,11 @@ type1->subrs_len = loader.subrs.lengths; } -#ifdef FT_CONFIG_OPTION_INCREMENTAL - if ( !face->root.internal->incremental_interface ) -#endif + if ( !IS_INCREMENTAL ) if ( !loader.charstrings.init ) { FT_ERROR(( "T1_Open_Face: no `/CharStrings' array in face\n" )); - error = T1_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); } loader.charstrings.init = 0; @@ -2185,7 +2219,6 @@ if ( type1->encoding_type == T1_ENCODING_TYPE_ARRAY ) { FT_Int charcode, idx, min_char, max_char; - FT_Byte* char_name; FT_Byte* glyph_name; @@ -2200,6 +2233,9 @@ charcode = 0; for ( ; charcode < loader.encoding_table.max_elems; charcode++ ) { + FT_Byte* char_name; + + type1->encoding.char_index[charcode] = 0; type1->encoding.char_name [charcode] = (char *)".notdef"; diff --git a/src/type1/t1objs.c b/src/type1/t1objs.c index b685f2f..e11770f 100644 --- a/src/type1/t1objs.c +++ b/src/type1/t1objs.c @@ -4,7 +4,7 @@ /* */ /* Type 1 objects manager (body). */ /* */ -/* Copyright 1996-2009, 2011 by */ +/* Copyright 1996-2009, 2011, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -95,7 +95,7 @@ T1_Size_Init( FT_Size t1size ) /* T1_Size */ { T1_Size size = (T1_Size)t1size; - FT_Error error = T1_Err_Ok; + FT_Error error = FT_Err_Ok; PSH_Globals_Funcs funcs = T1_Size_Get_Globals_Funcs( size ); @@ -131,7 +131,7 @@ size->root.metrics.y_scale, 0, 0 ); - return T1_Err_Ok; + return FT_Err_Ok; } @@ -326,7 +326,7 @@ if ( !psaux ) { FT_ERROR(( "T1_Face_Init: cannot access `psaux' module\n" )); - error = T1_Err_Missing_Module; + error = FT_THROW( Missing_Module ); goto Exit; } @@ -348,7 +348,7 @@ if ( face_index > 0 ) { FT_ERROR(( "T1_Face_Init: invalid face index\n" )); - error = T1_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Exit; } @@ -364,10 +364,10 @@ root->num_glyphs = type1->num_glyphs; root->face_index = 0; - root->face_flags = FT_FACE_FLAG_SCALABLE | - FT_FACE_FLAG_HORIZONTAL | - FT_FACE_FLAG_GLYPH_NAMES | - FT_FACE_FLAG_HINTER; + root->face_flags |= FT_FACE_FLAG_SCALABLE | + FT_FACE_FLAG_HORIZONTAL | + FT_FACE_FLAG_GLYPH_NAMES | + FT_FACE_FLAG_HINTER; if ( info->is_fixed_pitch ) root->face_flags |= FT_FACE_FLAG_FIXED_WIDTH; @@ -489,7 +489,7 @@ if ( !error ) root->max_advance_width = (FT_Short)FIXED_TO_INT( max_advance ); else - error = T1_Err_Ok; /* clear error */ + error = FT_Err_Ok; /* clear error */ } root->max_advance_height = root->height; @@ -517,7 +517,8 @@ charmap.encoding = FT_ENCODING_UNICODE; error = FT_CMap_New( cmap_classes->unicode, NULL, &charmap, NULL ); - if ( error && FT_Err_No_Unicode_Glyph_Name != error ) + if ( error && + FT_ERR_NEQ( error, No_Unicode_Glyph_Name ) ) goto Exit; error = FT_Err_Ok; @@ -590,7 +591,7 @@ { FT_UNUSED( driver ); - return T1_Err_Ok; + return FT_Err_Ok; } diff --git a/src/type1/t1parse.c b/src/type1/t1parse.c index 4955279..ccf9f4c 100644 --- a/src/type1/t1parse.c +++ b/src/type1/t1parse.c @@ -4,7 +4,7 @@ /* */ /* Type 1 parser (body). */ /* */ -/* Copyright 1996-2005, 2008, 2009, 2012 by */ +/* Copyright 1996-2005, 2008, 2009, 2012-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -119,10 +119,10 @@ if ( !FT_FRAME_ENTER( header_length ) ) { - error = T1_Err_Ok; + error = FT_Err_Ok; if ( ft_memcmp( stream->cursor, header_string, header_length ) != 0 ) - error = T1_Err_Unknown_File_Format; + error = FT_THROW( Unknown_File_Format ); FT_FRAME_EXIT(); } @@ -158,7 +158,7 @@ error = check_type1_format( stream, "%!PS-AdobeFont", 14 ); if ( error ) { - if ( error != T1_Err_Unknown_File_Format ) + if ( FT_ERR_NEQ( error, Unknown_File_Format ) ) goto Exit; error = check_type1_format( stream, "%!FontType", 10 ); @@ -263,7 +263,7 @@ { FT_Stream stream = parser->stream; FT_Memory memory = parser->root.memory; - FT_Error error = T1_Err_Ok; + FT_Error error = FT_Err_Ok; FT_ULong size; @@ -299,7 +299,7 @@ { FT_ERROR(( "T1_Get_Private_Dict:" " invalid private dictionary section\n" )); - error = T1_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Fail; } @@ -313,7 +313,7 @@ error = read_pfb_tag( stream, &tag, &size ); if ( error || tag != 0x8002U ) { - error = T1_Err_Ok; + error = FT_Err_Ok; break; } @@ -332,9 +332,11 @@ /* dictionary block in the heap. */ /* first of all, look at the `eexec' keyword */ - FT_Byte* cur = parser->base_dict; - FT_Byte* limit = cur + parser->base_len; - FT_Byte c; + FT_Byte* cur = parser->base_dict; + FT_Byte* limit = cur + parser->base_len; + FT_Byte c; + FT_Pointer pos_lf; + FT_Bool test_cr; Again: @@ -342,7 +344,7 @@ { c = cur[0]; if ( c == 'e' && cur + 9 < limit ) /* 9 = 5 letters for `eexec' + */ - /* newline + 4 chars */ + /* whitespace + 4 chars */ { if ( cur[1] == 'e' && cur[2] == 'x' && @@ -355,7 +357,7 @@ { FT_ERROR(( "T1_Get_Private_Dict:" " could not find `eexec' keyword\n" )); - error = T1_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } } @@ -364,7 +366,8 @@ /* or string (as e.g. in u003043t.gsf from ghostscript) */ parser->root.cursor = parser->base_dict; - parser->root.limit = cur + 9; + /* set limit to `eexec' + whitespace + 4 characters */ + parser->root.limit = cur + 10; cur = parser->root.cursor; limit = parser->root.limit; @@ -396,27 +399,37 @@ parser->root.limit = parser->base_dict + parser->base_len; T1_Skip_PS_Token( parser ); - cur = parser->root.cursor; + cur = parser->root.cursor; + limit = parser->root.limit; - /* according to the Type1 spec, the first cipher byte must not be */ + /* According to the Type 1 spec, the first cipher byte must not be */ /* an ASCII whitespace character code (blank, tab, carriage return */ /* or line feed). We have seen Type 1 fonts with two line feed */ /* characters... So skip now all whitespace character codes. */ - while ( cur < limit && - ( *cur == ' ' || - *cur == '\t' || - *cur == '\r' || - *cur == '\n' ) ) + /* */ + /* On the other hand, Adobe's Type 1 parser handles fonts just */ + /* fine that are violating this limitation, so we add a heuristic */ + /* test to stop at \r only if it is not used for EOL. */ + + pos_lf = ft_memchr( cur, '\n', limit - cur ); + test_cr = FT_BOOL( !pos_lf || + pos_lf > ft_memchr( cur, '\r', limit - cur ) ); + + while ( cur < limit && + ( *cur == ' ' || + *cur == '\t' || + (test_cr && *cur == '\r' ) || + *cur == '\n' ) ) ++cur; if ( cur >= limit ) { FT_ERROR(( "T1_Get_Private_Dict:" " `eexec' not properly terminated\n" )); - error = T1_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } - size = parser->base_len - ( cur - parser->base_dict ); + size = (FT_ULong)( parser->base_len - ( cur - parser->base_dict ) ); if ( parser->in_memory ) { @@ -437,11 +450,12 @@ /* now determine whether the private dictionary is encoded in binary */ /* or hexadecimal ASCII format -- decode it accordingly */ - /* we need to access the next 4 bytes (after the final \r following */ - /* the `eexec' keyword); if they all are hexadecimal digits, then */ - /* we have a case of ASCII storage */ + /* we need to access the next 4 bytes (after the final whitespace */ + /* following the `eexec' keyword); if they all are hexadecimal */ + /* digits, then we have a case of ASCII storage */ - if ( ft_isxdigit( cur[0] ) && ft_isxdigit( cur[1] ) && + if ( cur + 3 < limit && + ft_isxdigit( cur[0] ) && ft_isxdigit( cur[1] ) && ft_isxdigit( cur[2] ) && ft_isxdigit( cur[3] ) ) { /* ASCII hexadecimal encoding */ @@ -471,7 +485,7 @@ { FT_ERROR(( "T1_Get_Private_Dict:" " invalid private dictionary section\n" )); - error = T1_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Fail; } diff --git a/src/type42/t42drivr.c b/src/type42/t42drivr.c index 9b93209..3ad1bde 100644 --- a/src/type42/t42drivr.c +++ b/src/type42/t42drivr.c @@ -4,7 +4,8 @@ /* */ /* High-level Type 42 driver interface (body). */ /* */ -/* Copyright 2002-2004, 2006, 2007, 2009, 2011 by Roberto Alameda. */ +/* Copyright 2002-2004, 2006, 2007, 2009, 2011, 2013 by */ +/* Roberto Alameda. */ /* */ /* This file is part of the FreeType project, and may only be used, */ /* modified, and distributed under the terms of the FreeType project */ @@ -63,7 +64,7 @@ { FT_STRCPYN( buffer, face->type1.glyph_names[glyph_index], buffer_max ); - return T42_Err_Ok; + return FT_Err_Ok; } @@ -71,13 +72,13 @@ t42_get_name_index( T42_Face face, FT_String* glyph_name ) { - FT_Int i; - FT_String* gname; + FT_Int i; for ( i = 0; i < face->type1.num_glyphs; i++ ) { - gname = face->type1.glyph_names[i]; + FT_String* gname = face->type1.glyph_names[i]; + if ( glyph_name[0] == gname[0] && !ft_strcmp( glyph_name, gname ) ) return (FT_UInt)ft_atol( (const char *)face->type1.charstrings[i] ); @@ -125,7 +126,7 @@ { *afont_info = ((T42_Face)face)->type1.font_info; - return T42_Err_Ok; + return FT_Err_Ok; } @@ -135,7 +136,7 @@ { *afont_extra = ((T42_Face)face)->type1.font_extra; - return T42_Err_Ok; + return FT_Err_Ok; } @@ -154,7 +155,7 @@ { *afont_private = ((T42_Face)face)->type1.private_dict; - return T42_Err_Ok; + return FT_Err_Ok; } @@ -229,10 +230,6 @@ T42_GlyphSlot_Init, T42_GlyphSlot_Done, -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS - ft_stub_set_char_sizes, - ft_stub_set_pixel_sizes, -#endif T42_GlyphSlot_Load, 0, /* FT_Face_GetKerningFunc */ diff --git a/src/type42/t42objs.c b/src/type42/t42objs.c index c6053af..915e81f 100644 --- a/src/type42/t42objs.c +++ b/src/type42/t42objs.c @@ -4,7 +4,7 @@ /* */ /* Type 42 objects manager (body). */ /* */ -/* Copyright 2002-2009, 2011 */ +/* Copyright 2002-2009, 2011, 2013 */ /* by Roberto Alameda. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -47,6 +47,12 @@ if ( FT_ALLOC( face->ttf_data, 12 ) ) goto Exit; + /* while parsing the font we always update `face->ttf_size' so that */ + /* even in case of buggy data (which might lead to premature end of */ + /* scanning without causing an error) the call to `FT_Open_Face' in */ + /* `T42_Face_Init' passes the correct size */ + face->ttf_size = 12; + error = t42_parser_init( parser, face->root.stream, memory, @@ -63,7 +69,7 @@ { FT_ERROR(( "T42_Open_Face: cannot handle FontType %d\n", type1->font_type )); - error = T42_Err_Unknown_File_Format; + error = FT_THROW( Unknown_File_Format ); goto Exit; } @@ -74,7 +80,7 @@ if ( !loader.charstrings.init ) { FT_ERROR(( "T42_Open_Face: no charstrings array in face\n" )); - error = T42_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); } loader.charstrings.init = 0; @@ -93,7 +99,6 @@ if ( type1->encoding_type == T1_ENCODING_TYPE_ARRAY ) { FT_Int charcode, idx, min_char, max_char; - FT_Byte* char_name; FT_Byte* glyph_name; @@ -109,6 +114,9 @@ charcode = 0; for ( ; charcode < loader.encoding_table.max_elems; charcode++ ) { + FT_Byte* char_name; + + type1->encoding.char_index[charcode] = 0; type1->encoding.char_name [charcode] = (char *)".notdef"; @@ -169,7 +177,6 @@ FT_UNUSED( num_params ); FT_UNUSED( params ); - FT_UNUSED( face_index ); FT_UNUSED( stream ); @@ -185,7 +192,7 @@ if ( !psaux ) { FT_ERROR(( "T42_Face_Init: cannot access `psaux' module\n" )); - error = T42_Err_Missing_Module; + error = FT_THROW( Missing_Module ); goto Exit; } @@ -204,7 +211,7 @@ if ( face_index > 0 ) { FT_ERROR(( "T42_Face_Init: invalid face index\n" )); - error = T42_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Exit; } @@ -217,9 +224,9 @@ root->num_charmaps = 0; root->face_index = 0; - root->face_flags = FT_FACE_FLAG_SCALABLE | - FT_FACE_FLAG_HORIZONTAL | - FT_FACE_FLAG_GLYPH_NAMES; + root->face_flags |= FT_FACE_FLAG_SCALABLE | + FT_FACE_FLAG_HORIZONTAL | + FT_FACE_FLAG_GLYPH_NAMES; if ( info->is_fixed_pitch ) root->face_flags |= FT_FACE_FLAG_FIXED_WIDTH; @@ -285,7 +292,9 @@ FT_Open_Args args; - args.flags = FT_OPEN_MEMORY; + args.flags = FT_OPEN_MEMORY | FT_OPEN_DRIVER; + args.driver = FT_Get_Module( FT_FACE_LIBRARY( face ), + "truetype" ); args.memory_base = face->ttf_data; args.memory_size = face->ttf_size; @@ -347,7 +356,8 @@ charmap.encoding = FT_ENCODING_UNICODE; error = FT_CMap_New( cmap_classes->unicode, NULL, &charmap, NULL ); - if ( error && FT_Err_No_Unicode_Glyph_Name != error ) + if ( error && + FT_ERR_NEQ( error, No_Unicode_Glyph_Name ) ) goto Exit; error = FT_Err_Ok; @@ -481,12 +491,12 @@ if ( !ttmodule ) { FT_ERROR(( "T42_Driver_Init: cannot access `truetype' module\n" )); - return T42_Err_Missing_Module; + return FT_THROW( Missing_Module ); } driver->ttclazz = (FT_Driver_Class)ttmodule->clazz; - return T42_Err_Ok; + return FT_Err_Ok; } @@ -504,7 +514,7 @@ FT_Face face = size->face; T42_Face t42face = (T42_Face)face; FT_Size ttsize; - FT_Error error = T42_Err_Ok; + FT_Error error; error = FT_New_Size( t42face->ttf_face, &ttsize ); @@ -580,7 +590,7 @@ FT_Face face = t42slot->face; T42_Face t42face = (T42_Face)face; FT_GlyphSlot ttslot; - FT_Error error = T42_Err_Ok; + FT_Error error = FT_Err_Ok; if ( face->glyph == NULL ) @@ -645,6 +655,8 @@ FT_Driver_Class ttclazz = ((T42_Driver)glyph->face->driver)->ttclazz; + FT_TRACE1(( "T42_GlyphSlot_Load: glyph index %d\n", glyph_index )); + t42_glyphslot_clear( t42slot->ttslot ); error = ttclazz->load_glyph( t42slot->ttslot, t42size->ttsize, diff --git a/src/type42/t42parse.c b/src/type42/t42parse.c index 468b463..5070853 100644 --- a/src/type42/t42parse.c +++ b/src/type42/t42parse.c @@ -4,7 +4,7 @@ /* */ /* Type 42 font parser (body). */ /* */ -/* Copyright 2002-2012 by */ +/* Copyright 2002-2014 by */ /* Roberto Alameda. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -144,7 +144,7 @@ FT_Memory memory, PSAux_Service psaux ) { - FT_Error error = T42_Err_Ok; + FT_Error error = FT_Err_Ok; FT_Long size; @@ -176,7 +176,7 @@ if ( ft_memcmp( stream->cursor, "%!PS-TrueTypeFont", 17 ) != 0 ) { FT_TRACE2(( " not a Type42 font\n" )); - error = T42_Err_Unknown_File_Format; + error = FT_THROW( Unknown_File_Format ); } FT_FRAME_EXIT(); @@ -255,18 +255,31 @@ FT_Face root = (FT_Face)&face->root; FT_Fixed temp[6]; FT_Fixed temp_scale; + FT_Int result; - (void)T1_ToFixedArray( parser, 6, temp, 3 ); + result = T1_ToFixedArray( parser, 6, temp, 3 ); + + if ( result < 6 ) + { + parser->root.error = FT_THROW( Invalid_File_Format ); + return; + } temp_scale = FT_ABS( temp[3] ); + if ( temp_scale == 0 ) + { + FT_ERROR(( "t1_parse_font_matrix: invalid font matrix\n" )); + parser->root.error = FT_THROW( Invalid_File_Format ); + return; + } + /* Set Units per EM based on FontMatrix values. We set the value to */ /* 1000 / temp_scale, because temp_scale was already multiplied by */ /* 1000 (in t1_tofixed, from psobjs.c). */ - root->units_per_EM = (FT_UShort)( FT_DivFix( 1000 * 0x10000L, - temp_scale ) >> 16 ); + root->units_per_EM = (FT_UShort)FT_DivFix( 1000, temp_scale ); /* we need to scale the values by 1.0/temp_scale */ if ( temp_scale != 0x10000L ) @@ -276,7 +289,7 @@ temp[2] = FT_DivFix( temp[2], temp_scale ); temp[4] = FT_DivFix( temp[4], temp_scale ); temp[5] = FT_DivFix( temp[5], temp_scale ); - temp[3] = 0x10000L; + temp[3] = temp[3] < 0 ? -0x10000L : 0x10000L; } matrix->xx = temp[0]; @@ -306,7 +319,7 @@ if ( cur >= limit ) { FT_ERROR(( "t42_parse_encoding: out of bounds\n" )); - parser->root.error = T42_Err_Invalid_File_Format; + parser->root.error = FT_THROW( Invalid_File_Format ); return; } @@ -315,7 +328,7 @@ if ( ft_isdigit( *cur ) || *cur == '[' ) { T1_Encoding encode = &face->type1.encoding; - FT_UInt count, n; + FT_Int count, n; PS_Table char_table = &loader->encoding_table; FT_Memory memory = parser->root.memory; FT_Error error; @@ -330,7 +343,7 @@ parser->root.cursor++; } else - count = (FT_UInt)T1_ToInt( parser ); + count = (FT_Int)T1_ToInt( parser ); T1_Skip_Spaces( parser ); if ( parser->root.cursor >= limit ) @@ -353,7 +366,7 @@ char* notdef = (char *)".notdef"; - T1_Add_Table( char_table, n, notdef, 8 ); + (void)T1_Add_Table( char_table, n, notdef, 8 ); } /* Now we need to read records of the form */ @@ -418,7 +431,7 @@ cur = parser->root.cursor; - if ( *cur == '/' && cur + 2 < limit && n < count ) + if ( cur + 2 < limit && *cur == '/' && n < count ) { FT_PtrDist len; @@ -427,6 +440,8 @@ parser->root.cursor = cur; T1_Skip_PS_Token( parser ); + if ( parser->root.cursor >= limit ) + return; if ( parser->root.error ) return; @@ -440,6 +455,19 @@ n++; } + else if ( only_immediates ) + { + /* Since the current position is not updated for */ + /* immediates-only mode we would get an infinite loop if */ + /* we don't do anything here. */ + /* */ + /* This encoding array is not valid according to the type1 */ + /* specification (it might be an encoding for a CID type1 */ + /* font, however), so we conclude that this font is NOT a */ + /* type1 font. */ + parser->root.error = FT_THROW( Unknown_File_Format ); + return; + } } else { @@ -451,8 +479,8 @@ T1_Skip_Spaces( parser ); } - face->type1.encoding_type = T1_ENCODING_TYPE_ARRAY; - parser->root.cursor = cur; + face->type1.encoding_type = T1_ENCODING_TYPE_ARRAY; + parser->root.cursor = cur; } /* Otherwise, we should have either `StandardEncoding', */ @@ -472,10 +500,7 @@ face->type1.encoding_type = T1_ENCODING_TYPE_ISOLATIN1; else - { - FT_ERROR(( "t42_parse_encoding: invalid token\n" )); - parser->root.error = T42_Err_Invalid_File_Format; - } + parser->root.error = FT_THROW( Ignore ); } } @@ -499,7 +524,7 @@ FT_Byte* limit = parser->root.limit; FT_Error error; FT_Int num_tables = 0; - FT_ULong count, ttf_size = 0; + FT_ULong count; FT_Long n, string_size, old_string_size, real_size; FT_Byte* string_buf = NULL; @@ -527,7 +552,7 @@ if ( parser->root.cursor >= limit || *parser->root.cursor++ != '[' ) { FT_ERROR(( "t42_parse_sfnts: can't find begin of sfnts vector\n" )); - error = T42_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Fail; } @@ -555,6 +580,12 @@ /* don't include delimiters */ string_size = (FT_Long)( ( parser->root.cursor - cur - 2 + 1 ) / 2 ); + if ( !string_size ) + { + FT_ERROR(( "t42_parse_sfnts: invalid data in sfnts array\n" )); + error = FT_THROW( Invalid_File_Format ); + goto Fail; + } if ( FT_REALLOC( string_buf, old_string_size, string_size ) ) goto Fail; @@ -572,7 +603,7 @@ { FT_ERROR(( "t42_parse_sfnts: " "can't handle mixed binary and hex strings\n" )); - error = T42_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Fail; } @@ -580,7 +611,7 @@ if ( string_size < 0 ) { FT_ERROR(( "t42_parse_sfnts: invalid string size\n" )); - error = T42_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Fail; } @@ -592,8 +623,8 @@ if ( limit - parser->root.cursor < string_size ) { - FT_ERROR(( "t42_parse_sfnts: too many binary data\n" )); - error = T42_Err_Invalid_File_Format; + FT_ERROR(( "t42_parse_sfnts: too much binary data\n" )); + error = FT_THROW( Invalid_File_Format ); goto Fail; } else @@ -603,7 +634,7 @@ if ( !string_buf ) { FT_ERROR(( "t42_parse_sfnts: invalid data in sfnts array\n" )); - error = T42_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Fail; } @@ -615,7 +646,7 @@ if ( !string_size ) { FT_ERROR(( "t42_parse_sfnts: invalid string\n" )); - error = T42_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Fail; } @@ -632,18 +663,25 @@ } else { - num_tables = 16 * face->ttf_data[4] + face->ttf_data[5]; - status = BEFORE_TABLE_DIR; - ttf_size = 12 + 16 * num_tables; + num_tables = 16 * face->ttf_data[4] + face->ttf_data[5]; + status = BEFORE_TABLE_DIR; + face->ttf_size = 12 + 16 * num_tables; + + if ( (FT_ULong)( limit - parser->root.cursor ) < face->ttf_size ) + { + FT_ERROR(( "t42_parse_sfnts: invalid data in sfnts array\n" )); + error = FT_THROW( Invalid_File_Format ); + goto Fail; + } - if ( FT_REALLOC( face->ttf_data, 12, ttf_size ) ) + if ( FT_REALLOC( face->ttf_data, 12, face->ttf_size ) ) goto Fail; } /* fall through */ case BEFORE_TABLE_DIR: /* the offset table is read; read the table directory */ - if ( count < ttf_size ) + if ( count < face->ttf_size ) { face->ttf_data[count++] = string_buf[n]; continue; @@ -662,25 +700,24 @@ len = FT_PEEK_ULONG( p ); /* Pad to a 4-byte boundary length */ - ttf_size += ( len + 3 ) & ~3; + face->ttf_size += ( len + 3 ) & ~3; } - status = OTHER_TABLES; - face->ttf_size = ttf_size; + status = OTHER_TABLES; /* there are no more than 256 tables, so no size check here */ if ( FT_REALLOC( face->ttf_data, 12 + 16 * num_tables, - ttf_size + 1 ) ) + face->ttf_size + 1 ) ) goto Fail; } /* fall through */ case OTHER_TABLES: /* all other tables are just copied */ - if ( count >= ttf_size ) + if ( count >= face->ttf_size ) { - FT_ERROR(( "t42_parse_sfnts: too many binary data\n" )); - error = T42_Err_Invalid_File_Format; + FT_ERROR(( "t42_parse_sfnts: too much binary data\n" )); + error = FT_THROW( Invalid_File_Format ); goto Fail; } face->ttf_data[count++] = string_buf[n]; @@ -691,7 +728,7 @@ } /* if control reaches this point, the format was not valid */ - error = T42_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); Fail: parser->root.error = error; @@ -727,7 +764,7 @@ if ( parser->root.cursor >= limit ) { FT_ERROR(( "t42_parse_charstrings: out of bounds\n" )); - error = T42_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Fail; } @@ -769,14 +806,14 @@ else { FT_ERROR(( "t42_parse_charstrings: invalid token\n" )); - error = T42_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Fail; } if ( parser->root.cursor >= limit ) { FT_ERROR(( "t42_parse_charstrings: out of bounds\n" )); - error = T42_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Fail; } @@ -825,6 +862,12 @@ break; T1_Skip_PS_Token( parser ); + if ( parser->root.cursor >= limit ) + { + FT_ERROR(( "t42_parse_charstrings: out of bounds\n" )); + error = FT_THROW( Invalid_File_Format ); + goto Fail; + } if ( parser->root.error ) return; @@ -833,10 +876,10 @@ FT_PtrDist len; - if ( cur + 1 >= limit ) + if ( cur + 2 >= limit ) { FT_ERROR(( "t42_parse_charstrings: out of bounds\n" )); - error = T42_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Fail; } @@ -867,7 +910,7 @@ if ( parser->root.cursor >= limit ) { FT_ERROR(( "t42_parse_charstrings: out of bounds\n" )); - error = T42_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Fail; } @@ -890,7 +933,7 @@ if ( !notdef_found ) { FT_ERROR(( "t42_parse_charstrings: no /.notdef glyph\n" )); - error = T42_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Fail; } @@ -1034,7 +1077,7 @@ parser->root.cursor = base; parser->root.limit = base + size; - parser->root.error = T42_Err_Ok; + parser->root.error = FT_Err_Ok; limit = parser->root.limit; diff --git a/src/winfonts/winfnt.c b/src/winfonts/winfnt.c index a551896..4705c53 100644 --- a/src/winfonts/winfnt.c +++ b/src/winfonts/winfnt.c @@ -4,7 +4,7 @@ /* */ /* FreeType font driver for Windows FNT/FON files */ /* */ -/* Copyright 1996-2004, 2006-2012 by */ +/* Copyright 1996-2004, 2006-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* Copyright 2003 Huw D M Davies for Codeweavers */ /* Copyright 2007 Dmitry Timoshkov for Codeweavers */ @@ -72,12 +72,12 @@ FT_FRAME_START( 248 ), FT_FRAME_ULONG_LE ( magic ), /* PE00 */ - FT_FRAME_USHORT_LE ( machine ), /* 0x014c - i386 */ + FT_FRAME_USHORT_LE ( machine ), /* 0x014C - i386 */ FT_FRAME_USHORT_LE ( number_of_sections ), FT_FRAME_SKIP_BYTES( 12 ), FT_FRAME_USHORT_LE ( size_of_optional_header ), FT_FRAME_SKIP_BYTES( 2 ), - FT_FRAME_USHORT_LE ( magic32 ), /* 0x10b */ + FT_FRAME_USHORT_LE ( magic32 ), /* 0x10B */ FT_FRAME_SKIP_BYTES( 110 ), FT_FRAME_ULONG_LE ( rsrc_virtual_address ), FT_FRAME_ULONG_LE ( rsrc_size ), @@ -225,7 +225,7 @@ header->version != 0x300 ) { FT_TRACE2(( " not a Windows FNT file\n" )); - error = FNT_Err_Unknown_File_Format; + error = FT_THROW( Unknown_File_Format ); goto Exit; } @@ -235,7 +235,7 @@ if ( header->file_size < size ) { FT_TRACE2(( " not a Windows FNT file\n" )); - error = FNT_Err_Unknown_File_Format; + error = FT_THROW( Unknown_File_Format ); goto Exit; } @@ -253,7 +253,7 @@ if ( header->file_type & 1 ) { FT_TRACE2(( "[can't handle vector FNT fonts]\n" )); - error = FNT_Err_Unknown_File_Format; + error = FT_THROW( Unknown_File_Format ); goto Exit; } @@ -284,7 +284,7 @@ FT_STREAM_READ_FIELDS( winmz_header_fields, &mz_header ) ) goto Exit; - error = FNT_Err_Unknown_File_Format; + error = FT_ERR( Unknown_File_Format ); if ( mz_header.magic == WINFNT_MZ_MAGIC ) { /* yes, now look for an NE header in the file */ @@ -297,7 +297,7 @@ FT_STREAM_READ_FIELDS( winne_header_fields, &ne_header ) ) goto Exit; - error = FNT_Err_Unknown_File_Format; + error = FT_ERR( Unknown_File_Format ); if ( ne_header.magic == WINFNT_NE_MAGIC ) { /* good, now look into the resource table for each FNT resource */ @@ -344,7 +344,7 @@ if ( !font_count || !font_offset ) { FT_TRACE2(( "this file doesn't contain any FNT resources\n" )); - error = FNT_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } @@ -353,7 +353,7 @@ if ( font_count * 118UL > stream->size ) { FT_TRACE2(( "invalid number of faces\n" )); - error = FNT_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } @@ -361,7 +361,7 @@ if ( face_index >= font_count ) { - error = FNT_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Exit; } else if ( face_index < 0 ) @@ -412,12 +412,12 @@ pe32_header.rsrc_size )); if ( pe32_header.magic != WINFNT_PE_MAGIC /* check full signature */ || - pe32_header.machine != 0x014c /* i386 */ || - pe32_header.size_of_optional_header != 0xe0 /* FIXME */ || - pe32_header.magic32 != 0x10b ) + pe32_header.machine != 0x014C /* i386 */ || + pe32_header.size_of_optional_header != 0xE0 /* FIXME */ || + pe32_header.magic32 != 0x10B ) { FT_TRACE2(( "this file has an invalid PE header\n" )); - error = FNT_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } @@ -440,7 +440,7 @@ } FT_TRACE2(( "this file doesn't contain any resources\n" )); - error = FNT_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; Found_rsrc_section: @@ -462,7 +462,7 @@ if ( !(dir_entry1.offset & 0x80000000UL ) /* DataIsDirectory */ ) { - error = FNT_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } @@ -486,7 +486,7 @@ if ( !(dir_entry2.offset & 0x80000000UL ) /* DataIsDirectory */ ) { - error = FNT_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } @@ -510,7 +510,7 @@ if ( dir_entry2.offset & 0x80000000UL /* DataIsDirectory */ ) { - error = FNT_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } @@ -561,13 +561,13 @@ if ( !face->root.num_faces ) { FT_TRACE2(( "this file doesn't contain any RT_FONT resources\n" )); - error = FNT_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } if ( face_index >= face->root.num_faces ) { - error = FNT_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Exit; } } @@ -591,11 +591,14 @@ static FT_Error - fnt_cmap_init( FNT_CMap cmap ) + fnt_cmap_init( FNT_CMap cmap, + FT_Pointer pointer ) { FNT_Face face = (FNT_Face)FT_CMAP_FACE( cmap ); FNT_Font font = face->font; + FT_UNUSED( pointer ); + cmap->first = (FT_UInt32) font->header.first_char; cmap->count = (FT_UInt32)( font->header.last_char - cmap->first + 1 ); @@ -705,7 +708,7 @@ if ( !error && face_index < 0 ) goto Exit; - if ( error == FNT_Err_Unknown_File_Format ) + if ( FT_ERR_EQ( error, Unknown_File_Format ) ) { /* this didn't work; try to load a single FNT font */ FNT_Font font; @@ -724,7 +727,7 @@ if ( !error ) { if ( face_index > 0 ) - error = FNT_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); else if ( face_index < 0 ) goto Exit; } @@ -743,8 +746,8 @@ root->face_index = face_index; - root->face_flags = FT_FACE_FLAG_FIXED_SIZES | - FT_FACE_FLAG_HORIZONTAL; + root->face_flags |= FT_FACE_FLAG_FIXED_SIZES | + FT_FACE_FLAG_HORIZONTAL; if ( font->header.avg_width == font->header.max_width ) root->face_flags |= FT_FACE_FLAG_FIXED_WIDTH; @@ -836,7 +839,7 @@ if ( font->header.last_char < font->header.first_char ) { FT_TRACE2(( "invalid number of glyphs\n" )); - error = FNT_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Fail; } @@ -847,7 +850,7 @@ if ( font->header.face_name_offset >= font->header.file_size ) { FT_TRACE2(( "invalid family name offset\n" )); - error = FNT_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Fail; } family_size = font->header.file_size - font->header.face_name_offset; @@ -909,7 +912,7 @@ header->ascent ) * 64; size->metrics.max_advance = header->max_width * 64; - return FNT_Err_Ok; + return FT_Err_Ok; } @@ -920,7 +923,7 @@ FNT_Face face = (FNT_Face)size->face; FT_WinFNT_Header header = &face->font->header; FT_Bitmap_Size* bsize = size->face->available_sizes; - FT_Error error = FNT_Err_Invalid_Pixel_Size; + FT_Error error = FT_ERR( Invalid_Pixel_Size ); FT_Long height; @@ -931,16 +934,16 @@ { case FT_SIZE_REQUEST_TYPE_NOMINAL: if ( height == ( ( bsize->y_ppem + 32 ) >> 6 ) ) - error = FNT_Err_Ok; + error = FT_Err_Ok; break; case FT_SIZE_REQUEST_TYPE_REAL_DIM: if ( height == header->pixel_height ) - error = FNT_Err_Ok; + error = FT_Err_Ok; break; default: - error = FNT_Err_Unimplemented_Feature; + error = FT_THROW( Unimplemented_Feature ); break; } @@ -959,7 +962,7 @@ { FNT_Face face = (FNT_Face)FT_SIZE_FACE( size ); FNT_Font font; - FT_Error error = FNT_Err_Ok; + FT_Error error = FT_Err_Ok; FT_Byte* p; FT_Int len; FT_Bitmap* bitmap = &slot->bitmap; @@ -971,32 +974,44 @@ if ( !face ) { - error = FNT_Err_Invalid_Argument; + error = FT_THROW( Invalid_Face_Handle ); goto Exit; } font = face->font; - if ( !font || + if ( !font || glyph_index >= (FT_UInt)( FT_FACE( face )->num_glyphs ) ) { - error = FNT_Err_Invalid_Argument; + error = FT_THROW( Invalid_Argument ); goto Exit; } + FT_TRACE1(( "FNT_Load_Glyph: glyph index %d\n", glyph_index )); + if ( glyph_index > 0 ) glyph_index--; /* revert to real index */ else - glyph_index = font->header.default_char; /* the .notdef glyph */ + glyph_index = font->header.default_char; /* the `.notdef' glyph */ new_format = FT_BOOL( font->header.version == 0x300 ); len = new_format ? 6 : 4; - /* jump to glyph entry */ - p = font->fnt_frame + ( new_format ? 148 : 118 ) + len * glyph_index; + /* get glyph width and offset */ + offset = ( new_format ? 148 : 118 ) + len * glyph_index; + + if ( offset >= font->header.file_size - 2 - ( new_format ? 4 : 2 ) ) + { + FT_TRACE2(( "invalid FNT offset\n" )); + error = FT_THROW( Invalid_File_Format ); + goto Exit; + } + + p = font->fnt_frame + offset; bitmap->width = FT_NEXT_SHORT_LE( p ); + /* jump to glyph entry */ if ( new_format ) offset = FT_NEXT_ULONG_LE( p ); else @@ -1005,7 +1020,7 @@ if ( offset >= font->header.file_size ) { FT_TRACE2(( "invalid FNT offset\n" )); - error = FNT_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } @@ -1024,10 +1039,10 @@ bitmap->rows = font->header.pixel_height; bitmap->pixel_mode = FT_PIXEL_MODE_MONO; - if ( offset + pitch * bitmap->rows >= font->header.file_size ) + if ( offset + pitch * bitmap->rows > font->header.file_size ) { FT_TRACE2(( "invalid bitmap width\n" )); - error = FNT_Err_Invalid_File_Format; + error = FT_THROW( Invalid_File_Format ); goto Exit; } @@ -1141,10 +1156,6 @@ 0, /* FT_Slot_InitFunc */ 0, /* FT_Slot_DoneFunc */ -#ifdef FT_CONFIG_OPTION_OLD_INTERNALS - ft_stub_set_char_sizes, - ft_stub_set_pixel_sizes, -#endif FNT_Load_Glyph, 0, /* FT_Face_GetKerningFunc */ diff --git a/vms_make.com b/vms_make.com index 1aa83e7..8d8fdf7 100644 --- a/vms_make.com +++ b/vms_make.com @@ -1,6 +1,6 @@ $! make Freetype2 under OpenVMS $! -$! Copyright 2003, 2004, 2006, 2007 by +$! Copyright 2003, 2004, 2006, 2007, 2013 by $! David Turner, Robert Wilhelm, and Werner Lemberg. $! $! This file is part of the FreeType project, and may only be used, modified, @@ -172,7 +172,7 @@ $ deck all : - define freetype [--.include.freetype] + define freetype [--.include] define psaux [-.psaux] define autofit [-.autofit] define autohint [-.autohint] -- 2.7.4