diff options
| author | marha <marha@users.sourceforge.net> | 2011-07-18 10:51:09 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-07-18 10:51:09 +0200 |
| commit | 3c0d2312573b81e3067bea610a58b1940c075e05 (patch) | |
| tree | 3f025a27d813374f225957801226aa8ee829a33a /freetype/docs/formats.txt | |
| parent | ba033884541714680fd7552ab9d6c8817650f7d8 (diff) | |
| parent | 88101146f2ec7d53ffb793e365f05097ffd35fd3 (diff) | |
| download | vcxsrv-3c0d2312573b81e3067bea610a58b1940c075e05.tar.gz vcxsrv-3c0d2312573b81e3067bea610a58b1940c075e05.tar.bz2 vcxsrv-3c0d2312573b81e3067bea610a58b1940c075e05.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
X11/Xfuncproto.h.in
X11/configure.ac
X11/keysymdef.h
freetype/include/freetype/internal/pcftypes.h
freetype/src/cache/ftcbasic.c
freetype/src/cache/ftccmap.c
mesalib/src/glsl/ir.h
mesalib/src/glsl/link_functions.cpp
mesalib/src/mesa/main/dlist.c
mesalib/src/mesa/program/prog_optimize.c
mesalib/src/mesa/state_tracker/st_program.c
pthreads/Makefile
Diffstat (limited to 'freetype/docs/formats.txt')
| -rw-r--r-- | freetype/docs/formats.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/freetype/docs/formats.txt b/freetype/docs/formats.txt index efec66060..827c8947f 100644 --- a/freetype/docs/formats.txt +++ b/freetype/docs/formats.txt @@ -11,8 +11,9 @@ reference document and whether it is supported in FreeType 2. wrapper format: The format used to represent the font data. In the table below it is used only if the font format differs. Possible values are `SFNT' - (binary), `PS' (a text header, followed by binary or text data), and - `LZW' (compressed with either `gzip' or `compress'). + (binary), `PS' (a text header, followed by binary or text data), + `LZW' (compressed with either `gzip' or `compress'), and + `BZ2' (compressed with `bzip2`). font format: How the font is to be accessed, possibly after converting the file @@ -113,6 +114,7 @@ MAC --- PS TYPE_1 --- type1 T1_SPEC.pdf --- --- PCF --- --- pcf X11 [4] --- LZW PCF --- --- pcf X11 [4] +--- BZ2 PCF --- --- pcf X11 [4] --- --- PFR PFR0 --- pfr [2] |