summaryrefslogtreecommitdiffstats
path: root/gfx/cairo/max-font-size.patch
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-11-06 21:06:15 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-11-07 14:49:48 +0100
commit7efd71616ec5efedbe626a986a707c35d3cac323 (patch)
tree0223e8271d9d18763efd743f43f98b8b8b9e5c2e /gfx/cairo/max-font-size.patch
parentbbc2206a0fda053a6f5071b457bd209dab9ed268 (diff)
downloadUXP-7efd71616ec5efedbe626a986a707c35d3cac323.tar
UXP-7efd71616ec5efedbe626a986a707c35d3cac323.tar.gz
UXP-7efd71616ec5efedbe626a986a707c35d3cac323.tar.lz
UXP-7efd71616ec5efedbe626a986a707c35d3cac323.tar.xz
UXP-7efd71616ec5efedbe626a986a707c35d3cac323.zip
Issue #1274 - Part 1: Adopt the cairo version as our own.
- Move header licensing from tri-license to MPL 2.0. MPL-compatible other licensing has been retained where originally present. - Remove individual superseded licensing terms. - Remove patches, outdated readmes & incomplete patch summaries. - Remove incomplete cairo release notes (only went up to 1.6.4 anyway). - Rewrite COPYING to indicate the current state of the library in tree.
Diffstat (limited to 'gfx/cairo/max-font-size.patch')
-rw-r--r--gfx/cairo/max-font-size.patch28
1 files changed, 0 insertions, 28 deletions
diff --git a/gfx/cairo/max-font-size.patch b/gfx/cairo/max-font-size.patch
deleted file mode 100644
index 99be23906..000000000
--- a/gfx/cairo/max-font-size.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/gfx/cairo/cairo/src/cairo-ft-font.c b/gfx/cairo/cairo/src/cairo-ft-font.c
---- a/gfx/cairo/cairo/src/cairo-ft-font.c
-+++ b/gfx/cairo/cairo/src/cairo-ft-font.c
-@@ -63,6 +63,10 @@
- /* This is the max number of FT_face objects we keep open at once
- */
- #define MAX_OPEN_FACES 10
-+
-+/* This is the maximum font size we allow to be passed to FT_Set_Char_Size
-+ */
-+#define MAX_FONT_SIZE 1000
-
- /*
- * The simple 2x2 matrix is converted into separate scale and shape
-@@ -682,9 +686,11 @@ _cairo_ft_unscaled_font_set_scale (cairo
- FT_Set_Transform(unscaled->face, &mat, NULL);
-
- if ((unscaled->face->face_flags & FT_FACE_FLAG_SCALABLE) != 0) {
-+ double x_scale = MIN(sf.x_scale, MAX_FONT_SIZE);
-+ double y_scale = MIN(sf.y_scale, MAX_FONT_SIZE);
- error = FT_Set_Char_Size (unscaled->face,
-- sf.x_scale * 64.0 + .5,
-- sf.y_scale * 64.0 + .5,
-+ x_scale * 64.0 + .5,
-+ y_scale * 64.0 + .5,
- 0, 0);
- if (error)
- return _cairo_error (CAIRO_STATUS_NO_MEMORY);