summaryrefslogtreecommitdiffstats
path: root/modules/freetype2/src/type42
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-05-15 20:21:34 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-05-15 20:21:34 +0200
commit9c075dc4cdaeef79bc570ed2219bb757cb325c47 (patch)
treecda2be4b94e235a7c742b0598ee4b13478c1c7b8 /modules/freetype2/src/type42
parent7bd7473702918934b4f5751a583c3f459bb06c7b (diff)
downloadUXP-9c075dc4cdaeef79bc570ed2219bb757cb325c47.tar
UXP-9c075dc4cdaeef79bc570ed2219bb757cb325c47.tar.gz
UXP-9c075dc4cdaeef79bc570ed2219bb757cb325c47.tar.lz
UXP-9c075dc4cdaeef79bc570ed2219bb757cb325c47.tar.xz
UXP-9c075dc4cdaeef79bc570ed2219bb757cb325c47.zip
Update in-tree freetype2 lib (unused) to 2.9.1
Diffstat (limited to 'modules/freetype2/src/type42')
-rw-r--r--modules/freetype2/src/type42/Jamfile2
-rw-r--r--modules/freetype2/src/type42/module.mk2
-rw-r--r--modules/freetype2/src/type42/rules.mk2
-rw-r--r--modules/freetype2/src/type42/t42drivr.c2
-rw-r--r--modules/freetype2/src/type42/t42drivr.h2
-rw-r--r--modules/freetype2/src/type42/t42error.h2
-rw-r--r--modules/freetype2/src/type42/t42objs.c8
-rw-r--r--modules/freetype2/src/type42/t42objs.h2
-rw-r--r--modules/freetype2/src/type42/t42parse.c2
-rw-r--r--modules/freetype2/src/type42/t42parse.h2
-rw-r--r--modules/freetype2/src/type42/t42types.h2
-rw-r--r--modules/freetype2/src/type42/type42.c8
12 files changed, 16 insertions, 20 deletions
diff --git a/modules/freetype2/src/type42/Jamfile b/modules/freetype2/src/type42/Jamfile
index a504ad17d..b98de05a7 100644
--- a/modules/freetype2/src/type42/Jamfile
+++ b/modules/freetype2/src/type42/Jamfile
@@ -1,6 +1,6 @@
# FreeType 2 src/type42 Jamfile
#
-# Copyright 2002-2016 by
+# Copyright 2002-2018 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/modules/freetype2/src/type42/module.mk b/modules/freetype2/src/type42/module.mk
index a7e27b723..3d4732bb6 100644
--- a/modules/freetype2/src/type42/module.mk
+++ b/modules/freetype2/src/type42/module.mk
@@ -3,7 +3,7 @@
#
-# Copyright 2002-2016 by
+# Copyright 2002-2018 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/modules/freetype2/src/type42/rules.mk b/modules/freetype2/src/type42/rules.mk
index 80710eff6..9325d3898 100644
--- a/modules/freetype2/src/type42/rules.mk
+++ b/modules/freetype2/src/type42/rules.mk
@@ -3,7 +3,7 @@
#
-# Copyright 2002-2016 by
+# Copyright 2002-2018 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/modules/freetype2/src/type42/t42drivr.c b/modules/freetype2/src/type42/t42drivr.c
index dad35c2b1..f579b2708 100644
--- a/modules/freetype2/src/type42/t42drivr.c
+++ b/modules/freetype2/src/type42/t42drivr.c
@@ -4,7 +4,7 @@
/* */
/* High-level Type 42 driver interface (body). */
/* */
-/* Copyright 2002-2016 by */
+/* Copyright 2002-2018 by */
/* Roberto Alameda. */
/* */
/* This file is part of the FreeType project, and may only be used, */
diff --git a/modules/freetype2/src/type42/t42drivr.h b/modules/freetype2/src/type42/t42drivr.h
index 6ddfb639d..3667f3e06 100644
--- a/modules/freetype2/src/type42/t42drivr.h
+++ b/modules/freetype2/src/type42/t42drivr.h
@@ -4,7 +4,7 @@
/* */
/* High-level Type 42 driver interface (specification). */
/* */
-/* Copyright 2002-2016 by */
+/* Copyright 2002-2018 by */
/* Roberto Alameda. */
/* */
/* This file is part of the FreeType project, and may only be used, */
diff --git a/modules/freetype2/src/type42/t42error.h b/modules/freetype2/src/type42/t42error.h
index e1097cc81..e3978a760 100644
--- a/modules/freetype2/src/type42/t42error.h
+++ b/modules/freetype2/src/type42/t42error.h
@@ -4,7 +4,7 @@
/* */
/* Type 42 error codes (specification only). */
/* */
-/* Copyright 2002-2016 by */
+/* Copyright 2002-2018 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
diff --git a/modules/freetype2/src/type42/t42objs.c b/modules/freetype2/src/type42/t42objs.c
index 1e4907b86..66e5c4038 100644
--- a/modules/freetype2/src/type42/t42objs.c
+++ b/modules/freetype2/src/type42/t42objs.c
@@ -4,7 +4,7 @@
/* */
/* Type 42 objects manager (body). */
/* */
-/* Copyright 2002-2016 by */
+/* Copyright 2002-2018 by */
/* Roberto Alameda. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -394,12 +394,6 @@
if ( clazz )
error = FT_CMap_New( clazz, NULL, &charmap, NULL );
-
-#if 0
- /* Select default charmap */
- if ( root->num_charmaps )
- root->charmap = root->charmaps[0];
-#endif
}
}
Exit:
diff --git a/modules/freetype2/src/type42/t42objs.h b/modules/freetype2/src/type42/t42objs.h
index 87a40452f..3bad5135e 100644
--- a/modules/freetype2/src/type42/t42objs.h
+++ b/modules/freetype2/src/type42/t42objs.h
@@ -4,7 +4,7 @@
/* */
/* Type 42 objects manager (specification). */
/* */
-/* Copyright 2002-2016 by */
+/* Copyright 2002-2018 by */
/* Roberto Alameda. */
/* */
/* This file is part of the FreeType project, and may only be used, */
diff --git a/modules/freetype2/src/type42/t42parse.c b/modules/freetype2/src/type42/t42parse.c
index ef36ffe3c..4813d1f3f 100644
--- a/modules/freetype2/src/type42/t42parse.c
+++ b/modules/freetype2/src/type42/t42parse.c
@@ -4,7 +4,7 @@
/* */
/* Type 42 font parser (body). */
/* */
-/* Copyright 2002-2016 by */
+/* Copyright 2002-2018 by */
/* Roberto Alameda. */
/* */
/* This file is part of the FreeType project, and may only be used, */
diff --git a/modules/freetype2/src/type42/t42parse.h b/modules/freetype2/src/type42/t42parse.h
index ba9e85719..f35d23de6 100644
--- a/modules/freetype2/src/type42/t42parse.h
+++ b/modules/freetype2/src/type42/t42parse.h
@@ -4,7 +4,7 @@
/* */
/* Type 42 font parser (specification). */
/* */
-/* Copyright 2002-2016 by */
+/* Copyright 2002-2018 by */
/* Roberto Alameda. */
/* */
/* This file is part of the FreeType project, and may only be used, */
diff --git a/modules/freetype2/src/type42/t42types.h b/modules/freetype2/src/type42/t42types.h
index 850a156e4..d0aa2de57 100644
--- a/modules/freetype2/src/type42/t42types.h
+++ b/modules/freetype2/src/type42/t42types.h
@@ -4,7 +4,7 @@
/* */
/* Type 42 font data types (specification only). */
/* */
-/* Copyright 2002-2016 by */
+/* Copyright 2002-2018 by */
/* Roberto Alameda. */
/* */
/* This file is part of the FreeType project, and may only be used, */
diff --git a/modules/freetype2/src/type42/type42.c b/modules/freetype2/src/type42/type42.c
index 0d17a9b1d..6a89cfbed 100644
--- a/modules/freetype2/src/type42/type42.c
+++ b/modules/freetype2/src/type42/type42.c
@@ -4,7 +4,7 @@
/* */
/* FreeType Type 42 driver component. */
/* */
-/* Copyright 2002-2016 by */
+/* Copyright 2002-2018 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -15,11 +15,13 @@
/* */
/***************************************************************************/
-#define FT_MAKE_OPTION_SINGLE_OBJECT
+#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <ft2build.h>
+
+#include "t42drivr.c"
#include "t42objs.c"
#include "t42parse.c"
-#include "t42drivr.c"
+
/* END */