Commit e7130ee92ee2965f1167bae33cf24ac951c6ec0f

Richard 2018-02-15T20:47:56

Merge pull request #12 from frankheckenbach/master copied fonts used by test programs (#9 (comment))

diff --git a/debian/copyright b/debian/copyright
index 9250931..7cbfa3f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -30,3 +30,48 @@ Licensing information:
     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
     OTHER DEALINGS IN THE SOFTWARE.
 
+test/font_pack/timR12-ISO8859-1.pcf.gz
+
+    Copied from the Debian package xfonts-100dpi
+
+    This package contains the font-adobe-100dpi, font-bh-100dpi,
+    font-bh-lucidatypewriter-100dpi and font-bitstream-100dpi tarballs
+    downloaded from: http://xorg.freedesktop.org/releases/individual/font/
+
+    font-adobe-100dpi:
+      Copyright 1984-1989, 1994 Adobe Systems Incorporated.
+      Copyright 1988, 1994 Digital Equipment Corporation.
+
+      Adobe is a trademark of Adobe Systems Incorporated which may be
+      registered in certain jurisdictions.
+      Permission to use these trademarks is hereby granted only in
+      association with the images described in this file.
+
+      Permission to use, copy, modify, distribute and sell this software
+      and its documentation for any purpose and without fee is hereby
+      granted, provided that the above copyright notices appear in all
+      copies and that both those copyright notices and this permission
+      notice appear in supporting documentation, and that the names of
+      Adobe Systems and Digital Equipment Corporation not be used in
+      advertising or publicity pertaining to distribution of the software
+      without specific, written prior permission.  Adobe Systems and
+      Digital Equipment Corporation make no representations about the
+      suitability of this software for any purpose.  It is provided "as
+      is" without express or implied warranty.
+
+test/font_pack/El_Abogado_Loco.ttf
+
+    Copied from the Debian package fonts-dustin
+
+    This package was debianized by Aurelien Jarno <aurel32@debian.org> on
+    Mon,  7 Apr 2003 00:33:50 +0200.
+
+    All the fonts were downloaded from http://www.dustismo.com
+
+    Upstream Author: Dustin Norlander <dustin@dustismo.com>
+
+    Copyright (C) 2002-2003 Dustin Norlander
+
+    You are free to distribute this software under the terms of the GNU General
+    Public License.  On Debian systems, the complete text of the GNU General Public
+    License can be found in /usr/share/common-licenses/GPL-2 file.
diff --git a/test/FTBufferFont-Bitmap.cpp b/test/FTBufferFont-Bitmap.cpp
index 5e8d759..c717672 100644
--- a/test/FTBufferFont-Bitmap.cpp
+++ b/test/FTBufferFont-Bitmap.cpp
@@ -33,7 +33,7 @@ int main (int argc, char **argv)
   glutInitWindowSize (400, 400);
   glutCreateWindow ("FTGL Test");
   glutDisplayFunc (display);
-  const char *file = "/usr/share/fonts/X11/100dpi/timR12-ISO8859-1.pcf.gz";
+  const char *file = "font_pack/timR12-ISO8859-1.pcf.gz";
   font = new FTBufferFont (file);
   if (font->Error () || !font->FaceSize (17))
     {
diff --git a/test/FTContour-NaN.cpp b/test/FTContour-NaN.cpp
index 8d5cb34..fa10a07 100644
--- a/test/FTContour-NaN.cpp
+++ b/test/FTContour-NaN.cpp
@@ -34,7 +34,7 @@ int main (int argc, char **argv)
   glutInitWindowSize (400, 400);
   glutCreateWindow ("FTGL Test");
   glutDisplayFunc (display);
-  const char *file = "/usr/share/fonts/truetype/dustin/El_Abogado_Loco.ttf";
+  const char *file = "font_pack/El_Abogado_Loco.ttf";
   font = new FTExtrudeFont (file);
   if (font->Error () || !font->FaceSize (100))
     {
diff --git a/test/FTOutlineFont-UnInVec.cpp b/test/FTOutlineFont-UnInVec.cpp
index c92cbc9..694f503 100644
--- a/test/FTOutlineFont-UnInVec.cpp
+++ b/test/FTOutlineFont-UnInVec.cpp
@@ -33,7 +33,7 @@ int main (int argc, char **argv)
   glutInitWindowSize (400, 400);
   glutCreateWindow ("FTGL Test");
   glutDisplayFunc (display);
-  const char *file = "/usr/share/fonts/X11/100dpi/timR12-ISO8859-1.pcf.gz";
+  const char *file = "font_pack/timR12-ISO8859-1.pcf.gz";
   font = new FTOutlineFont (file);
   if (font->Error () || !font->FaceSize (17))
     {
diff --git a/test/FTPixmapFont-Bitmap.cpp b/test/FTPixmapFont-Bitmap.cpp
index f39b646..25a77c6 100644
--- a/test/FTPixmapFont-Bitmap.cpp
+++ b/test/FTPixmapFont-Bitmap.cpp
@@ -34,7 +34,7 @@ int main (int argc, char **argv)
   glutInitWindowSize (400, 400);
   glutCreateWindow ("FTGL Test");
   glutDisplayFunc (display);
-  const char *file = "/usr/share/fonts/X11/100dpi/timR12-ISO8859-1.pcf.gz";
+  const char *file = "font_pack/timR12-ISO8859-1.pcf.gz";
   font = new FTPixmapFont (file);
   if (font->Error ())
     {
diff --git a/test/FTPolygonFont-UnInVec.cpp b/test/FTPolygonFont-UnInVec.cpp
index 5186e24..11bd963 100644
--- a/test/FTPolygonFont-UnInVec.cpp
+++ b/test/FTPolygonFont-UnInVec.cpp
@@ -33,7 +33,7 @@ int main (int argc, char **argv)
   glutInitWindowSize (400, 400);
   glutCreateWindow ("FTGL Test");
   glutDisplayFunc (display);
-  const char *file = "/usr/share/fonts/X11/100dpi/timR12-ISO8859-1.pcf.gz";
+  const char *file = "font_pack/timR12-ISO8859-1.pcf.gz";
   font = new FTPolygonFont (file);
   if (font->Error () || !font->FaceSize (17))
     {
diff --git a/test/FTTextureFont-Bitmap.cpp b/test/FTTextureFont-Bitmap.cpp
index 825ba37..ab3952c 100644
--- a/test/FTTextureFont-Bitmap.cpp
+++ b/test/FTTextureFont-Bitmap.cpp
@@ -33,7 +33,7 @@ int main (int argc, char **argv)
   glutInitWindowSize (400, 400);
   glutCreateWindow ("FTGL Test");
   glutDisplayFunc (display);
-  const char *file = "/usr/share/fonts/X11/100dpi/timR12-ISO8859-1.pcf.gz";
+  const char *file = "font_pack/timR12-ISO8859-1.pcf.gz";
   font = new FTTextureFont (file);
   if (font->Error () || !font->FaceSize (17))
     {
diff --git a/test/font_pack/El_Abogado_Loco.ttf b/test/font_pack/El_Abogado_Loco.ttf
new file mode 100644
index 0000000..a01e0bd
Binary files /dev/null and b/test/font_pack/El_Abogado_Loco.ttf differ
diff --git a/test/font_pack/timR12-ISO8859-1.pcf.gz b/test/font_pack/timR12-ISO8859-1.pcf.gz
new file mode 100644
index 0000000..73c62e0
Binary files /dev/null and b/test/font_pack/timR12-ISO8859-1.pcf.gz differ