From 29b86f9852b2b7ecc31cdfee56679537e40bc6e2 Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 12 Apr 2010 09:53:17 +0000 Subject: svn merge -r524:HEAD "^/branches/released" . --- freetype/ChangeLog | 718 +- freetype/Jamfile | 2 +- freetype/README | 10 +- freetype/autogen.sh | 7 +- freetype/builds/unix/aclocal.m4 | 15 +- freetype/builds/unix/config.guess | 32 +- freetype/builds/unix/config.sub | 28 +- freetype/builds/unix/configure | 122 +- freetype/builds/unix/configure.ac | 66 +- freetype/builds/unix/configure.raw | 64 +- freetype/builds/unix/freetype-config.in | 22 +- freetype/builds/unix/install-sh | 5 +- freetype/builds/unix/ltmain.sh | 16 +- freetype/builds/win32/vc2005/freetype.vcproj | 20 +- freetype/builds/win32/vc2005/index.html | 10 +- freetype/builds/win32/vc2008/freetype.vcproj | 28 +- freetype/builds/win32/vc2008/index.html | 10 +- freetype/builds/win32/visualc/freetype.dsp | 20 +- freetype/builds/win32/visualc/freetype.vcproj | 28 +- freetype/builds/win32/visualc/index.html | 10 +- freetype/builds/win32/visualce/freetype.dsp | 20 +- freetype/builds/win32/visualce/freetype.vcproj | 100 +- freetype/builds/win32/visualce/index.html | 10 +- freetype/builds/wince/vc2005-ce/freetype.vcproj | 76 +- freetype/builds/wince/vc2005-ce/index.html | 10 +- freetype/builds/wince/vc2008-ce/freetype.vcproj | 76 +- freetype/builds/wince/vc2008-ce/index.html | 10 +- freetype/devel/ftoption.h | 28 +- freetype/docs/CHANGES | 20 + freetype/docs/INSTALL.ANY | 10 +- freetype/docs/LICENSE.TXT | 9 +- freetype/docs/VERSION.DLL | 3 +- freetype/docs/reference/ft2-base_interface.html | 11 +- freetype/docs/reference/ft2-basic_types.html | 12 +- freetype/docs/reference/ft2-bdf_fonts.html | 4 +- freetype/docs/reference/ft2-bitmap_handling.html | 4 +- freetype/docs/reference/ft2-cache_subsystem.html | 4 +- freetype/docs/reference/ft2-cid_fonts.html | 4 +- freetype/docs/reference/ft2-computations.html | 4 +- freetype/docs/reference/ft2-font_formats.html | 4 +- freetype/docs/reference/ft2-gasp_table.html | 4 +- freetype/docs/reference/ft2-glyph_management.html | 6 +- freetype/docs/reference/ft2-glyph_stroker.html | 4 +- freetype/docs/reference/ft2-glyph_variants.html | 4 +- freetype/docs/reference/ft2-gx_validation.html | 4 +- freetype/docs/reference/ft2-gzip.html | 4 +- .../docs/reference/ft2-header_file_macros.html | 4 +- freetype/docs/reference/ft2-incremental.html | 10 +- freetype/docs/reference/ft2-index.html | 494 +- freetype/docs/reference/ft2-lcd_filtering.html | 4 +- freetype/docs/reference/ft2-list_processing.html | 4 +- freetype/docs/reference/ft2-lzw.html | 4 +- freetype/docs/reference/ft2-mac_specific.html | 4 +- freetype/docs/reference/ft2-module_management.html | 4 +- freetype/docs/reference/ft2-multiple_masters.html | 4 +- freetype/docs/reference/ft2-ot_validation.html | 4 +- .../docs/reference/ft2-outline_processing.html | 14 +- freetype/docs/reference/ft2-pfr_fonts.html | 4 +- freetype/docs/reference/ft2-quick_advance.html | 4 +- freetype/docs/reference/ft2-raster.html | 4 +- freetype/docs/reference/ft2-sfnt_names.html | 48 +- freetype/docs/reference/ft2-sizes_management.html | 4 +- freetype/docs/reference/ft2-system_interface.html | 4 +- freetype/docs/reference/ft2-toc.html | 6 +- freetype/docs/reference/ft2-truetype_engine.html | 4 +- freetype/docs/reference/ft2-truetype_tables.html | 4 +- freetype/docs/reference/ft2-type1_tables.html | 4 +- freetype/docs/reference/ft2-user_allocation.html | 4 +- freetype/docs/reference/ft2-version.html | 6 +- freetype/docs/reference/ft2-winfnt_fonts.html | 4 +- freetype/docs/release | 18 +- freetype/include/freetype/config/ftconfig.h | 36 +- freetype/include/freetype/config/ftoption.h | 18 +- freetype/include/freetype/freetype.h | 21 +- freetype/include/freetype/ftglyph.h | 2 +- freetype/include/freetype/ftimage.h | 38 +- freetype/include/freetype/ftincrem.h | 8 +- freetype/include/freetype/ftoutln.h | 7 +- freetype/include/freetype/ftsnames.h | 31 +- freetype/src/autofit/aflatin.c | 8 +- freetype/src/autofit/aflatin2.c | 8 +- freetype/src/base/ftbase.h | 6 +- freetype/src/base/ftbbox.c | 6 +- freetype/src/base/ftdbgmem.c | 2 +- freetype/src/base/ftglyph.c | 6 +- freetype/src/base/ftinit.c | 4 +- freetype/src/base/ftobjs.c | 28 +- freetype/src/base/ftoutln.c | 8 +- freetype/src/base/ftpatent.c | 9 +- freetype/src/base/ftstroke.c | 14 +- freetype/src/base/ftsynth.c | 4 +- freetype/src/cache/ftcglyph.c | 4 +- freetype/src/cff/cffdrivr.c | 5 +- freetype/src/cff/cffgload.c | 165 +- freetype/src/cff/cffgload.h | 8 +- freetype/src/cff/cffobjs.c | 9 +- freetype/src/cff/cffparse.c | 4 +- freetype/src/cid/cidgload.c | 19 +- freetype/src/cid/cidobjs.c | 9 +- freetype/src/cid/cidtoken.h | 2 +- freetype/src/lzw/ftlzw.c | 12 +- freetype/src/pfr/pfrsbit.c | 6 +- freetype/src/psaux/t1decode.c | 21 +- freetype/src/psnames/psmodule.c | 3 +- freetype/src/sfnt/sfdriver.c | 2 - freetype/src/sfnt/sfobjs.c | 31 +- freetype/src/sfnt/ttcmap.c | 9 +- freetype/src/sfnt/ttload.c | 8 +- freetype/src/tools/apinames.c | 4 +- freetype/src/truetype/ttdriver.c | 18 +- freetype/src/truetype/ttgload.c | 216 +- freetype/src/truetype/ttgxvar.c | 11 +- freetype/src/type1/t1afm.c | 18 +- freetype/src/type1/t1gload.c | 40 +- freetype/src/type1/t1objs.c | 9 +- freetype/src/type1/t1parse.c | 21 +- gl/gl_mangle.h | 45 + gl/glcore.h | 4 - gl/glx.h | 23 + gl/glxext.h | 8 + gl/internal/dri_interface.h | 74 +- gl/internal/glcore.h | 4 - mesalib/Makefile | 115 +- mesalib/aclocal.m4 | 22 +- mesalib/bin/install-sh | 93 - mesalib/bin/mklib | 258 +- mesalib/configs/autoconf.in | 16 +- mesalib/configs/darwin | 4 +- mesalib/configs/darwin-x86ppc | 33 - mesalib/configs/default | 27 +- mesalib/configs/freebsd-dri | 4 +- mesalib/configs/linux-cell | 16 +- mesalib/configs/linux-debug | 2 +- mesalib/configs/linux-directfb | 38 - mesalib/configs/linux-dri | 14 +- mesalib/configs/linux-dri-x86-64 | 2 +- mesalib/configs/linux-dri-xcb | 19 +- mesalib/configs/linux-egl | 8 - mesalib/configs/linux-glide | 23 - mesalib/configs/linux-i965 | 8 + mesalib/configs/linux-indirect | 2 +- mesalib/configs/linux-llvm | 12 +- mesalib/configs/linux-llvm-debug | 12 + mesalib/configs/linux-opengl-es | 28 + mesalib/configs/linux-solo | 54 - mesalib/configs/linux-solo-ia64 | 7 - mesalib/configs/linux-solo-x86 | 10 - mesalib/configs/linux-x86-glide | 28 - mesalib/configure | 7110 +++++++++++++------- mesalib/configure.ac | 235 +- mesalib/docs/MESA_swap_control.spec | 7 +- mesalib/docs/MiniGLX.html | 534 -- mesalib/docs/README.3DFX | 2 +- mesalib/docs/README.D3D | 124 - mesalib/docs/README.directfb | 29 - mesalib/docs/contents.html | 8 +- mesalib/docs/demos.html | 18 - mesalib/docs/devinfo.html | 2 +- mesalib/docs/dispatch.html | 6 +- mesalib/docs/egl.html | 324 + mesalib/docs/envvars.html | 23 + mesalib/docs/install.html | 9 - mesalib/docs/lists.html | 31 +- mesalib/docs/news.html | 19 +- mesalib/docs/opengles.html | 79 + mesalib/docs/openvg.html | 19 +- mesalib/docs/osmesa.html | 2 +- mesalib/docs/pbuffers.html | 54 - mesalib/docs/relnotes-7.6.1.html | 12 +- mesalib/docs/relnotes-7.7.1.html | 60 + mesalib/docs/relnotes-7.7.html | 12 +- mesalib/docs/relnotes-7.8.html | 62 + mesalib/docs/relnotes.html | 2 + mesalib/docs/repository.html | 84 +- mesalib/docs/shading.html | 4 - mesalib/docs/sourcetree.html | 165 + mesalib/include/EGL/egl.h | 39 +- mesalib/include/EGL/eglext.h | 60 +- mesalib/include/EGL/eglplatform.h | 133 +- mesalib/include/GL/dmesa.h | 160 - mesalib/include/GL/ggimesa.h | 85 - mesalib/include/GL/gl.h | 19 +- mesalib/include/GL/gl_mangle.h | 45 + mesalib/include/GL/glx.h | 23 + mesalib/include/GL/glxext.h | 8 + mesalib/include/GL/internal/dri_interface.h | 74 +- mesalib/include/GL/internal/glcore.h | 4 - mesalib/include/GL/svgamesa.h | 97 - mesalib/include/KHR/khrplatform.h | 273 + mesalib/include/VG/openvg.h | 686 ++ mesalib/include/VG/vgext.h | 233 + mesalib/include/VG/vgplatform.h | 111 + mesalib/include/VG/vgu.h | 130 + mesalib/progs/util/readtex.c | 20 +- mesalib/src/glsl/Makefile | 15 + mesalib/src/glsl/Makefile.template | 50 + mesalib/src/glsl/SConscript | 69 + mesalib/src/glsl/apps/Makefile | 43 + mesalib/src/glsl/apps/compile.c | 192 + mesalib/src/glsl/apps/process.c | 383 ++ mesalib/src/glsl/apps/purify.c | 108 + mesalib/src/glsl/apps/tokenise.c | 335 + mesalib/src/glsl/apps/version.c | 117 + mesalib/src/glsl/cl/Makefile | 13 + mesalib/src/glsl/cl/sl_cl_parse.c | 3001 +++++++++ mesalib/src/glsl/cl/sl_cl_parse.h | 40 + mesalib/src/glsl/pp/Makefile | 27 + mesalib/src/glsl/pp/sl_pp_context.c | 182 + mesalib/src/glsl/pp/sl_pp_context.h | 100 + mesalib/src/glsl/pp/sl_pp_define.c | 238 + mesalib/src/glsl/pp/sl_pp_dict.c | 85 + mesalib/src/glsl/pp/sl_pp_dict.h | 77 + mesalib/src/glsl/pp/sl_pp_error.c | 270 + mesalib/src/glsl/pp/sl_pp_expression.c | 411 ++ mesalib/src/glsl/pp/sl_pp_expression.h | 40 + mesalib/src/glsl/pp/sl_pp_extension.c | 178 + mesalib/src/glsl/pp/sl_pp_if.c | 340 + mesalib/src/glsl/pp/sl_pp_line.c | 127 + mesalib/src/glsl/pp/sl_pp_macro.c | 414 ++ mesalib/src/glsl/pp/sl_pp_macro.h | 73 + mesalib/src/glsl/pp/sl_pp_pragma.c | 109 + mesalib/src/glsl/pp/sl_pp_process.c | 328 + mesalib/src/glsl/pp/sl_pp_process.h | 116 + mesalib/src/glsl/pp/sl_pp_public.h | 83 + mesalib/src/glsl/pp/sl_pp_purify.c | 302 + mesalib/src/glsl/pp/sl_pp_purify.h | 63 + mesalib/src/glsl/pp/sl_pp_token.c | 854 +++ mesalib/src/glsl/pp/sl_pp_token.h | 133 + mesalib/src/glsl/pp/sl_pp_token_util.c | 182 + mesalib/src/glsl/pp/sl_pp_token_util.h | 103 + mesalib/src/glsl/pp/sl_pp_version.c | 161 + .../glu/sgi/libnurbs/interface/bezierPatchMesh.h | 1 + .../src/glu/sgi/libnurbs/interface/glsurfeval.h | 2 +- mesalib/src/glu/sgi/libnurbs/internals/arc.cc | 1 - mesalib/src/glu/sgi/libnurbs/internals/arc.h | 6 + mesalib/src/glu/sgi/libnurbs/internals/arcsorter.h | 1 - mesalib/src/glu/sgi/libnurbs/internals/backend.cc | 1 - mesalib/src/glu/sgi/libnurbs/internals/bin.cc | 1 + mesalib/src/glu/sgi/libnurbs/internals/bufpool.cc | 3 + mesalib/src/glu/sgi/libnurbs/internals/curve.cc | 6 + .../src/glu/sgi/libnurbs/internals/curvelist.cc | 12 +- mesalib/src/glu/sgi/libnurbs/internals/curvesub.cc | 1 - .../src/glu/sgi/libnurbs/internals/displaylist.h | 1 + .../src/glu/sgi/libnurbs/internals/gridvertex.h | 2 +- .../src/glu/sgi/libnurbs/internals/knotvector.cc | 3 + mesalib/src/glu/sgi/libnurbs/internals/maplist.cc | 1 - mesalib/src/glu/sgi/libnurbs/internals/mesher.cc | 3 + .../src/glu/sgi/libnurbs/internals/patchlist.cc | 1 - mesalib/src/glu/sgi/libnurbs/internals/quilt.cc | 2 - mesalib/src/glu/sgi/libnurbs/internals/reader.cc | 2 + mesalib/src/glu/sgi/libnurbs/internals/reader.h | 14 +- .../src/glu/sgi/libnurbs/internals/renderhints.cc | 5 +- .../src/glu/sgi/libnurbs/internals/simplemath.h | 2 + mesalib/src/glu/sgi/libnurbs/internals/slicer.cc | 4 + .../src/glu/sgi/libnurbs/internals/subdivider.cc | 6 +- .../src/glu/sgi/libnurbs/internals/trimregion.cc | 1 - mesalib/src/glu/sgi/libnurbs/internals/uarray.cc | 1 + mesalib/src/glu/sgi/libnurbs/internals/varray.cc | 8 + .../src/glu/sgi/libnurbs/nurbtess/directedLine.cc | 32 +- mesalib/src/glu/sgi/libnurbs/nurbtess/monoChain.cc | 2 + .../src/glu/sgi/libnurbs/nurbtess/partitionY.cc | 4 +- mesalib/src/glu/sgi/libnurbs/nurbtess/partitionY.h | 2 +- .../glu/sgi/libnurbs/nurbtess/primitiveStream.cc | 2 + .../src/glu/sgi/libnurbs/nurbtess/sampleCompBot.cc | 4 +- .../src/glu/sgi/libnurbs/nurbtess/sampleCompTop.cc | 4 +- .../src/glu/sgi/libnurbs/nurbtess/sampledLine.cc | 3 + mesalib/src/glu/sgi/libtess/normal.c | 2 +- mesalib/src/glu/sgi/libutil/error.c | 2 - mesalib/src/glu/sgi/libutil/mipmap.c | 1 - mesalib/src/mesa/Makefile | 30 +- mesalib/src/mesa/Makefile.mgw | 3 +- mesalib/src/mesa/drivers/common/driverfuncs.c | 31 +- mesalib/src/mesa/drivers/common/meta.c | 159 +- mesalib/src/mesa/drivers/dri/Makefile.template | 24 +- mesalib/src/mesa/drivers/dri/common/dri_metaops.c | 8 - mesalib/src/mesa/drivers/dri/common/dri_util.c | 96 +- mesalib/src/mesa/drivers/dri/common/dri_util.h | 28 +- .../src/mesa/drivers/dri/common/drirenderbuffer.c | 17 +- .../src/mesa/drivers/dri/common/drirenderbuffer.h | 8 +- mesalib/src/mesa/drivers/dri/common/spantmp.h | 23 +- mesalib/src/mesa/drivers/dri/common/spantmp2.h | 25 +- mesalib/src/mesa/drivers/dri/common/utils.c | 37 +- mesalib/src/mesa/drivers/dri/common/utils.h | 3 +- mesalib/src/mesa/drivers/dri/common/vblank.c | 20 +- mesalib/src/mesa/drivers/dri/common/vblank.h | 16 +- mesalib/src/mesa/drivers/dri/common/xmlconfig.c | 7 - mesalib/src/mesa/drivers/dri/swrast/swrast.c | 86 +- mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h | 13 +- mesalib/src/mesa/drivers/dri/swrast/swrast_span.c | 52 +- .../src/mesa/drivers/dri/swrast/swrast_spantemp.h | 33 +- mesalib/src/mesa/drivers/windows/gdi/mesa.def | 13 +- mesalib/src/mesa/drivers/windows/gdi/wmesa.c | 61 +- mesalib/src/mesa/drivers/windows/gdi/wmesadef.h | 2 +- .../src/mesa/drivers/windows/gldirect/dglcontext.c | 2 - mesalib/src/mesa/drivers/windows/icd/mesa.def | 6 - mesalib/src/mesa/glapi/dispatch.h | 37 - mesalib/src/mesa/glapi/glapi.c | 446 +- mesalib/src/mesa/glapi/glapi.h | 91 +- mesalib/src/mesa/glapi/glapi_dispatch.c | 102 + mesalib/src/mesa/glapi/glapi_getproc.c | 305 +- mesalib/src/mesa/glapi/glapi_nop.c | 114 + mesalib/src/mesa/glapi/glapidispatch.h | 109 +- mesalib/src/mesa/glapi/glapioffsets.h | 44 +- mesalib/src/mesa/glapi/glapitable.h | 29 +- mesalib/src/mesa/glapi/glapitemp.h | 511 +- mesalib/src/mesa/glapi/glprocs.h | 674 +- mesalib/src/mesa/glapi/glthread.c | 111 +- mesalib/src/mesa/glapi/glthread.h | 162 +- mesalib/src/mesa/main/accum.c | 2 +- mesalib/src/mesa/main/api_arrayelt.c | 2 +- mesalib/src/mesa/main/api_exec.c | 32 +- mesalib/src/mesa/main/api_loopback.c | 2 +- mesalib/src/mesa/main/api_noop.c | 2 +- mesalib/src/mesa/main/api_validate.c | 23 +- mesalib/src/mesa/main/arrayobj.c | 18 +- mesalib/src/mesa/main/attrib.c | 164 +- mesalib/src/mesa/main/bitset.h | 33 +- mesalib/src/mesa/main/blend.c | 65 +- mesalib/src/mesa/main/blend.h | 4 + mesalib/src/mesa/main/bufferobj.c | 553 +- mesalib/src/mesa/main/bufferobj.h | 17 + mesalib/src/mesa/main/buffers.c | 2 - mesalib/src/mesa/main/clear.c | 331 +- mesalib/src/mesa/main/clear.h | 13 + mesalib/src/mesa/main/colortab.c | 12 +- mesalib/src/mesa/main/compiler.h | 24 +- mesalib/src/mesa/main/condrender.c | 147 + mesalib/src/mesa/main/condrender.h | 45 + mesalib/src/mesa/main/config.h | 3 +- mesalib/src/mesa/main/context.c | 154 +- mesalib/src/mesa/main/context.h | 6 +- mesalib/src/mesa/main/convolve.c | 3 +- mesalib/src/mesa/main/cpuinfo.c | 6 +- mesalib/src/mesa/main/dd.h | 81 +- mesalib/src/mesa/main/debug.c | 94 +- mesalib/src/mesa/main/depthstencil.c | 5 +- mesalib/src/mesa/main/descrip.mms | 3 - mesalib/src/mesa/main/dispatch.c | 96 - mesalib/src/mesa/main/dispatch.h | 37 + mesalib/src/mesa/main/dlist.c | 519 +- mesalib/src/mesa/main/dlopen.c | 2 +- mesalib/src/mesa/main/drawpix.c | 6 +- mesalib/src/mesa/main/enable.c | 92 +- mesalib/src/mesa/main/enable.h | 12 + mesalib/src/mesa/main/enums.c | 6118 ++++++++--------- mesalib/src/mesa/main/eval.c | 6 +- mesalib/src/mesa/main/execmem.c | 6 +- mesalib/src/mesa/main/extensions.c | 118 +- mesalib/src/mesa/main/extensions.h | 7 + mesalib/src/mesa/main/fbobject.c | 111 +- mesalib/src/mesa/main/fbobject.h | 3 + mesalib/src/mesa/main/feedback.c | 22 +- mesalib/src/mesa/main/feedback.h | 2 - mesalib/src/mesa/main/ffvertex_prog.c | 15 +- mesalib/src/mesa/main/formats.c | 2 +- mesalib/src/mesa/main/framebuffer.c | 62 +- mesalib/src/mesa/main/framebuffer.h | 6 +- mesalib/src/mesa/main/get.c | 412 +- mesalib/src/mesa/main/get.h | 12 + mesalib/src/mesa/main/getstring.c | 115 +- mesalib/src/mesa/main/glheader.h | 7 + mesalib/src/mesa/main/hash.c | 53 +- mesalib/src/mesa/main/hash.h | 2 +- mesalib/src/mesa/main/histogram.c | 2 +- mesalib/src/mesa/main/image.c | 71 +- mesalib/src/mesa/main/image.h | 2 +- mesalib/src/mesa/main/imports.c | 242 +- mesalib/src/mesa/main/imports.h | 150 +- mesalib/src/mesa/main/light.c | 45 +- mesalib/src/mesa/main/lines.c | 2 - mesalib/src/mesa/main/macros.h | 21 +- mesalib/src/mesa/main/matrix.c | 10 +- mesalib/src/mesa/main/mfeatures.h | 3 + mesalib/src/mesa/main/mipmap.c | 61 +- mesalib/src/mesa/main/mm.c | 16 +- mesalib/src/mesa/main/mtypes.h | 43 +- mesalib/src/mesa/main/pixel.c | 17 +- mesalib/src/mesa/main/pixelstore.c | 3 - mesalib/src/mesa/main/points.c | 3 +- mesalib/src/mesa/main/polygon.c | 3 +- mesalib/src/mesa/main/queryobj.c | 27 +- mesalib/src/mesa/main/queryobj.h | 10 + mesalib/src/mesa/main/rastpos.c | 44 +- mesalib/src/mesa/main/readpix.c | 16 +- mesalib/src/mesa/main/remap.c | 6 +- mesalib/src/mesa/main/remap_helper.h | 3179 ++++----- mesalib/src/mesa/main/renderbuffer.c | 130 +- mesalib/src/mesa/main/renderbuffer.h | 6 - mesalib/src/mesa/main/scissor.c | 6 +- mesalib/src/mesa/main/shaders.c | 20 +- mesalib/src/mesa/main/shared.c | 43 +- mesalib/src/mesa/main/shared.h | 2 +- mesalib/src/mesa/main/state.c | 9 +- mesalib/src/mesa/main/syncobj.c | 4 +- mesalib/src/mesa/main/texcompress.c | 3 - mesalib/src/mesa/main/texcompress_fxt1.c | 19 +- mesalib/src/mesa/main/texcompress_s3tc.c | 8 +- mesalib/src/mesa/main/texenvprogram.c | 37 +- mesalib/src/mesa/main/texformat.c | 2 - mesalib/src/mesa/main/texgen.c | 6 +- mesalib/src/mesa/main/texgen.h | 6 + mesalib/src/mesa/main/texgetimage.c | 79 +- mesalib/src/mesa/main/teximage.c | 68 +- mesalib/src/mesa/main/teximage.h | 2 + mesalib/src/mesa/main/texobj.c | 22 +- mesalib/src/mesa/main/texparam.c | 193 +- mesalib/src/mesa/main/texparam.h | 12 + mesalib/src/mesa/main/texrender.c | 106 +- mesalib/src/mesa/main/texstate.c | 74 +- mesalib/src/mesa/main/texstore.c | 96 +- mesalib/src/mesa/main/varray.c | 43 +- mesalib/src/mesa/main/version.c | 130 + mesalib/src/mesa/main/version.h | 13 +- mesalib/src/mesa/main/vtxfmt.c | 2 - mesalib/src/mesa/main/vtxfmt_tmp.h | 2 +- mesalib/src/mesa/math/m_debug_clip.c | 44 +- mesalib/src/mesa/math/m_debug_norm.c | 40 +- mesalib/src/mesa/math/m_debug_util.h | 2 +- mesalib/src/mesa/math/m_debug_xform.c | 36 +- mesalib/src/mesa/math/m_matrix.c | 38 +- mesalib/src/mesa/math/m_translate.c | 14 +- mesalib/src/mesa/math/m_vector.c | 20 +- mesalib/src/mesa/shader/arbprogparse.c | 17 +- mesalib/src/mesa/shader/arbprogram.c | 81 +- mesalib/src/mesa/shader/atifragshader.c | 58 +- mesalib/src/mesa/shader/descrip.mms | 4 +- mesalib/src/mesa/shader/grammar/grammar.c | 3178 --------- mesalib/src/mesa/shader/grammar/grammar.h | 103 - mesalib/src/mesa/shader/grammar/grammar_crt.c | 64 - mesalib/src/mesa/shader/grammar/grammar_crt.h | 20 - mesalib/src/mesa/shader/grammar/grammar_mesa.c | 87 - mesalib/src/mesa/shader/grammar/grammar_mesa.h | 43 - mesalib/src/mesa/shader/grammar/grammar_syn.h | 202 - mesalib/src/mesa/shader/hash_table.c | 8 +- mesalib/src/mesa/shader/lex.yy.c | 48 +- mesalib/src/mesa/shader/nvfragparse.c | 48 +- mesalib/src/mesa/shader/nvprogram.c | 14 +- mesalib/src/mesa/shader/nvvertparse.c | 45 +- mesalib/src/mesa/shader/prog_cache.c | 20 +- mesalib/src/mesa/shader/prog_execute.c | 127 +- mesalib/src/mesa/shader/prog_instruction.c | 12 +- mesalib/src/mesa/shader/prog_instruction.h | 5 +- mesalib/src/mesa/shader/prog_optimize.c | 81 +- mesalib/src/mesa/shader/prog_parameter.c | 40 +- mesalib/src/mesa/shader/prog_parameter.h | 1 + mesalib/src/mesa/shader/prog_parameter_layout.c | 16 +- mesalib/src/mesa/shader/prog_print.c | 367 +- mesalib/src/mesa/shader/prog_print.h | 6 + mesalib/src/mesa/shader/prog_statevars.c | 83 +- mesalib/src/mesa/shader/prog_statevars.h | 2 + mesalib/src/mesa/shader/prog_uniform.c | 10 +- mesalib/src/mesa/shader/program.c | 96 +- mesalib/src/mesa/shader/program.h | 24 +- mesalib/src/mesa/shader/program_lexer.l | 18 +- mesalib/src/mesa/shader/program_parse.tab.c | 667 +- mesalib/src/mesa/shader/program_parse.tab.h | 2 +- mesalib/src/mesa/shader/program_parse.y | 135 +- mesalib/src/mesa/shader/program_parse_extra.c | 12 + mesalib/src/mesa/shader/program_parser.h | 10 +- mesalib/src/mesa/shader/programopt.c | 11 +- mesalib/src/mesa/shader/shader_api.c | 100 +- mesalib/src/mesa/shader/slang/descrip.mms | 5 +- mesalib/src/mesa/shader/slang/library/Makefile | 64 +- mesalib/src/mesa/shader/slang/library/gc_to_bin.c | 85 - .../mesa/shader/slang/library/slang_120_core_gc.h | 764 --- .../slang/library/slang_builtin_120_common_gc.h | 108 - .../slang/library/slang_builtin_120_fragment_gc.h | 5 - .../shader/slang/library/slang_common_builtin.gc | 14 +- .../shader/slang/library/slang_common_builtin_gc.h | 880 --- .../src/mesa/shader/slang/library/slang_core_gc.h | 869 --- .../shader/slang/library/slang_fragment_builtin.gc | 64 + .../slang/library/slang_fragment_builtin_gc.h | 110 - .../shader/slang/library/slang_pp_directives.syn | 405 -- .../shader/slang/library/slang_pp_directives_syn.h | 250 - .../shader/slang/library/slang_pp_expression.syn | 265 - .../shader/slang/library/slang_pp_expression_syn.h | 179 - .../mesa/shader/slang/library/slang_pp_version.syn | 122 - .../shader/slang/library/slang_pp_version_syn.h | 69 - .../src/mesa/shader/slang/library/slang_shader.syn | 1716 ----- .../mesa/shader/slang/library/slang_shader_syn.h | 866 --- .../mesa/shader/slang/library/slang_version.syn | 118 - .../shader/slang/library/slang_vertex_builtin.gc | 20 + .../shader/slang/library/slang_vertex_builtin_gc.h | 109 - mesalib/src/mesa/shader/slang/library/syn_to_c.c | 72 - mesalib/src/mesa/shader/slang/slang_builtin.c | 4 +- mesalib/src/mesa/shader/slang/slang_codegen.c | 117 +- mesalib/src/mesa/shader/slang/slang_codegen.h | 1 + mesalib/src/mesa/shader/slang/slang_compile.c | 557 +- .../mesa/shader/slang/slang_compile_operation.c | 7 +- .../src/mesa/shader/slang/slang_compile_variable.c | 2 +- mesalib/src/mesa/shader/slang/slang_emit.c | 120 +- mesalib/src/mesa/shader/slang/slang_label.c | 6 +- mesalib/src/mesa/shader/slang/slang_link.c | 88 +- mesalib/src/mesa/shader/slang/slang_log.c | 11 +- mesalib/src/mesa/shader/slang/slang_mem.c | 20 +- mesalib/src/mesa/shader/slang/slang_preprocess.c | 1406 ---- mesalib/src/mesa/shader/slang/slang_preprocess.h | 41 - mesalib/src/mesa/shader/slang/slang_print.c | 30 +- mesalib/src/mesa/shader/slang/slang_storage.c | 21 +- mesalib/src/mesa/shader/slang/slang_typeinfo.c | 73 +- mesalib/src/mesa/shader/slang/slang_typeinfo.h | 40 +- mesalib/src/mesa/shader/slang/slang_utility.c | 10 +- mesalib/src/mesa/shader/slang/slang_utility.h | 6 +- mesalib/src/mesa/shader/symbol_table.c | 2 +- mesalib/src/mesa/sources.mak | 16 +- mesalib/src/mesa/swrast/s_aaline.c | 50 +- mesalib/src/mesa/swrast/s_aalinetemp.h | 32 - mesalib/src/mesa/swrast/s_aatriangle.c | 102 +- mesalib/src/mesa/swrast/s_aatritemp.h | 60 +- mesalib/src/mesa/swrast/s_accum.c | 19 +- mesalib/src/mesa/swrast/s_alpha.c | 4 +- mesalib/src/mesa/swrast/s_atifragshader.c | 30 +- mesalib/src/mesa/swrast/s_bitmap.c | 20 +- mesalib/src/mesa/swrast/s_blend.c | 2 +- mesalib/src/mesa/swrast/s_blit.c | 36 +- mesalib/src/mesa/swrast/s_clear.c | 149 +- mesalib/src/mesa/swrast/s_context.c | 53 +- mesalib/src/mesa/swrast/s_copypix.c | 167 +- mesalib/src/mesa/swrast/s_depth.c | 60 +- mesalib/src/mesa/swrast/s_drawpix.c | 98 +- mesalib/src/mesa/swrast/s_feedback.c | 3 +- mesalib/src/mesa/swrast/s_fog.c | 97 +- mesalib/src/mesa/swrast/s_fog.h | 4 - mesalib/src/mesa/swrast/s_fragprog.c | 16 +- mesalib/src/mesa/swrast/s_lines.c | 51 +- mesalib/src/mesa/swrast/s_linetemp.h | 19 - mesalib/src/mesa/swrast/s_logic.c | 27 - mesalib/src/mesa/swrast/s_logic.h | 6 - mesalib/src/mesa/swrast/s_masking.c | 51 +- mesalib/src/mesa/swrast/s_masking.h | 7 +- mesalib/src/mesa/swrast/s_points.c | 69 +- mesalib/src/mesa/swrast/s_readpix.c | 96 +- mesalib/src/mesa/swrast/s_span.c | 476 +- mesalib/src/mesa/swrast/s_span.h | 20 +- mesalib/src/mesa/swrast/s_spantemp.h | 16 +- mesalib/src/mesa/swrast/s_stencil.c | 12 +- mesalib/src/mesa/swrast/s_texcombine.c | 23 +- mesalib/src/mesa/swrast/s_texfilter.c | 69 +- mesalib/src/mesa/swrast/s_triangle.c | 29 +- mesalib/src/mesa/swrast/s_tritemp.h | 50 - mesalib/src/mesa/swrast/s_zoom.c | 52 +- mesalib/src/mesa/swrast/s_zoom.h | 4 - mesalib/src/mesa/swrast/swrast.h | 6 - mesalib/src/mesa/swrast_setup/ss_context.c | 23 +- mesalib/src/mesa/swrast_setup/ss_triangle.c | 74 +- mesalib/src/mesa/swrast_setup/ss_tritmp.h | 152 +- mesalib/src/mesa/tnl/t_context.c | 34 +- mesalib/src/mesa/tnl/t_context.h | 22 +- mesalib/src/mesa/tnl/t_draw.c | 68 +- mesalib/src/mesa/tnl/t_pipeline.c | 7 +- mesalib/src/mesa/tnl/t_rasterpos.c | 53 +- mesalib/src/mesa/tnl/t_vb_cliptmp.h | 16 +- mesalib/src/mesa/tnl/t_vb_fog.c | 14 +- mesalib/src/mesa/tnl/t_vb_light.c | 53 +- mesalib/src/mesa/tnl/t_vb_lighttmp.h | 193 +- mesalib/src/mesa/tnl/t_vb_normals.c | 5 +- mesalib/src/mesa/tnl/t_vb_points.c | 6 +- mesalib/src/mesa/tnl/t_vb_program.c | 26 +- mesalib/src/mesa/tnl/t_vb_texgen.c | 3 +- mesalib/src/mesa/tnl/t_vb_texmat.c | 1 - mesalib/src/mesa/tnl/t_vb_vertex.c | 10 +- mesalib/src/mesa/tnl/t_vertex.c | 20 +- mesalib/src/mesa/tnl/t_vertex_generic.c | 54 +- mesalib/src/mesa/tnl/t_vertex_sse.c | 10 +- mesalib/src/mesa/tnl/tnl.h | 2 +- mesalib/src/mesa/vbo/vbo_context.c | 50 +- mesalib/src/mesa/vbo/vbo_exec.c | 3 - mesalib/src/mesa/vbo/vbo_exec_api.c | 44 +- mesalib/src/mesa/vbo/vbo_exec_array.c | 140 +- mesalib/src/mesa/vbo/vbo_exec_draw.c | 49 +- mesalib/src/mesa/vbo/vbo_exec_eval.c | 2 +- mesalib/src/mesa/vbo/vbo_rebase.c | 10 +- mesalib/src/mesa/vbo/vbo_save.c | 13 +- mesalib/src/mesa/vbo/vbo_save_api.c | 30 +- mesalib/src/mesa/vbo/vbo_save_draw.c | 2 +- mesalib/src/mesa/vbo/vbo_save_loopback.c | 17 +- mesalib/src/mesa/vbo/vbo_split.c | 4 +- mesalib/src/mesa/vbo/vbo_split_copy.c | 55 +- mesalib/src/mesa/vbo/vbo_split_inplace.c | 114 +- mesalib/windows/VC8/mesa/gdi/gdi.vcproj | 8 + .../glsl_apps_compile/glsl_apps_compile.vcproj | 304 + mesalib/windows/VC8/mesa/mesa.sln | 13 + mesalib/windows/VC8/mesa/mesa/mesa.vcproj | 548 +- openssl/engines/alpha.opt | 1 + openssl/engines/ia64.opt | 1 + packages.txt | 4 +- xorg-server/hw/xwin/XWin.rc | 2 +- 587 files changed, 33956 insertions(+), 29555 deletions(-) delete mode 100644 mesalib/configs/darwin-x86ppc delete mode 100644 mesalib/configs/linux-directfb delete mode 100644 mesalib/configs/linux-glide create mode 100644 mesalib/configs/linux-i965 create mode 100644 mesalib/configs/linux-llvm-debug create mode 100644 mesalib/configs/linux-opengl-es delete mode 100644 mesalib/configs/linux-solo delete mode 100644 mesalib/configs/linux-solo-ia64 delete mode 100644 mesalib/configs/linux-solo-x86 delete mode 100644 mesalib/configs/linux-x86-glide delete mode 100644 mesalib/docs/MiniGLX.html delete mode 100644 mesalib/docs/README.D3D delete mode 100644 mesalib/docs/README.directfb delete mode 100644 mesalib/docs/demos.html create mode 100644 mesalib/docs/egl.html create mode 100644 mesalib/docs/opengles.html delete mode 100644 mesalib/docs/pbuffers.html create mode 100644 mesalib/docs/relnotes-7.7.1.html create mode 100644 mesalib/docs/relnotes-7.8.html create mode 100644 mesalib/docs/sourcetree.html delete mode 100644 mesalib/include/GL/dmesa.h delete mode 100644 mesalib/include/GL/ggimesa.h delete mode 100644 mesalib/include/GL/svgamesa.h create mode 100644 mesalib/include/KHR/khrplatform.h create mode 100644 mesalib/include/VG/openvg.h create mode 100644 mesalib/include/VG/vgext.h create mode 100644 mesalib/include/VG/vgplatform.h create mode 100644 mesalib/include/VG/vgu.h create mode 100644 mesalib/src/glsl/Makefile create mode 100644 mesalib/src/glsl/Makefile.template create mode 100644 mesalib/src/glsl/SConscript create mode 100644 mesalib/src/glsl/apps/Makefile create mode 100644 mesalib/src/glsl/apps/compile.c create mode 100644 mesalib/src/glsl/apps/process.c create mode 100644 mesalib/src/glsl/apps/purify.c create mode 100644 mesalib/src/glsl/apps/tokenise.c create mode 100644 mesalib/src/glsl/apps/version.c create mode 100644 mesalib/src/glsl/cl/Makefile create mode 100644 mesalib/src/glsl/cl/sl_cl_parse.c create mode 100644 mesalib/src/glsl/cl/sl_cl_parse.h create mode 100644 mesalib/src/glsl/pp/Makefile create mode 100644 mesalib/src/glsl/pp/sl_pp_context.c create mode 100644 mesalib/src/glsl/pp/sl_pp_context.h create mode 100644 mesalib/src/glsl/pp/sl_pp_define.c create mode 100644 mesalib/src/glsl/pp/sl_pp_dict.c create mode 100644 mesalib/src/glsl/pp/sl_pp_dict.h create mode 100644 mesalib/src/glsl/pp/sl_pp_error.c create mode 100644 mesalib/src/glsl/pp/sl_pp_expression.c create mode 100644 mesalib/src/glsl/pp/sl_pp_expression.h create mode 100644 mesalib/src/glsl/pp/sl_pp_extension.c create mode 100644 mesalib/src/glsl/pp/sl_pp_if.c create mode 100644 mesalib/src/glsl/pp/sl_pp_line.c create mode 100644 mesalib/src/glsl/pp/sl_pp_macro.c create mode 100644 mesalib/src/glsl/pp/sl_pp_macro.h create mode 100644 mesalib/src/glsl/pp/sl_pp_pragma.c create mode 100644 mesalib/src/glsl/pp/sl_pp_process.c create mode 100644 mesalib/src/glsl/pp/sl_pp_process.h create mode 100644 mesalib/src/glsl/pp/sl_pp_public.h create mode 100644 mesalib/src/glsl/pp/sl_pp_purify.c create mode 100644 mesalib/src/glsl/pp/sl_pp_purify.h create mode 100644 mesalib/src/glsl/pp/sl_pp_token.c create mode 100644 mesalib/src/glsl/pp/sl_pp_token.h create mode 100644 mesalib/src/glsl/pp/sl_pp_token_util.c create mode 100644 mesalib/src/glsl/pp/sl_pp_token_util.h create mode 100644 mesalib/src/glsl/pp/sl_pp_version.c delete mode 100644 mesalib/src/mesa/glapi/dispatch.h create mode 100644 mesalib/src/mesa/glapi/glapi_dispatch.c create mode 100644 mesalib/src/mesa/glapi/glapi_nop.c create mode 100644 mesalib/src/mesa/main/condrender.c create mode 100644 mesalib/src/mesa/main/condrender.h delete mode 100644 mesalib/src/mesa/main/dispatch.c create mode 100644 mesalib/src/mesa/main/dispatch.h create mode 100644 mesalib/src/mesa/main/version.c delete mode 100644 mesalib/src/mesa/shader/grammar/grammar.c delete mode 100644 mesalib/src/mesa/shader/grammar/grammar.h delete mode 100644 mesalib/src/mesa/shader/grammar/grammar_crt.c delete mode 100644 mesalib/src/mesa/shader/grammar/grammar_crt.h delete mode 100644 mesalib/src/mesa/shader/grammar/grammar_mesa.c delete mode 100644 mesalib/src/mesa/shader/grammar/grammar_mesa.h delete mode 100644 mesalib/src/mesa/shader/grammar/grammar_syn.h delete mode 100644 mesalib/src/mesa/shader/slang/library/gc_to_bin.c delete mode 100644 mesalib/src/mesa/shader/slang/library/slang_120_core_gc.h delete mode 100644 mesalib/src/mesa/shader/slang/library/slang_builtin_120_common_gc.h delete mode 100644 mesalib/src/mesa/shader/slang/library/slang_builtin_120_fragment_gc.h delete mode 100644 mesalib/src/mesa/shader/slang/library/slang_common_builtin_gc.h delete mode 100644 mesalib/src/mesa/shader/slang/library/slang_core_gc.h delete mode 100644 mesalib/src/mesa/shader/slang/library/slang_fragment_builtin_gc.h delete mode 100644 mesalib/src/mesa/shader/slang/library/slang_pp_directives.syn delete mode 100644 mesalib/src/mesa/shader/slang/library/slang_pp_directives_syn.h delete mode 100644 mesalib/src/mesa/shader/slang/library/slang_pp_expression.syn delete mode 100644 mesalib/src/mesa/shader/slang/library/slang_pp_expression_syn.h delete mode 100644 mesalib/src/mesa/shader/slang/library/slang_pp_version.syn delete mode 100644 mesalib/src/mesa/shader/slang/library/slang_pp_version_syn.h delete mode 100644 mesalib/src/mesa/shader/slang/library/slang_shader.syn delete mode 100644 mesalib/src/mesa/shader/slang/library/slang_shader_syn.h delete mode 100644 mesalib/src/mesa/shader/slang/library/slang_version.syn delete mode 100644 mesalib/src/mesa/shader/slang/library/slang_vertex_builtin_gc.h delete mode 100644 mesalib/src/mesa/shader/slang/library/syn_to_c.c delete mode 100644 mesalib/src/mesa/shader/slang/slang_preprocess.c delete mode 100644 mesalib/src/mesa/shader/slang/slang_preprocess.h create mode 100644 mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcproj create mode 100644 openssl/engines/alpha.opt create mode 100644 openssl/engines/ia64.opt diff --git a/freetype/ChangeLog b/freetype/ChangeLog index 040789053..83a7d53c6 100644 --- a/freetype/ChangeLog +++ b/freetype/ChangeLog @@ -1,3 +1,461 @@ +2010-02-13 Werner Lemberg + + * Version 2.3.12 released. + ========================== + + + Tag sources with `VER-2-3-12'. + + * docs/CHANGES: Updated. + + * docs/VERSION.DLL: Update documentation and bump version number to + 2.3.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/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.11/2.3.12/, s/2311/2312/. + + * include/freetype/freetype.h (FREETYPE_PATCH): Set to 12. + + * builds/unix/configure.raw (version_info): Set to 10:0:4. + +2010-02-12 suzuki toshiya + + Improve autotool version checking to work with beta releases. + + * autogen.sh (check_tool_version): Improve the extraction of version + number from "tool --version" output. Some beta releases of + autotools have extra strings before version number. + +2010-02-12 suzuki toshiya + + Fix overallocating bug in FT_Outline_New_Internal(). + + * src/base/ftoutln.c (FT_Outline_New_Internal): The length of + FT_Outline->points[] should be numPoints, not 2 * numPoints. + Found by Paul Messmer, see + http://lists.gnu.org/archive/html/freetype-devel/2010-02/msg00003.html + +2010-02-10 Ken Sharp + + Really fix Savannah bug #28678 (part 2). + + Since we consider `sbw' for the horizontal direction only, we still have + to synthesize vertical metrics if the user wants to use the vertical + writing direction. + + * src/cff/cffgload.c (cff_slot_load), src/cid/cidgload.c + (cid_slot_load_glyph), src/type1/t1gload.c (T1_Load_Glyph): + Synthesize vertical metrics (only) if FT_LOAD_VERTICAL_LAYOUT is + set. + +2010-02-10 Ken Sharp + + Really fix Savannah bug #28678 (part 1). + + After long discussion, we now consider the character width vector + (wx,wy) returned by the `sbw' Type 1 operator as being part of *one* + direction only. For example, if you are using the horizontal + writing direction, you get the horizontal and vertical components of + the advance width for this direction. Note that OpenType and CFF fonts + don't have such a vertical component; instead, the GPOS table can be + used to generate two-dimensional advance widths (but this isn't + handled by FreeType). + + * include/freetype/ftincrem.h (FT_Incremental_MetricsRec): Add + `advance_v' field to hold the vertical component of the advance + value. + + * src/truetype/ttgload.c (tt_get_metrics), src/cff/cffgload.c + (cff_slot_load), src/type1/t1gload.c + (T1_Parse_Glyph_And_Get_Char_String), src/cid/cidgload.c + (cid_load_glyph): Use it. + +2010-02-08 Werner Lemberg + + * devel/ftoption.h [FT_CONFIG_OPTION_PIC]: Define. + +2010-02-04 suzuki toshiya + + Prevent NULL pointer dereference passed to FT_Module_Requester. + + * src/sfnt/sfdriver.c (sfnt_get_interface): Don't use `module'. + * src/psnames/psmodule.c (psnames_get_interface): Ditto. + + * src/cff/cffdrivr.c (cff_get_interface): Check NULL `driver'. + * src/truetype/ttdriver.c (tt_get_interface): Ditto. + +2010-01-29 suzuki toshiya + + Fix memory leaks in previous patch. + + * src/sfnt/sfobjs.c (sfnt_load_face): Don't overwrite the strings + allocated for face->root.family_name and style_name. + +2010-01-29 suzuki toshiya + + New parameters for FT_Open_Face() to ignore preferred family names. + + Preferred family names should be used for legacy systems that + can hold only a few faces (<= 4) for a family name. Suggested by + Andreas Heinrich. + http://lists.gnu.org/archive/html/freetype/2010-01/msg00001.html + + * include/freetype/ftsnames.h (FT_PARAM_TAG_IGNORE_PREFERRED_FAMILY, + FT_PARAM_TAG_IGNORE_PREFERRED_SUBFAMILY): Define. + + * src/sfnt/sfobjs.h (sfnt_load_face): Check the arguments and + ignore preferred family and subfamily names if requested. + +2010-01-27 Ken Sharp + + Fix Savannah bug #28678. + + * src/cff/cffgload.c (cff_slot_load), src/cid/cidgload.c + (cid_load_glyph): Handle vertical metrics correctly. + + * src/type1/t1gload.c (T1_Parse_Glyph_And_Get_Char_String): Handle + vertical metrics correctly. + (T1_Load_Glyph): Don't synthesize vertical metrics. + +2010-01-14 Werner Lemberg + + Make FT_Set_Transform work if no renderer is available. + + * src/base/ftobjs.c (FT_Load_Glyph): Apply `standard' transformation + if no renderer is compiled into the library. + +2010-01-14 Werner Lemberg + + Fix compilation warning. + + * src/base/ftbase.h: s/LOCAL_DEF/LOCAL/. + * src/base/ftobjc.s: Include ftbase.h conditionally. + +2010-01-11 Kwang Yul Seo + + Provide inline assembly code for RVCT compiler. + This is Savannah patch #7059. + + * include/freetype/config/ftconfig.h (FT_MULFIX_ASSEMBLER, + FT_MulFix_arm) [__CC_ARM || __ARM_CC]: Define. + +2010-01-08 Ken Sharp + + Fix Savannah bug #28521. + + Issue #28226 involved a work-around for a font which used the + `setcurrentpoint' operator in an invalid way; this operator is only + supposed to be used with the result of OtherSubrs, and the font used + it directly. The supplied patch removed the block of code which + checked this usage entirely. + + This turns out to be a Bad Thing. If `setcurrentpoint' is being + used correctly it should reset the flex flag in the decoder. If we + don't do this then the flag never gets reset and we omit any further + contours from the glyph (at least until we close the path or + similar). + + * src/psaux/t1decode.c (t1_decoder_parse_charstrings) + : Handle `flex_state' correctly. + +2010-01-05 Werner Lemberg + + Apply reports from clang static analyzer. + + * src/lzw/ftlzw.c (ft_lzw_file_init), src/base/ftstroke.c + (FT_Stroker_ParseOutline), src/base/ftsynth.c + (FT_GlyphSlot_Embolden): Remove dead code. + + * src/base/ftpatent.c (_tt_check_patents_in_table): Initialize + `offset_i' and `length_i'. + +2010-01-05 Ralph Giles + + Enable the incremental font interface by default. + + Ghostscript requires the incremental font interface for handling + some Postscript documents. It is moving to using FreeType as its + primary renderer; supporting this in the default build makes it + Ghostscript to be linked against the system FreeType when one is + available. + + * include/freetype/config/ftoption.h (FT_CONFIG_OPTION_INCREMENTAL): + Uncomment. + +2010-01-05 Werner Lemberg + + Fix Savannah bug #28395. + + * src/truetype/ttdriver.c (Load_Glyph), src/type1/t1gload.c + (T1_Loada_Glyph): Don't check `num_glyphs' if incremental interface + is used. + +2010-01-05 Ken Sharp + + Make Type 1 `seac' operator work with incremental interface. + This fixes Savannah bug #28480. + + * src/psaux/t1decode.c (t1operator_seac): Don't check `glyph_names' + if incremental interface is used. + +2010-01-04 Ken Sharp + + Make incremental interface work with TrueType fonts. + This fixes Savannah bug #28478. + + * src/truetype/ttgload.c (load_truetype_glyph): Don't check + `glyf_offset' if incremental interface is used. + +2009-12-31 Lars Abrahamsson + + Make compilation with FT_CONFIG_OPTION_PIC work again. + + * src/base/ftglyph.c (FT_Glyph_To_Bitmap) [FT_CONFIG_OPTION_PIC]: + Declare `library' for FT_BITMAP_GLYPH_CLASS_GET. + + * src/base/ftinit.c (ft_destroy_default_module_classes, + ft_create_default_module_classes): Use proper casts (needed for C++ + compilation). + + * src/sfnt/ttcmap.c (tt_cmap13_class_rec): Use FT_DEFINE_TT_CMAP. + +2009-12-22 Marc Kleine-Budde + + Make freetype-config aware of $SYSROOT. + This is Savannah patch #7040. + + * builds/unix/freetype-config.in: Decorate with ${SYSROOT} where + appropriate. + +2009-12-20 Werner Lemberg + + Fix compiler warning. + Reported by Sean. + + * src/base/ftdbgmem.c [!FT_DEBUG_MEMORY]: ANSI C doesn't like empty + source files; however, some compilers warn about an unused variable + declaration. This is now replaced with a typedef. + +2009-12-18 Werner Lemberg + + Fix Savannah bug #28320. + + There exist corrupt, subsetted fonts (embedded in PDF files) which + contain a private dict that ends with an unterminated floating point + number (no operator following). We now ignore this error (as + acrobat does). + + * src/cff/cffparse.c (cff_parser_run): Don't emit a syntax error for + unterminated floating point numbers. + +2009-12-16 Werner Lemberg + + Really fix compiler warnings. + Reported by Sean. + + * src/truetype/ttgxvar.c (GX_PT_POINTS_ARE_WORDS, + GX_PT_POINT_RUN_COUNT_MASK): Convert enum values to macros. + +2009-12-16 suzuki toshiya + + Improve configure.raw to copy some options from CFLAGS to LDFLAGS. + The linker of Mac OS X 10.6 is sensitive to the architecture. If + the architectures are specified explicitly for the C compiler, the + linker requires the architecture specifications too. + + * builds/unix/configure.raw: Replace `-isysroot' option parser by + more generic argument parser. + +2009-12-15 Werner Lemberg + + Fix compiler warnings. + Reported by Sean. + + * src/truetype/ttgxvar.c (ft_var_readpackeddeltas): Fix counter data + type. + +2009-12-14 Ken Sharp + + Ignore invalid `setcurrentpoint' operations in Type 1 fonts. + This fixes Savannah bug #28226. + + At least two wild PostScript files of unknown provenance contain + Type 1 fonts, apparently converted from TrueType fonts in earlier + PDF versions of the files, which use the `setcurrentpoint' operator + inappropriately. + + FreeType currently throws an error in this case, but Ghostscript and + Adobe Distiller both accept the fonts and ignore the problem. This + commit #ifdefs out the check so PostScript interpreters using + FreeType can render these files. + + The specification says `setcurrentpoint' should only be used to set + the point after a `Subr' call, but these fonts use it to set the + initial point to (0,0). Unnecessarily so, as they correctly use an + `hsbw' operation which implicitly sets the initial point. + + * src/psaux/t1decode.c (t1_decoder_parse_charstrings) + : Comment out code. + +2009-12-14 Bram Tassyns + + Fix parsing of /CIDFontVersion. + This fixes Savannah bug #28287. + + * src/cid/cidtoken.h: `cid_version' in CID_FaceInfoRec (in + t1tables.h) is of type FT_Fixed. + +2009-12-14 Werner Lemberg + + Trace glyph index in CID module. + Suggested in Savannah patch #7023. + + * src/cid/cidgload.c (cid_load_glyph): Add tracing message. + +2009-12-03 Werner Lemberg + + Fix compiler warnings. + + * src/truetype/ttgload.c (tt_get_metrics): Put `Exit' label into the + proper preprocessor conditional. + * src/pfr/pfrobjs.c (pfr_slot_load): Pacify gcc. + +2009-11-25 John Tytgat + + Better handling of start of `eexec' section. + This fixes Savannah bug #28090. + + * src/type1/t1parse.c (T1_Get_Private_Dict): Skip all whitespace + characters before start of `eexec' section. + +2009-11-20 Werner Lemberg + + Fix Savannah bug #27742. + + * src/base/ftstroke.c (ft_stroker_outside): Avoid silent division by + zero, using a threshold for `theta'. + +2009-11-20 Werner Lemberg + + Fix Savannah bug #28036. + + * src/type1/t1afm.c (t1_get_index): Fix comparison. + +2009-11-16 Werner Lemberg + + Fix compiler warnings. + Reported by Kevin Blenkinsopp . + + * src/sfnt/ttload.c (check_table_dir): Use proper data type. + +2009-11-15 Werner Lemberg + + Really fix FreeDesktop bug #21197. + This also fixes Savannah bug #28021. + + * src/autofit/aflatin.c (af_latin_metrics_check_digits), + src/autofit/aflatin2.c (af_latin2_metrics_check_digits): Fix loop. + +2009-11-15 Werner Lemberg + + Add tracing messages for advance values. + + * src/base/ftobjs.c (FT_Load_Glyph), src/truetype/ttgload.c + (TT_Get_HMetrics, TT_Get_VMetrics): Do it. + +2009-11-08 Werner Lemberg + + Fix compiler warning. + Reported by Jeremy Manson . + + * src/truetype/ttgload.c (load_truetype_glyph): Initialize `error'. + +2009-11-04 Werner Lemberg + + Remove compiler warning. + Reported by Sean McBride . + + * src/tools/apinames.c (read_header_file): Use a cast to + `int', as specified in the printf(3) man page. + +2009-11-04 Werner Lemberg + + Fix Savannah bug #27921. + + * src/cff/cffobjs.c (cff_face_init), src/cid/cidobjs.c + (cid_face_init), src/type1/t1afm.c (T1_Read_Metrics), + src/type1/t1objs.c (T1_Face_Init): Don't use unsigned constant + values for rounding if the argument can be negative. + +2009-11-03 Bram Tassyns + + Add basic support for Type1 charstrings in CFF. + This fixes Savannah bug #27922. + + * src/cff/cffgload.c (CFF_Operator, cff_argument_counts): Handle + `seac', `sbw', and `setcurrentpoint' opcodes. + (cff_compute_bias): Add parameter to indicate the charstring type. + Update all callers. + (cff_operator_seac): Add parameter for side bearing. + (cff_decoder_parse_charstrings): Updated for more Type1 support. + +2009-11-03 Werner Lemberg + + Return correct `linearHoriAdvance' value for embedded TT bitmaps too. + Reported by Jeremy Manson . + + src/truetype/ttgload.c (load_truetype_glyph): Add parameter to + quickly load the glyph header only. + Update all callers. + (tt_loader_init): Add parameter to quickly load the `glyf' table + only. + Update all callers. + (TT_Load_Glyph): Compute linear advance values for embedded bitmap + glyphs too. + +2009-11-03 Werner Lemberg + + Improve code readability. + + * src/ttgload.c (load_truetype_glyph): Move metrics calculation + to... + (tt_get_metrics): This new function. + +2009-10-26 Bram Tassyns + + Fix Savannah bug #27811. + + * src/truetype/ttxgvar.c (ft_var_readpackeddeltas): Fix + signed/unsigned mismatch. + +2009-10-19 Ning Dong + + Fix handling of `get' and `put' CFF instructions. + + * src/cff/cffgload.c (cff_decoder_parse_charstrings) : Appendix B of Adobe Technote #5177 limits the number of + elements for the `get' and `put' operators to 32. + * src/cff/cffgload.h (CFF_MAX_TRANS_ELEMENTS): Define. + (CFF_Decoder): Use it for `buildchar' and remove `len_buildchar'. + +2009-10-18 Werner Lemberg + + Fix handling of `dup' CFF instruction. + Problem and solution reported by Ning Dong . + + * src/cff/cffgload.c (cff_decoder_parse_charstrings) : + Increase `args' by 2, not 1. + 2009-10-10 Werner Lemberg * Version 2.3.11 released. @@ -67,13 +525,13 @@ 2009-09-27 suzuki toshiya [cache] Fix Savannah bug #27441, clean up Redhat bugzilla #513582. - Tricky casts in FTC_{CACHE,GCACHE,MRULIST}_LOOKUP_CMP() are removed. + Tricky casts in FTC_{CACHE,GCACHE,MRULIST}_LOOKUP_CMP() are removed. Now these functions should be called with FTC_Node or FTC_MruNode variable, and the caller should cast them to appropriate pointers to concrete data. These tricky casts can GCC-4.4 optimizer (-O2) confused and the crashing binaries are generated. - * src/cache/ftcmru.h (FTC_MRULIST_LOOKUP_CMP): Drop tricky cast. + * src/cache/ftcmru.h (FTC_MRULIST_LOOKUP_CMP): Drop tricky cast. Now the 4th argument `node' of this function should be typed as FTC_MruNode. @@ -624,7 +1082,7 @@ * include/freetype/internal/tttypes.h: The type of TT_BDF->string_size is extended from FT_UInt32 - to FT_ULong, because BDF specification does not + to FT_ULong, because BDF specification does not restrict the length of string. * src/sfnt/ttbdf.c: The scratch variable `strings' to load TT_BDF->string_size is matched with @@ -796,7 +1254,7 @@ and `rem' are changed to TCoord, because their values are set with explicit casts to TCoord. When ras.area is updated by the differential values including - `delta', they are explicitly casted to TArea, because + `delta', they are explicitly cast to TArea, because the type of `delta' is not TArea but TCoord. (gray_render_line): The type of `mod' is extended from int to TCoord, because (TCoord)dy is added to mod. @@ -971,8 +1429,8 @@ * src/base/fttrigon.c (ft_trig_downscale): The FT_Fixed variable `val' and unsigned long constant FT_TRIG_SCALE - are casted to FT_UInt32, when calculates FT_UInt32. - (FT_Vector_Rotate): The long constant 1L is casted to + are cast to FT_UInt32, when calculates FT_UInt32. + (FT_Vector_Rotate): The long constant 1L is cast to FT_Int32 to calculate FT_Int32 `half'. 2009-07-31 suzuki toshiya @@ -1015,7 +1473,7 @@ `code' is matched to PCF_Encoding->enc. (pcf_cmap_char_next): The type of `charcode' is matched to PCF_Encoding->enc. When *acharcode is set by charcode, - an overflow is checked and casted to unsigned 32-bit + an overflow is checked and cast to unsigned 32-bit integer. 2009-07-31 suzuki toshiya @@ -1046,7 +1504,7 @@ (bdf_cmap_char_next): The type of `charcode' is matched with BDF_encoding_el->enc. When *acharcode is set by charcode, an overflow is checked and - casted to unsigned 32-bit integer. + cast to unsigned 32-bit integer. 2009-07-31 suzuki toshiya @@ -1174,7 +1632,7 @@ * afmparse.c (afm_parser_read_vals): To call AFM_ParserRec.get_index, the length of token - `len' is casted to size_t. + `len' is cast to size_t. 2009-07-31 suzuki toshiya @@ -1304,7 +1762,7 @@ * src/gzip/ftgzip.c (zcalloc, zcfree): Disable all zcalloc() & zfree() by zlib in zutil.c, those in - ftgzip.c by FT2 are enabled by default. To use + ftgzip.c by FT2 are enabled by default. To use zlib zcalloc() & zfree(), define USE_ZLIB_ZCALLOC. See discussion: http://lists.gnu.org/archive/html/freetype-devel/2009-02/msg00000.html @@ -1494,7 +1952,7 @@ the check for too large glyph. Replace the pair of `pitch' and `height' by the pair of `width' and `height'. `pitch' cannot be greater than `height'. The required is checking the product - `pitch' * `height' <= FT_ULONG_MAX, but we use cheap checks for + `pitch' * `height' <= FT_ULONG_MAX, but we use cheap checks for the realistic case only. 2009-07-09 suzuki toshiya @@ -1610,7 +2068,7 @@ Improve configure.raw for cross-building on exe-suffixed systems. * builds/unix/configure.raw: Fix a bug in sed script to extract - native suffix for binary executables, patch by Peter Breitenlohner. + native suffix for binary executables, patch by Peter Breitenlohner. http://lists.gnu.org/archive/html/freetype-devel/2009-04/msg00036.html 2009-06-26 Werner Lemberg @@ -1949,7 +2407,7 @@ 2009-04-21 Karl Berry Fix AC_CHECK_FT2. - + * builds/unix/freetype2.m4: Only check PATH for freetype-config if we did not already find it from a prefix option. @@ -1957,7 +2415,7 @@ Add #error to modules and files that do not support PIC yet. - When FT_CONFIG_OPTION_PIC is defined the following files will + When FT_CONFIG_OPTION_PIC is defined the following files will create #error: * src/bdf/bdfdrivr.h * src/cache/ftcmanag.c @@ -1977,15 +2435,15 @@ Position Independent Code (PIC) support in autofit module. - * include/freetype/internal/autohint.h add macros to init + * include/freetype/internal/autohint.h add macros to init instances of FT_AutoHinter_ServiceRec. - * src/autofit/afmodule.h declare autofit_module_class - using macros from ftmodapi.h, + * src/autofit/afmodule.h declare autofit_module_class + using macros from ftmodapi.h, when FT_CONFIG_OPTION_PIC is defined create and destroy functions will be declared. - * src/autofit/afmodule.c when FT_CONFIG_OPTION_PIC is defined - af_autofitter_service and autofit_module_class structs + * src/autofit/afmodule.c when FT_CONFIG_OPTION_PIC is defined + af_autofitter_service and autofit_module_class structs will have functions to init or create and destroy them instead of being allocated in the global scope. And macros will be used from afpic.h in order to access them. @@ -1993,54 +2451,54 @@ * src/autofit/aftypes.h add macros to init and declare instances of AF_ScriptClassRec. - * src/autofit/afcjk.h declare af_cjk_script_class - using macros from aftypes.h, + * src/autofit/afcjk.h declare af_cjk_script_class + using macros from aftypes.h, when FT_CONFIG_OPTION_PIC is defined init function will be declared. - * src/autofit/afcjk.c when FT_CONFIG_OPTION_PIC is defined - af_cjk_script_class struct will have function to init it instead of + * src/autofit/afcjk.c when FT_CONFIG_OPTION_PIC is defined + af_cjk_script_class struct will have function to init it instead of being allocated in the global scope. - * src/autofit/afdummy.h declare af_dummy_script_class - using macros from aftypes.h, + * src/autofit/afdummy.h declare af_dummy_script_class + using macros from aftypes.h, when FT_CONFIG_OPTION_PIC is defined init function will be declared. - * src/autofit/afdummy.c when FT_CONFIG_OPTION_PIC is defined - af_dummy_script_class struct will have function to init it instead of + * src/autofit/afdummy.c when FT_CONFIG_OPTION_PIC is defined + af_dummy_script_class struct will have function to init it instead of being allocated in the global scope. - * src/autofit/afindic.h declare af_indic_script_class - using macros from aftypes.h, + * src/autofit/afindic.h declare af_indic_script_class + using macros from aftypes.h, when FT_CONFIG_OPTION_PIC is defined init function will be declared. - * src/autofit/afindic.c when FT_CONFIG_OPTION_PIC is defined - af_indic_script_class struct will have function to init it instead of + * src/autofit/afindic.c when FT_CONFIG_OPTION_PIC is defined + af_indic_script_class struct will have function to init it instead of being allocated in the global scope. - * src/autofit/aflatin.h declare af_latin_script_class - using macros from aftypes.h, + * src/autofit/aflatin.h declare af_latin_script_class + using macros from aftypes.h, when FT_CONFIG_OPTION_PIC is defined init function will be declared. - * src/autofit/aflatin.c when FT_CONFIG_OPTION_PIC is defined - af_latin_script_class struct will have function to init it instead of + * src/autofit/aflatin.c when FT_CONFIG_OPTION_PIC is defined + af_latin_script_class struct will have function to init it instead of being allocated in the global scope. - Change af_latin_blue_chars to be PIC-compatible by being a two + Change af_latin_blue_chars to be PIC-compatible by being a two dimentional array rather than array of pointers. - * src/autofit/aflatin2.h declare af_latin2_script_class - using macros from aftypes.h, + * src/autofit/aflatin2.h declare af_latin2_script_class + using macros from aftypes.h, when FT_CONFIG_OPTION_PIC is defined init function will be declared. - * src/autofit/aflatin2.c when FT_CONFIG_OPTION_PIC is defined - af_latin2_script_class struct will have function to init it instead of + * src/autofit/aflatin2.c when FT_CONFIG_OPTION_PIC is defined + af_latin2_script_class struct will have function to init it instead of being allocated in the global scope. - Change af_latin2_blue_chars to be PIC-compatible by being a two + Change af_latin2_blue_chars to be PIC-compatible by being a two dimentional array rather than array of pointers. - * src/autofit/afglobal.c when FT_CONFIG_OPTION_PIC is defined + * src/autofit/afglobal.c when FT_CONFIG_OPTION_PIC is defined af_script_classes array initialization was moved to afpic.c and is later refered using macros defeined in afpic.h. New Files: * src/autofit/afpic.h declare struct to hold PIC globals for autofit module and macros to access them. - * src/autofit/afpic.c implement functions to allocate, destroy and + * src/autofit/afpic.c implement functions to allocate, destroy and initialize PIC globals for autofit module. * src/autofit/autofit.c add new file to build: afpic.c. @@ -2050,15 +2508,15 @@ Position Independent Code (PIC) support in pshinter module. - * include/freetype/internal/pshints.h add macros to init + * include/freetype/internal/pshints.h add macros to init instances of PSHinter_Interface. - * src/pshinter/pshmod.h declare pshinter_module_class - using macros from ftmodapi.h, + * src/pshinter/pshmod.h declare pshinter_module_class + using macros from ftmodapi.h, when FT_CONFIG_OPTION_PIC is defined create and destroy functions will be declared. - * src/pshinter/pshmod.c when FT_CONFIG_OPTION_PIC is defined - pshinter_interface and pshinter_module_class structs + * src/pshinter/pshmod.c when FT_CONFIG_OPTION_PIC is defined + pshinter_interface and pshinter_module_class structs will have functions to init or create and destroy them instead of being allocated in the global scope. And macros will be used from pshpic.h in order to access them. @@ -2066,7 +2524,7 @@ New Files: * src/pshinter/pshpic.h declare struct to hold PIC globals for pshinter module and macros to access them. - * src/pshinter/pshpic.c implement functions to allocate, destroy and + * src/pshinter/pshpic.c implement functions to allocate, destroy and initialize PIC globals for pshinter module. * src/pshinter/pshinter.c add new file to build: pshpic.c. @@ -2076,15 +2534,15 @@ Position Independent Code (PIC) support in psnames module. - * include/freetype/internal/services/svpscmap.h add macros to init + * include/freetype/internal/services/svpscmap.h add macros to init instances of FT_Service_PsCMapsRec. - * src/psnames/psmodule.h declare psnames_module_class - using macros from ftmodapi.h, + * src/psnames/psmodule.h declare psnames_module_class + using macros from ftmodapi.h, when FT_CONFIG_OPTION_PIC is defined create and destroy functions will be declared. - * src/psnames/psmodule.c when FT_CONFIG_OPTION_PIC is defined - pscmaps_interface and pscmaps_services structs + * src/psnames/psmodule.c when FT_CONFIG_OPTION_PIC is defined + pscmaps_interface and pscmaps_services structs and psnames_module_class array will have functions to init or create and destroy them instead of being allocated in the global scope. @@ -2093,7 +2551,7 @@ New Files: * src/psnames/pspic.h declare struct to hold PIC globals for psnames module and macros to access them. - * src/psnames/pspic.c implement functions to allocate, destroy and + * src/psnames/pspic.c implement functions to allocate, destroy and initialize PIC globals for psnames module. * src/psnames/psnames.c add new file to build: pspic.c. @@ -2103,29 +2561,29 @@ Position Independent Code (PIC) support in raster renderer. - * src/raster/ftrend1.h declare ft_raster1_renderer_class - and ft_raster5_renderer_class - using macros from ftrender.h, + * src/raster/ftrend1.h declare ft_raster1_renderer_class + and ft_raster5_renderer_class + using macros from ftrender.h, when FT_CONFIG_OPTION_PIC is defined create and destroy functions will be declared. - * src/smooth/ftrend1.c when FT_CONFIG_OPTION_PIC is defined + * src/smooth/ftrend1.c when FT_CONFIG_OPTION_PIC is defined ft_raster1_renderer_class and ft_raster5_renderer_class structs will have functions to init or create and destroy them instead of being allocated in the global scope. - Macros will be used from rastpic.h in order to access + Macros will be used from rastpic.h in order to access ft_standard_raster from the pic_container (allocated in ftraster.c). - In ft_raster1_render when PIC is enabled, the last letter of + In ft_raster1_render when PIC is enabled, the last letter of module_name is used to verfy the renderer class rather than the class pointer. - * src/raster/ftraster.c when FT_CONFIG_OPTION_PIC is defined + * src/raster/ftraster.c when FT_CONFIG_OPTION_PIC is defined ft_standard_raster struct will have function to init it instead of being allocated in the global scope. New Files: * src/raster/rastpic.h declare struct to hold PIC globals for raster renderer and macros to access them. - * src/raster/rastpic.c implement functions to allocate, destroy and + * src/raster/rastpic.c implement functions to allocate, destroy and initialize PIC globals for raster renderer. * src/raster/raster.c add new file to build: rastpic.c. @@ -2135,35 +2593,35 @@ Position Independent Code (PIC) support in smooth renderer. - * src/smooth/ftsmooth.h declare ft_smooth_renderer_class, - ft_smooth_lcd_renderer_class and ft_smooth_lcd_v_renderer_class - using macros from ftrender.h, + * src/smooth/ftsmooth.h declare ft_smooth_renderer_class, + ft_smooth_lcd_renderer_class and ft_smooth_lcd_v_renderer_class + using macros from ftrender.h, when FT_CONFIG_OPTION_PIC is defined create and destroy functions will be declared. - * src/smooth/ftsmooth.c when FT_CONFIG_OPTION_PIC is defined - the following structs: - ft_smooth_renderer_class, ft_smooth_lcd_renderer_class - and ft_smooth_lcd_v_renderer_class + * src/smooth/ftsmooth.c when FT_CONFIG_OPTION_PIC is defined + the following structs: + ft_smooth_renderer_class, ft_smooth_lcd_renderer_class + and ft_smooth_lcd_v_renderer_class will have functions to init or create and destroy them instead of being allocated in the global scope. - And macros will be used from ftspic.h in order to access + And macros will be used from ftspic.h in order to access ft_grays_raster from the pic_container (allocated in ftgrays.c). * src/smooth/ftgrays.h include FT_CONFIG_CONFIG_H - * src/smooth/ftgrays.c when FT_CONFIG_OPTION_PIC is NOT defined - func_interface was moved from gray_convert_glyph_inner function + * src/smooth/ftgrays.c when FT_CONFIG_OPTION_PIC is NOT defined + func_interface was moved from gray_convert_glyph_inner function to the global scope. - When FT_CONFIG_OPTION_PIC is defined + When FT_CONFIG_OPTION_PIC is defined func_interface and ft_grays_raster structs will have functions to init them instead of being allocated in the global scope. - And func_interface will be allocated on the stack of + And func_interface will be allocated on the stack of gray_convert_glyph_inner. New Files: * src/smooth/ftspic.h declare struct to hold PIC globals for smooth renderer and macros to access them. - * src/smooth/ftspic.c implement functions to allocate, destroy and + * src/smooth/ftspic.c implement functions to allocate, destroy and initialize PIC globals for smooth renderer. * src/smooth/smooth.c add new file to build: ftspic.c. @@ -2173,17 +2631,17 @@ Position Independent Code (PIC) support in cff driver. - * include/freetype/internal/services/svcid.h add macros to init + * include/freetype/internal/services/svcid.h add macros to init instances of FT_Service_CIDRec. - * include/freetype/internal/services/svpsinfo.h add macros to init + * include/freetype/internal/services/svpsinfo.h add macros to init instances of FT_Service_PsInfoRec. * src/cff/cffcmap.h declare cff_cmap_encoding_class_rec and cff_cmap_unicode_class_rec using macros from ftobjs.h, when FT_CONFIG_OPTION_PIC is defined create and destroy functions will be declared. - * src/cff/cffcmap.c when FT_CONFIG_OPTION_PIC is defined - the following structs: + * src/cff/cffcmap.c when FT_CONFIG_OPTION_PIC is defined + the following structs: cff_cmap_encoding_class_rec and cff_cmap_unicode_class_rec will have functions to init or create and destroy them instead of being allocated in the global scope. @@ -2191,10 +2649,10 @@ * src/cff/cffdrivr.h declare cff_driver_class using macros from ftdriver.h, when FT_CONFIG_OPTION_PIC is defined create and destroy functions will be declared. - * src/cff/cffdrivr.c when FT_CONFIG_OPTION_PIC is defined - the following structs: + * src/cff/cffdrivr.c when FT_CONFIG_OPTION_PIC is defined + the following structs: cff_service_glyph_dict, cff_service_ps_info, cff_service_ps_name - cff_service_get_cmap_info, cff_service_cid_info, cff_driver_class, + cff_service_get_cmap_info, cff_service_cid_info, cff_driver_class, and cff_services array will have functions to init or create and destroy them instead of being allocated in the global scope. @@ -2206,8 +2664,8 @@ * src/cff/cffobjs.c Use macros from cffpic.h in order to access the structs allocated in cffcmap.c - * src/cff/parser.c when FT_CONFIG_OPTION_PIC is defined - implement functions to create and destroy cff_field_handlers array + * src/cff/parser.c when FT_CONFIG_OPTION_PIC is defined + implement functions to create and destroy cff_field_handlers array instead of being allocated in the global scope. And macros will be used from cffpic.h in order to access it from the pic_container. @@ -2215,7 +2673,7 @@ New Files: * src/cff/cffpic.h declare struct to hold PIC globals for cff driver and macros to access them. - * src/cff/cffpic.c implement functions to allocate, destroy and + * src/cff/cffpic.c implement functions to allocate, destroy and initialize PIC globals for cff driver. * src/cff/cff.c add new file to build: cffpic.c. @@ -2225,38 +2683,38 @@ Position Independent Code (PIC) support in sfnt driver. - * include/freetype/internal/services/svbdf.h add macros to init + * include/freetype/internal/services/svbdf.h add macros to init instances of FT_Service_BDFRec. - * include/freetype/internal/services/svgldict.h add macros to init + * include/freetype/internal/services/svgldict.h add macros to init instances of FT_Service_GlyphDictRec. - * include/freetype/internal/services/svpostnm.h add macros to init + * include/freetype/internal/services/svpostnm.h add macros to init instances of FT_Service_PsFontNameRec. - * include/freetype/internal/services/svsfnt.h add macros to init + * include/freetype/internal/services/svsfnt.h add macros to init instances of FT_Service_SFNT_TableRec. - * include/freetype/internal/services/svttcmap.h add macros to init + * include/freetype/internal/services/svttcmap.h add macros to init instances of FT_Service_TTCMapsRec. - * include/freetype/internal/sfnt.h add macros to init + * include/freetype/internal/sfnt.h add macros to init instances of SFNT_Interface. * src/sfnt/sfdriver.h declare sfnt_module_class using macros from ftmodapi.h, when FT_CONFIG_OPTION_PIC is defined create and destroy functions will be declared. - * src/sfnt/sfdriver.c when FT_CONFIG_OPTION_PIC is defined - the following structs: + * src/sfnt/sfdriver.c when FT_CONFIG_OPTION_PIC is defined + the following structs: sfnt_service_sfnt_table, sfnt_service_glyph_dict, sfnt_service_ps_name - tt_service_get_cmap_info, sfnt_service_bdf, sfnt_interface, + tt_service_get_cmap_info, sfnt_service_bdf, sfnt_interface, sfnt_module_class, and sfnt_services array will have functions to init or create and destroy them instead of being allocated in the global scope. And macros will be used from sfntpic.h in order to access them from the pic_container. - * src/sfnt/ttcmap.h add macros to init + * src/sfnt/ttcmap.h add macros to init instances of TT_CMap_ClassRec. - * src/sfnt/ttcmap.c when FT_CONFIG_OPTION_PIC is defined - the following structs: + * src/sfnt/ttcmap.c when FT_CONFIG_OPTION_PIC is defined + the following structs: tt_cmap0_class_rec, tt_cmap2_class_rec, tt_cmap4_class_rec - tt_cmap6_class_rec, tt_cmap8_class_rec, tt_cmap10_class_rec, + tt_cmap6_class_rec, tt_cmap8_class_rec, tt_cmap10_class_rec, tt_cmap12_class_rec, tt_cmap14_class_rec and tt_cmap_classes array will have functions to init or create and destroy them instead of being allocated in the global scope. @@ -2268,9 +2726,9 @@ New Files: * src/sfnt/sfntpic.h declare struct to hold PIC globals for sfnt driver and macros to access them. - * src/sfnt/sfntpic.c implement functions to allocate, destroy and + * src/sfnt/sfntpic.c implement functions to allocate, destroy and initialize PIC globals for sfnt driver. - * src/sfnt/ttcmapc.h describing the content of + * src/sfnt/ttcmapc.h describing the content of tt_cmap_classes allocated in ttcmap.c * src/sfnt/sfnt.c add new file to build: sfntpic.c. @@ -2280,30 +2738,30 @@ Position Independent Code (PIC) support in truetype driver. - * include/freetype/internal/services/svmm.h add macros to init + * include/freetype/internal/services/svmm.h add macros to init instances of FT_Service_MultiMastersRec. - * include/freetype/internal/services/svttglyf.h add macros to init + * include/freetype/internal/services/svttglyf.h add macros to init instances of FT_Service_TTGlyfRec. * src/truetype/ttdriver.h declare tt_driver_class using macros from ftdriver.h, when FT_CONFIG_OPTION_PIC is defined create and destroy functions will be declared. - * src/truetype/ttdriver.c when FT_CONFIG_OPTION_PIC is defined - the following structs: + * src/truetype/ttdriver.c when FT_CONFIG_OPTION_PIC is defined + the following structs: tt_service_gx_multi_masters, tt_service_truetype_glyf, tt_driver_class - and tt_services array, + and tt_services array, will have functions to init or create and destroy them instead of being allocated in the global scope. And macros will be used from ttpic.h in order to access them from the pic_container. * src/truetype/ttobjs.c change trick_names array to be - PIC-compatible by being a two dimentional array rather than array + PIC-compatible by being a two dimentional array rather than array of pointers. New Files: * src/truetype/ttpic.h declare struct to hold PIC globals for truetype driver and macros to access them. - * src/truetype/ttpic.c implement functions to allocate, destroy and + * src/truetype/ttpic.c implement functions to allocate, destroy and initialize PIC globals for truetype driver. * src/truetype/truetype.c add new file to build: ttpic.c. @@ -2314,50 +2772,50 @@ Position Independent Code (PIC) support and infrastructure in base. * include/freetype/config/ftoption.h add FT_CONFIG_OPTION_PIC - * include/freetype/internal/ftobjs.h Add pic_container member to + * include/freetype/internal/ftobjs.h Add pic_container member to FT_LibraryRec. Add macros to declare and init instances of FT_CMap_ClassRec. Add macros to init instances of FT_Outline_Funcs and FT_Raster_Funcs. - Add macros to declare, allocate and initialize modules + Add macros to declare, allocate and initialize modules (FT_Module_Class). - Add macros to declare, allocate and initialize renderers + Add macros to declare, allocate and initialize renderers (FT_Renderer_Class). Add macro to init instances of FT_Glyph_Class. - Add macros to declare, allocate and initialize drivers + Add macros to declare, allocate and initialize drivers (FT_Driver_ClassRec). - * include/freetype/internal/ftpic.h new file to declare the + * include/freetype/internal/ftpic.h new file to declare the FT_PIC_Container struct and the functions to allocate and detroy it. - * include/freetype/internal/ftserv.h add macros to allocate and + * include/freetype/internal/ftserv.h add macros to allocate and destory arrays of FT_ServiceDescRec. - * include/freetype/internal/internal.h define macro to include + * include/freetype/internal/internal.h define macro to include ftpic.h. New Files: - * src/base/ftpic.c implement functions to allocate and destory the + * src/base/ftpic.c implement functions to allocate and destory the global pic_container. - * src/base/basepic.h declare struct to hold PIC globals for base and + * src/base/basepic.h declare struct to hold PIC globals for base and macros to access them. - * src/base/basepic.c implement functions to allocate, destroy and + * src/base/basepic.c implement functions to allocate, destroy and initialize PIC globals for base. - * src/base/ftinit.c when FT_CONFIG_OPTION_PIC is defined implement - functions that allocate and destroy ft_default_modules according to + * src/base/ftinit.c when FT_CONFIG_OPTION_PIC is defined implement + functions that allocate and destroy ft_default_modules according to FT_CONFIG_MODULES_H in the pic_container instead of the global scope and use macro from basepic.h to access it. - * src/base/ftobjs.c add calls to the functions that allocate and - destroy the global pic_container when the library is created and + * src/base/ftobjs.c add calls to the functions that allocate and + destroy the global pic_container when the library is created and destroyed. - * src/base/jamfile add new files to FT2_MULTI build: + * src/base/jamfile add new files to FT2_MULTI build: ftpic.c and basepic.c. - * src/base/ftbase.c add new files to build: + * src/base/ftbase.c add new files to build: ftpic.c and basepic.c. - * src/base/ftglyph.c when FT_CONFIG_OPTION_PIC is defined + * src/base/ftglyph.c when FT_CONFIG_OPTION_PIC is defined ft_bitmap_glyph_class and ft_outline_glyph_class will be allocated in the pic_container instead of the global scope and use macros from basepic.h to access them. - * src/base/ftbbox.c allocate bbox_interface stract on the stack + * src/base/ftbbox.c allocate bbox_interface stract on the stack instead of the global scope when FT_CONFIG_OPTION_PIC is defined. * src/base/ftstroke.c access ft_outline_glyph_class allocated in ftglyph.c via macros from basepic.h @@ -2367,7 +2825,7 @@ Preparing changes in cff parser later needed for PIC version. * src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c, - src/cff/cffparse.c, src/cff/cffparse.h: Add library pointer to + src/cff/cffparse.c, src/cff/cffparse.h: Add library pointer to 'CFF_ParserRec' set by `cff_parser_init'. Route library pointer from 'cff_face_init' to 'cff_subfont_load' for `cff_parser_init'. @@ -6442,8 +6900,8 @@ 2006-12-08 Vladimir Volovich - * src/tools/apinames (State): Remove final comma in structure -- xlc - v5 under AIX 4.3 doesn't like this. + * src/tools/apinames.c (State): Remove final comma in structure -- + xlc v5 under AIX 4.3 doesn't like this. 2006-12-07 David Turner @@ -7474,7 +7932,7 @@ ---------------------------------------------------------------------------- -Copyright 2006, 2007, 2008, 2009 by +Copyright 2006, 2007, 2008, 2009, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg. This file is part of the FreeType project, and may only be used, modified, diff --git a/freetype/Jamfile b/freetype/Jamfile index ac327b812..d8c1bbada 100644 --- a/freetype/Jamfile +++ b/freetype/Jamfile @@ -194,7 +194,7 @@ rule RefDoc actions RefDoc { - python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.3.11 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h + python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.3.12 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h } RefDoc refdoc ; diff --git a/freetype/README b/freetype/README index f63c8fc46..282791ef0 100644 --- a/freetype/README +++ b/freetype/README @@ -9,7 +9,7 @@ is called `libttf'. They are *not* compatible! - FreeType 2.3.11 + FreeType 2.3.12 =============== Please read the docs/CHANGES file, it contains IMPORTANT @@ -26,9 +26,9 @@ and download one of the following files. - freetype-doc-2.3.11.tar.bz2 - freetype-doc-2.3.11.tar.gz - ftdoc2311.zip + freetype-doc-2.3.12.tar.bz2 + freetype-doc-2.3.12.tar.gz + ftdoc2312.zip Bugs @@ -51,7 +51,7 @@ ---------------------------------------------------------------------- -Copyright 2006, 2007, 2008, 2009 by +Copyright 2006, 2007, 2008, 2009, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg. This file is part of the FreeType project, and may only be used, diff --git a/freetype/autogen.sh b/freetype/autogen.sh index 16c335fd5..c28a51c13 100644 --- a/freetype/autogen.sh +++ b/freetype/autogen.sh @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005, 2006, 2007, 2008, 2009 by +# Copyright 2005, 2006, 2007, 2008, 2009, 2010 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -95,10 +95,11 @@ compare_to_minimum_version () check_tool_version () { field=$5 + # assume the output of "[TOOL] --version" is "toolname (GNU toolname foo bar) version" if test "$field"x = x; then - field=4 # default to 4 for all GNU autotools + field=3 # default to 3 for all GNU autotools, after filtering enclosed string fi - version=`$1 --version | head -1 | cut -d ' ' -f $field` + version=`$1 --version | head -1 | sed 's/([^)]*)/()/g' | cut -d ' ' -f $field` version_check=`compare_to_minimum_version $version $4` if test "$version_check"x = 0x; then echo "ERROR: Your version of the \`$2' tool is too old." diff --git a/freetype/builds/unix/aclocal.m4 b/freetype/builds/unix/aclocal.m4 index 36a524230..492a669ec 100644 --- a/freetype/builds/unix/aclocal.m4 +++ b/freetype/builds/unix/aclocal.m4 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.10.1 -*- Autoconf -*- +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 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. @@ -691,7 +691,6 @@ _LT_CONFIG_SAVE_COMMANDS([ # `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. # Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # _LT_COPYING @@ -7851,15 +7850,15 @@ m4_define([lt_dict_filter], # Generated from ltversion.in. -# serial 3012 ltversion.m4 +# serial 3017 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.2.6]) -m4_define([LT_PACKAGE_REVISION], [1.3012]) +m4_define([LT_PACKAGE_VERSION], [2.2.6b]) +m4_define([LT_PACKAGE_REVISION], [1.3017]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.2.6' -macro_revision='1.3012' +[macro_version='2.2.6b' +macro_revision='1.3017' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff --git a/freetype/builds/unix/config.guess b/freetype/builds/unix/config.guess index e792aac60..c2246a4f7 100644 --- a/freetype/builds/unix/config.guess +++ b/freetype/builds/unix/config.guess @@ -1,10 +1,10 @@ #! /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 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 # Free Software Foundation, Inc. -timestamp='2009-09-18' +timestamp='2009-12-30' # 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 @@ -56,8 +56,9 @@ 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 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 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." @@ -333,6 +334,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) + echo i386-pc-auroraux${UNAME_RELEASE} + exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) eval $set_cc_for_build SUN_ARCH="i386" @@ -807,12 +811,12 @@ EOF i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - *:Interix*:[3456]*) + *:Interix*:*) case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; - EM64T | authenticamd | genuineintel) + authenticamd | genuineintel | EM64T) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; IA64) @@ -891,7 +895,15 @@ EOF echo frv-unknown-linux-gnu exit ;; i*86:Linux:*:*) - echo ${UNAME_MACHINE}-pc-linux-gnu + 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}" exit ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -918,11 +930,7 @@ EOF #endif #endif EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) diff --git a/freetype/builds/unix/config.sub b/freetype/builds/unix/config.sub index 5ecc18b6a..c2d125724 100644 --- a/freetype/builds/unix/config.sub +++ b/freetype/builds/unix/config.sub @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 # Free Software Foundation, Inc. -timestamp='2009-10-07' +timestamp='2010-01-22' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -75,8 +75,9 @@ 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 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 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." @@ -295,6 +296,7 @@ case $basic_machine in | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ | spu | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ + | ubicom32 \ | v850 | v850e \ | we32k \ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ @@ -379,8 +381,10 @@ case $basic_machine in | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile-* | tilegx-* \ | tron-* \ + | ubicom32-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ @@ -1083,6 +1087,11 @@ case $basic_machine in basic_machine=tic6x-unknown os=-coff ;; + # This must be matched before tile*. + tilegx*) + basic_machine=tilegx-unknown + os=-linux-gnu + ;; tile*) basic_machine=tile-unknown os=-linux-gnu @@ -1254,6 +1263,9 @@ case $os in # First match some system type aliases # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. + -auroraux) + os=-auroraux + ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` ;; @@ -1275,8 +1287,8 @@ case $os in # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ - | -kopensolaris* \ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ + | -sym* | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ @@ -1430,6 +1442,8 @@ case $os in -dicos*) os=-dicos ;; + -nacl*) + ;; -none) ;; *) diff --git a/freetype/builds/unix/configure b/freetype/builds/unix/configure index 9eea0d6e3..0c949128f 100644 --- a/freetype/builds/unix/configure +++ b/freetype/builds/unix/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for FreeType 2.3.11. +# Generated by GNU Autoconf 2.63 for FreeType 2.3.12. # # Report bugs to . # @@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='FreeType' PACKAGE_TARNAME='freetype' -PACKAGE_VERSION='2.3.11' -PACKAGE_STRING='FreeType 2.3.11' +PACKAGE_VERSION='2.3.12' +PACKAGE_STRING='FreeType 2.3.12' PACKAGE_BUGREPORT='freetype@nongnu.org' ac_unique_file="ftconfig.in" @@ -1461,7 +1461,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.3.11 to adapt to many kinds of systems. +\`configure' configures FreeType 2.3.12 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1526,7 +1526,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of FreeType 2.3.11:";; + short | recursive ) echo "Configuration of FreeType 2.3.12:";; esac cat <<\_ACEOF @@ -1637,7 +1637,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -FreeType configure 2.3.11 +FreeType configure 2.3.12 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1651,7 +1651,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by FreeType $as_me 2.3.11, which was +It was created by FreeType $as_me 2.3.12, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2024,7 +2024,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # Don't forget to update docs/VERSION.DLL! -version_info='9:22:3' +version_info='10:0:4' ft_version=`echo $version_info | tr : .` @@ -6048,37 +6048,54 @@ if test x$with_zlib != xno && test -n "$LIBZ"; then fi -# check Apple's `-isysroot' option and duplicate it to LDFLAGS if required -- -# Apple TechNote 2137 recommends to include it in CFLAGS but not in LDFLAGS +# 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. -{ $as_echo "$as_me:$LINENO: checking whether CFLAGS includes -isysroot option" >&5 -$as_echo_n "checking whether CFLAGS includes -isysroot option... " >&6; } -case "$CFLAGS" in -*sysroot* ) - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - { $as_echo "$as_me:$LINENO: checking whether LDFLAGS includes -isysroot option" >&5 -$as_echo_n "checking whether LDFLAGS includes -isysroot option... " >&6; } - case "$LDFLAGS" in - *sysroot* ) - { $as_echo "$as_me:$LINENO: result: yes" >&5 +save_config_args=$* +set dummy ${CFLAGS} +i=1 +while test $i -lt $# +do + c=$1 + + case "${c}" in + -isysroot|-arch) # options taking 1 argument + a=$2 + { $as_echo "$as_me:$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:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } + else + { $as_echo "$as_me:$LINENO: result: no, copy to LDFLAGS" >&5 +$as_echo "no, copy to LDFLAGS" >&6; } + LDFLAGS="${LDFLAGS} ${c} ${a}" + fi + shift 1 ;; - *) - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - isysroot_dir=`echo ${CFLAGS} | tr '\t' ' ' | sed 's/^.*-isysroot *//;s/ .*//'` - { $as_echo "$as_me:$LINENO: WARNING: -isysroot ${isysroot_dir} is added to LDFLAGS" >&5 -$as_echo "$as_me: WARNING: -isysroot ${isysroot_dir} is added to LDFLAGS" >&2;} - LDFLAGS="-isysroot ${isysroot_dir} ${LDFLAGS}" + -m32|-m64) # options taking no argument + { $as_echo "$as_me:$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:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:$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 - ;; -*) - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - ;; -esac + + shift 1 +done +set ${save_config_args} # Whether to use Mac OS resource-based fonts. @@ -6850,8 +6867,8 @@ esac -macro_version='2.2.6' -macro_revision='1.3012' +macro_version='2.2.6b' +macro_revision='1.3017' @@ -7327,13 +7344,13 @@ if test "${lt_cv_nm_interface+set}" = set; then else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:7330: $ac_compile\"" >&5) + (eval echo "\"\$as_me:7347: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:7333: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:7350: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:7336: output\"" >&5) + (eval echo "\"\$as_me:7353: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -8535,7 +8552,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 8538 "configure"' > conftest.$ac_ext + echo '#line 8555 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -10198,11 +10215,11 @@ else -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:10201: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10218: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10205: \$? = $ac_status" >&5 + echo "$as_me:10222: \$? = $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. @@ -10537,11 +10554,11 @@ else -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:10540: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10557: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10544: \$? = $ac_status" >&5 + echo "$as_me:10561: \$? = $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. @@ -10642,11 +10659,11 @@ else -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:10645: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10662: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10649: \$? = $ac_status" >&5 + echo "$as_me:10666: \$? = $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 @@ -10697,11 +10714,11 @@ else -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:10700: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10717: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10704: \$? = $ac_status" >&5 + echo "$as_me:10721: \$? = $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 @@ -13497,7 +13514,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13500 "configure" +#line 13517 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13593,7 +13610,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13596 "configure" +#line 13613 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14263,7 +14280,7 @@ exec 6>&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.3.11, which was +This file was extended by FreeType $as_me 2.3.12, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14326,7 +14343,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -FreeType config.status 2.3.11 +FreeType config.status 2.3.12 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -15339,7 +15356,6 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} # `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. # Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, diff --git a/freetype/builds/unix/configure.ac b/freetype/builds/unix/configure.ac index 4ee69ec8c..762d43dd6 100644 --- a/freetype/builds/unix/configure.ac +++ b/freetype/builds/unix/configure.ac @@ -2,7 +2,7 @@ # # Process this file with autoconf to produce a configure script. # -# Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 by +# Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -11,13 +11,13 @@ # indicate that you have read the license and understand and accept it # fully. -AC_INIT([FreeType], [2.3.11], [freetype@nongnu.org], [freetype]) +AC_INIT([FreeType], [2.3.12], [freetype@nongnu.org], [freetype]) AC_CONFIG_SRCDIR([ftconfig.in]) # Don't forget to update docs/VERSION.DLL! -version_info='9:22:3' +version_info='10:0:4' AC_SUBST([version_info]) ft_version=`echo $version_info | tr : .` AC_SUBST([ft_version]) @@ -230,30 +230,48 @@ if test x$with_zlib != xno && test -n "$LIBZ"; then fi -# check Apple's `-isysroot' option and duplicate it to LDFLAGS if required -- -# Apple TechNote 2137 recommends to include it in CFLAGS but not in LDFLAGS - -AC_MSG_CHECKING([whether CFLAGS includes -isysroot option]) -case "$CFLAGS" in -*sysroot* ) - AC_MSG_RESULT([yes]) - AC_MSG_CHECKING([whether LDFLAGS includes -isysroot option]) - case "$LDFLAGS" in - *sysroot* ) - AC_MSG_RESULT([yes]) +# 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 -lt $# +do + c=$1 + + case "${c}" in + -isysroot|-arch) # options taking 1 argument + a=$2 + AC_MSG_CHECKING([whether CFLAGS and LDFLAGS share ${c} ${a}]) + if expr " ${LDFLAGS} " : ".* ${c} *${a}.*" > /dev/null + then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no, copy to LDFLAGS]) + LDFLAGS="${LDFLAGS} ${c} ${a}" + fi + shift 1 ;; - *) - AC_MSG_RESULT([no]) - isysroot_dir=`echo ${CFLAGS} | tr '\t' ' ' | sed 's/^.*-isysroot *//;s/ .*//'` - AC_MSG_WARN(-isysroot ${isysroot_dir} is added to LDFLAGS) - LDFLAGS="-isysroot ${isysroot_dir} ${LDFLAGS}" + -m32|-m64) # options taking no argument + AC_MSG_RESULT([whether CFLAGS and LDFLAGS share ${c}]) + if expr " ${LDFLAGS} " : ".* ${c} *${a}.*" > /dev/null + then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no, copy to LDFLAGS]) + LDFLAGS="${LDFLAGS} ${c}" + fi ;; + # *) + # AC_MSG_RESULT([${c} is not copied to LDFLAGS]) + # ;; esac - ;; -*) - AC_MSG_RESULT([no]) - ;; -esac + + shift 1 +done +set ${save_config_args} # Whether to use Mac OS resource-based fonts. diff --git a/freetype/builds/unix/configure.raw b/freetype/builds/unix/configure.raw index 8a999887e..ff16dfe33 100644 --- a/freetype/builds/unix/configure.raw +++ b/freetype/builds/unix/configure.raw @@ -2,7 +2,7 @@ # # Process this file with autoconf to produce a configure script. # -# Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 by +# Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -17,7 +17,7 @@ AC_CONFIG_SRCDIR([ftconfig.in]) # Don't forget to update docs/VERSION.DLL! -version_info='9:22:3' +version_info='10:0:4' AC_SUBST([version_info]) ft_version=`echo $version_info | tr : .` AC_SUBST([ft_version]) @@ -230,30 +230,48 @@ if test x$with_zlib != xno && test -n "$LIBZ"; then fi -# check Apple's `-isysroot' option and duplicate it to LDFLAGS if required -- -# Apple TechNote 2137 recommends to include it in CFLAGS but not in LDFLAGS - -AC_MSG_CHECKING([whether CFLAGS includes -isysroot option]) -case "$CFLAGS" in -*sysroot* ) - AC_MSG_RESULT([yes]) - AC_MSG_CHECKING([whether LDFLAGS includes -isysroot option]) - case "$LDFLAGS" in - *sysroot* ) - AC_MSG_RESULT([yes]) +# 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 -lt $# +do + c=$1 + + case "${c}" in + -isysroot|-arch) # options taking 1 argument + a=$2 + AC_MSG_CHECKING([whether CFLAGS and LDFLAGS share ${c} ${a}]) + if expr " ${LDFLAGS} " : ".* ${c} *${a}.*" > /dev/null + then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no, copy to LDFLAGS]) + LDFLAGS="${LDFLAGS} ${c} ${a}" + fi + shift 1 ;; - *) - AC_MSG_RESULT([no]) - isysroot_dir=`echo ${CFLAGS} | tr '\t' ' ' | sed 's/^.*-isysroot *//;s/ .*//'` - AC_MSG_WARN(-isysroot ${isysroot_dir} is added to LDFLAGS) - LDFLAGS="-isysroot ${isysroot_dir} ${LDFLAGS}" + -m32|-m64) # options taking no argument + AC_MSG_RESULT([whether CFLAGS and LDFLAGS share ${c}]) + if expr " ${LDFLAGS} " : ".* ${c} *${a}.*" > /dev/null + then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no, copy to LDFLAGS]) + LDFLAGS="${LDFLAGS} ${c}" + fi ;; + # *) + # AC_MSG_RESULT([${c} is not copied to LDFLAGS]) + # ;; esac - ;; -*) - AC_MSG_RESULT([no]) - ;; -esac + + shift 1 +done +set ${save_config_args} # Whether to use Mac OS resource-based fonts. diff --git a/freetype/builds/unix/freetype-config.in b/freetype/builds/unix/freetype-config.in index 9606d318b..0a7a767d6 100644 --- a/freetype/builds/unix/freetype-config.in +++ b/freetype/builds/unix/freetype-config.in @@ -101,11 +101,11 @@ if test "$local_prefix" = "yes" ; then fi if test "$echo_prefix" = "yes" ; then - echo $prefix + echo ${SYSROOT}$prefix fi if test "$echo_exec_prefix" = "yes" ; then - echo $exec_prefix + echo ${SYSROOT}$exec_prefix fi if test "$exec_prefix_set" = "yes" ; then @@ -118,22 +118,22 @@ else fi if test "$echo_ft_version" = "yes" ; then - major=`grep define $includedir/freetype2/freetype/freetype.h \ + major=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \ | grep FREETYPE_MAJOR \ | sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'` - minor=`grep define $includedir/freetype2/freetype/freetype.h \ + minor=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \ | grep FREETYPE_MINOR \ | sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'` - patch=`grep define $includedir/freetype2/freetype/freetype.h \ + patch=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \ | grep FREETYPE_PATCH \ | sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'` echo $major.$minor.$patch fi if test "$echo_cflags" = "yes" ; then - cflags="-I$includedir/freetype2" - if test "$includedir" != "/usr/include" ; then - echo $cflags -I$includedir + cflags="-I${SYSROOT}$includedir/freetype2" + if test "${SYSROOT}$includedir" != "/usr/include" ; then + echo $cflags -I${SYSROOT}$includedir else echo $cflags fi @@ -145,8 +145,8 @@ if test "$echo_libs" = "yes" ; then eval "rpath=\"$hardcode_libdir_flag_spec\"" fi libs="-lfreetype @LIBZ@ @FT2_EXTRA_LIBS@" - if test "$libdir" != "/usr/lib" && test "$libdir" != "/usr/lib64"; then - echo -L$libdir $rpath $libs + if test "${SYSROOT}$libdir" != "/usr/lib" && test "${SYSROOT}$libdir" != "/usr/lib64"; then + echo -L${SYSROOT}$libdir $libs else echo $libs fi @@ -154,7 +154,7 @@ fi if test "$echo_libtool" = "yes" ; then convlib="libfreetype.la" - echo $libdir/$convlib + echo ${SYSROOT}$libdir/$convlib fi # EOF diff --git a/freetype/builds/unix/install-sh b/freetype/builds/unix/install-sh index a5897de6e..6781b987b 100644 --- a/freetype/builds/unix/install-sh +++ b/freetype/builds/unix/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2006-12-25.00 +scriptversion=2009-04-28.21; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -515,5 +515,6 @@ done # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff --git a/freetype/builds/unix/ltmain.sh b/freetype/builds/unix/ltmain.sh index b36c4ad36..a72f2fd78 100644 --- a/freetype/builds/unix/ltmain.sh +++ b/freetype/builds/unix/ltmain.sh @@ -1,6 +1,6 @@ # Generated from ltmain.m4sh. -# ltmain.sh (GNU libtool) 2.2.6 +# ltmain.sh (GNU libtool) 2.2.6b # Written by Gordon Matzigkeit , 1996 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. @@ -65,7 +65,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.2.6 +# $progname: (GNU libtool) 2.2.6b # automake: $automake_version # autoconf: $autoconf_version # @@ -73,9 +73,9 @@ PROGRAM=ltmain.sh PACKAGE=libtool -VERSION=2.2.6 +VERSION=2.2.6b TIMESTAMP="" -package_revision=1.3012 +package_revision=1.3017 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -116,15 +116,15 @@ $lt_unset CDPATH : ${CP="cp -f"} : ${ECHO="echo"} -: ${EGREP="/usr/bin/grep -E"} -: ${FGREP="/usr/bin/grep -F"} -: ${GREP="/usr/bin/grep"} +: ${EGREP="/bin/grep -E"} +: ${FGREP="/bin/grep -F"} +: ${GREP="/bin/grep"} : ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} -: ${SED="/opt/local/bin/gsed"} +: ${SED="/bin/sed"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} : ${Xsed="$SED -e 1s/^X//"} diff --git a/freetype/builds/win32/vc2005/freetype.vcproj b/freetype/builds/win32/vc2005/freetype.vcproj index f4bdb6d90..3df9fdad5 100644 --- a/freetype/builds/win32/vc2005/freetype.vcproj +++ b/freetype/builds/win32/vc2005/freetype.vcproj @@ -16,7 +16,7 @@ - + @@ -33,7 +33,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -67,7 +67,7 @@ - + @@ -84,7 +84,7 @@ - + @@ -101,7 +101,7 @@ - + @@ -374,6 +374,14 @@ + + + + + + + + diff --git a/freetype/builds/win32/vc2005/index.html b/freetype/builds/win32/vc2005/index.html index 3c081e139..777388228 100644 --- a/freetype/builds/win32/vc2005/index.html +++ b/freetype/builds/win32/vc2005/index.html @@ -11,14 +11,14 @@

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

+compiles the following libraries from the FreeType 2.3.12 sources:

    -    freetype2311.lib     - release build; single threaded
-    freetype2311_D.lib   - debug build;   single threaded
-    freetype2311MT.lib   - release build; multi-threaded
-    freetype2311MT_D.lib - debug build;   multi-threaded
    + freetype2312.lib - release build; single threaded + freetype2312_D.lib - debug build; single threaded + freetype2312MT.lib - release build; multi-threaded + freetype2312MT_D.lib - debug build; multi-threaded

Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/freetype/builds/win32/vc2008/freetype.vcproj b/freetype/builds/win32/vc2008/freetype.vcproj index 16ae98666..57d0bd3f5 100644 --- a/freetype/builds/win32/vc2008/freetype.vcproj +++ b/freetype/builds/win32/vc2008/freetype.vcproj @@ -70,7 +70,7 @@ /> + + + + + + + + diff --git a/freetype/builds/win32/vc2008/index.html b/freetype/builds/win32/vc2008/index.html index 4157d25d2..aa16c384c 100644 --- a/freetype/builds/win32/vc2008/index.html +++ b/freetype/builds/win32/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.3.11 sources:

+compiles the following libraries from the FreeType 2.3.12 sources:

    -    freetype2311.lib     - release build; single threaded
-    freetype2311_D.lib   - debug build;   single threaded
-    freetype2311MT.lib   - release build; multi-threaded
-    freetype2311MT_D.lib - debug build;   multi-threaded
    + freetype2312.lib - release build; single threaded + freetype2312_D.lib - debug build; single threaded + freetype2312MT.lib - release build; multi-threaded + freetype2312MT_D.lib - debug build; multi-threaded

Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/freetype/builds/win32/visualc/freetype.dsp b/freetype/builds/win32/visualc/freetype.dsp index 44679190b..31046c752 100644 --- a/freetype/builds/win32/visualc/freetype.dsp +++ b/freetype/builds/win32/visualc/freetype.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2311.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2312.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\freetype2311_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2312_D.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Debug Multithreaded" @@ -102,8 +102,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"lib\freetype2311_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2311MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype2312_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2312MT_D.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Release Multithreaded" @@ -126,8 +126,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"lib\freetype2311.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2311MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype2312.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2312MT.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\freetype2311.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype2311ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype2312.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype2312ST.lib" # SUBTRACT LIB32 /nologo !ELSEIF "$(CFG)" == "freetype - Win32 Debug Singlethreaded" @@ -177,8 +177,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype2311_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2311ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype2312_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2312ST_D.lib" !ENDIF diff --git a/freetype/builds/win32/visualc/freetype.vcproj b/freetype/builds/win32/visualc/freetype.vcproj index 1672533d2..ad81e0635 100644 --- a/freetype/builds/win32/visualc/freetype.vcproj +++ b/freetype/builds/win32/visualc/freetype.vcproj @@ -70,7 +70,7 @@ /> + + + + + + + + diff --git a/freetype/builds/win32/visualc/index.html b/freetype/builds/win32/visualc/index.html index 7caddb0e4..eaf3a5c5b 100644 --- a/freetype/builds/win32/visualc/index.html +++ b/freetype/builds/win32/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.3.11 sources:

+compiles the following libraries from the FreeType 2.3.12 sources:

    -    freetype2311.lib     - release build; single threaded
-    freetype2311_D.lib   - debug build;   single threaded
-    freetype2311MT.lib   - release build; multi-threaded
-    freetype2311MT_D.lib - debug build;   multi-threaded
    + freetype2312.lib - release build; single threaded + freetype2312_D.lib - debug build; single threaded + freetype2312MT.lib - release build; multi-threaded + freetype2312MT_D.lib - debug build; multi-threaded

Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/freetype/builds/win32/visualce/freetype.dsp b/freetype/builds/win32/visualce/freetype.dsp index 44679190b..31046c752 100644 --- a/freetype/builds/win32/visualce/freetype.dsp +++ b/freetype/builds/win32/visualce/freetype.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2311.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2312.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\freetype2311_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2312_D.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Debug Multithreaded" @@ -102,8 +102,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"lib\freetype2311_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2311MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype2312_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2312MT_D.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Release Multithreaded" @@ -126,8 +126,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"lib\freetype2311.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2311MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype2312.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2312MT.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\freetype2311.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype2311ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype2312.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype2312ST.lib" # SUBTRACT LIB32 /nologo !ELSEIF "$(CFG)" == "freetype - Win32 Debug Singlethreaded" @@ -177,8 +177,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype2311_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2311ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype2312_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2312ST_D.lib" !ENDIF diff --git a/freetype/builds/win32/visualce/freetype.vcproj b/freetype/builds/win32/visualce/freetype.vcproj index efaefe091..49fb23b4c 100644 --- a/freetype/builds/win32/visualce/freetype.vcproj +++ b/freetype/builds/win32/visualce/freetype.vcproj @@ -87,7 +87,7 @@ /> + + + + + + + + diff --git a/freetype/builds/win32/visualce/index.html b/freetype/builds/win32/visualce/index.html index 888eeb2b5..f4ac4945c 100644 --- a/freetype/builds/win32/visualce/index.html +++ b/freetype/builds/win32/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.3.11 sources:

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

      -    freetype2311.lib     - release build; single threaded
-    freetype2311_D.lib   - debug build;   single threaded
-    freetype2311MT.lib   - release build; multi-threaded
-    freetype2311MT_D.lib - debug build;   multi-threaded
      + freetype2312.lib - release build; single threaded + freetype2312_D.lib - debug build; single threaded + freetype2312MT.lib - release build; multi-threaded + freetype2312MT_D.lib - debug build; multi-threaded

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

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

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

      -    freetype2311.lib     - release build; single threaded
-    freetype2311_D.lib   - debug build;   single threaded
-    freetype2311MT.lib   - release build; multi-threaded
-    freetype2311MT_D.lib - debug build;   multi-threaded
      + freetype2312.lib - release build; single threaded + freetype2312_D.lib - debug build; single threaded + freetype2312MT.lib - release build; multi-threaded + freetype2312MT_D.lib - debug build; multi-threaded

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

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

      -    freetype2311.lib     - release build; single threaded
-    freetype2311_D.lib   - debug build;   single threaded
-    freetype2311MT.lib   - release build; multi-threaded
-    freetype2311MT_D.lib - debug build;   multi-threaded
      + freetype2312.lib - release build; single threaded + freetype2312_D.lib - debug build; single threaded + freetype2312MT.lib - release build; multi-threaded + freetype2312MT_D.lib - debug build; multi-threaded

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/freetype/devel/ftoption.h b/freetype/devel/ftoption.h index d4fee5953..9c6c2fe45 100644 --- a/freetype/devel/ftoption.h +++ b/freetype/devel/ftoption.h @@ -4,7 +4,8 @@ /* */ /* User-selectable configuration macros (specification only). */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 by */ +/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, */ +/* 2010 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -85,9 +86,9 @@ FT_BEGIN_HEADER /* */ /* This macro has no impact on the FreeType API, only on its */ /* _implementation_. For example, using FT_RENDER_MODE_LCD when calling */ - /* FT_Render_Glyph still generates a bitmap that is 3 times larger than */ - /* the original size; the difference will be that each triplet of */ - /* subpixels has R=G=B. */ + /* FT_Render_Glyph still generates a bitmap that is 3 times wider than */ + /* the original size in case this macro isn't defined; however, each */ + /* triplet of subpixels has R=G=B. */ /* */ /* This is done to allow FreeType clients to run unmodified, forcing */ /* them to display normal gray-level anti-aliased glyphs. */ @@ -312,8 +313,9 @@ FT_BEGIN_HEADER /* */ /* Allow the use of FT_Incremental_Interface to load typefaces that */ /* contain no glyph data, but supply it via a callback function. */ - /* This allows FreeType to be used with the PostScript language, using */ - /* the GhostScript interpreter. */ + /* This is required by clients supporting document formats which */ + /* supply font data incrementally as the document is parsed, such */ + /* as the Ghostscript interpreter for the PostScript language. */ /* */ #define FT_CONFIG_OPTION_INCREMENTAL @@ -396,6 +398,20 @@ FT_BEGIN_HEADER #undef FT_CONFIG_OPTION_USE_MODULE_ERRORS + /*************************************************************************/ + /* */ + /* Position Independent Code */ + /* */ + /* If this macro is set (which is _not_ the default), FreeType2 will */ + /* avoid creating constants that require address fixups. Instead the */ + /* constants will be moved into a struct and additional intialization */ + /* code will be used. */ + /* */ + /* Setting this macro is needed for systems that prohibit address */ + /* fixups, such as BREW. */ + /* */ +/* #define FT_CONFIG_OPTION_PIC */ + /*************************************************************************/ /*************************************************************************/ diff --git a/freetype/docs/CHANGES b/freetype/docs/CHANGES index 8d7387a91..018d16c57 100644 --- a/freetype/docs/CHANGES +++ b/freetype/docs/CHANGES @@ -1,3 +1,23 @@ +CHANGES BETWEEN 2.3.11 and 2.3.12 + + I. IMPORTANT CHANGES + + - For `FT_Open_Face', new parameters are available to ignore + preferred family names: FT_PARAM_TAG_IGNORE_PREFERRED_FAMILY and + FT_PARAM_TAG_IGNORE_PREFERRED_SUBFAMILY. + + II. MISCELLANEOUS + + - Support for incremental font loading (controlled with the + FT_CONFIG_OPTION_INCREMENTAL macro) is now active by default. + + - Better support for vertical metrics. + + - Various minor bug fixes. + + +====================================================================== + CHANGES BETWEEN 2.3.10 and 2.3.11 I. IMPORTANT BUG FIXES diff --git a/freetype/docs/INSTALL.ANY b/freetype/docs/INSTALL.ANY index 86e94d585..44b785c67 100644 --- a/freetype/docs/INSTALL.ANY +++ b/freetype/docs/INSTALL.ANY @@ -127,10 +127,10 @@ II. Support for flat-directory compilation 2. Compile sources - cc -c -Ifreetype2/include ftsystem.c - cc -c -Ifreetype2/include ftinit.c - cc -c -Ifreetype2/include ftdebug.c - cc -c -Ifreetype2/include ftbase.c + cc -c -Ifreetype2/include -DFT2_BUILD_LIBRARY ftsystem.c + cc -c -Ifreetype2/include -DFT2_BUILD_LIBRARY ftinit.c + cc -c -Ifreetype2/include -DFT2_BUILD_LIBRARY ftdebug.c + cc -c -Ifreetype2/include -DFT2_BUILD_LIBRARY ftbase.c etc. You don't need to define the FT_FLAT_COMPILATION macro (as this @@ -138,7 +138,7 @@ II. Support for flat-directory compilation ---------------------------------------------------------------------- -Copyright 2003, 2005, 2006, 2009 by +Copyright 2003, 2005, 2006, 2009, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg. This file is part of the FreeType project, and may only be used, diff --git a/freetype/docs/LICENSE.TXT b/freetype/docs/LICENSE.TXT index 102a03d65..abebbcc78 100644 --- a/freetype/docs/LICENSE.TXT +++ b/freetype/docs/LICENSE.TXT @@ -20,9 +20,12 @@ any of your projects or products. GPL. Note that the FTL is incompatible with the GPL due to its advertisement clause. -The contributed PCF driver comes with a license similar to that of the X -Window System. It is compatible to the above two licenses (see file -src/pcf/readme). +The contributed BDF and PCF drivers come with a license similar to that +of the X Window System. It is compatible to the above two licenses (see +file src/bdf/README and src/pcf/README). + +The gzip module uses the zlib license (see src/gzip/zlib.h) which too is +compatible to the above two licenses. --- end of LICENSE.TXT --- diff --git a/freetype/docs/VERSION.DLL b/freetype/docs/VERSION.DLL index ac8cac82a..bb55c3dda 100644 --- a/freetype/docs/VERSION.DLL +++ b/freetype/docs/VERSION.DLL @@ -53,6 +53,7 @@ systems, but not all of them: release libtool so ------------------------------- + 2.3.12 10.0.4 6.4.0 2.3.11 9.22.3 6.3.22 2.3.10 9.21.3 6.3.21 2.3.9 9.20.3 6.3.20 @@ -124,7 +125,7 @@ other release numbers. ------------------------------------------------------------------------ -Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 by +Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg. This file is part of the FreeType project, and may only be used, diff --git a/freetype/docs/reference/ft2-base_interface.html b/freetype/docs/reference/ft2-base_interface.html index ec60bd644..08f2a81b8 100644 --- a/freetype/docs/reference/ft2-base_interface.html +++ b/freetype/docs/reference/ft2-base_interface.html @@ -3,7 +3,7 @@ -FreeType-2.3.11 API Reference +FreeType-2.3.12 API Reference