summaryrefslogtreecommitdiff
path: root/docs/LICENSE.TXT
diff options
context:
space:
mode:
authorWerner Lemberg <wl@gnu.org>2015-12-19 16:59:40 +0100
committerWerner Lemberg <wl@gnu.org>2015-12-19 16:59:40 +0100
commitc98a40f99d468e280e41bcbd277b354b850dc5ee (patch)
tree22417335738c68b25ceb42a7fef17bee5f6d3990 /docs/LICENSE.TXT
parent1f80c8152b0a8b633941fe28d1d2d21c60998d6e (diff)
downloadfreetype2-c98a40f99d468e280e41bcbd277b354b850dc5ee.tar.gz
[bdf, base] Lift hash functions from bdf driver to base module.
* src/base/fthash.c, include/freetype/internal/fthash.h: New files, containing (massaged) code from `bdflib.c' and `bdf.h'. * include/freetype/internal/internal.h (FT_INTERNAL_HASH_H): New macro. * src/base/ftbase.c: Include `fthash.c'. * src/base/Jamfile (_sources): Add `fthash'. * src/base/rules.mk (BASE_SRC): Add `fthash.c'. * docs/LICENSE.TXT: Updated.
Diffstat (limited to 'docs/LICENSE.TXT')
-rw-r--r--docs/LICENSE.TXT6
1 files changed, 4 insertions, 2 deletions
diff --git a/docs/LICENSE.TXT b/docs/LICENSE.TXT
index 99dc342d7..af5a1c50f 100644
--- a/docs/LICENSE.TXT
+++ b/docs/LICENSE.TXT
@@ -23,9 +23,11 @@ any of your projects or products.
GPL. Note that the FTL is incompatible with GPLv2 due to its
advertisement clause.
-The contributed BDF and PCF drivers come with a license similar to that
+The contributed BDF and PCF drivers come with a license similar to that
of the X Window System. It is compatible to the above two licenses (see
-file src/bdf/README and src/pcf/README).
+file src/bdf/README and src/pcf/README). The same holds for the files
+`fthash.c' and `fthash.h'; their code was part of the BDF driver in
+earlier FreeType versions.
The gzip module uses the zlib license (see src/gzip/zlib.h) which too is
compatible to the above two licenses.