summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2021-11-20 22:10:34 +0000
committerMoonchild <moonchild@palemoon.org>2022-04-05 19:39:53 +0200
commitdf3eed4ef9d8a4997b0d299cfb6ad8e5ea9cba9c (patch)
treef554875e758c56f26de501ffd53d155816f89cda
parent804d0f6604252768a9230c63cdf7f079b9f8cab8 (diff)
downloaduxp-df3eed4ef9d8a4997b0d299cfb6ad8e5ea9cba9c.tar.gz
Issue #1795 - Increase the MAX_FONT_SIZE limit applied in cairo_ft_font
to match the Thebes gfxFont size limit. Also adds synching comments just to be sure.
-rw-r--r--gfx/cairo/cairo/src/cairo-ft-font.c7
-rw-r--r--gfx/thebes/gfxFont.h1
2 files changed, 6 insertions, 2 deletions
diff --git a/gfx/cairo/cairo/src/cairo-ft-font.c b/gfx/cairo/cairo/src/cairo-ft-font.c
index 1a2799b86c..a2259c173a 100644
--- a/gfx/cairo/cairo/src/cairo-ft-font.c
+++ b/gfx/cairo/cairo/src/cairo-ft-font.c
@@ -64,9 +64,12 @@ static setLcdFilterFunc setLcdFilter;
/* 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
+
+/* This is the (arbitrary) maximum font size we allow to be passed to
+ FT_Set_Char_Size.
+ Note: This should be equal to FONT_MAX_SIZE in thebes/gfxFont.h
*/
-#define MAX_FONT_SIZE 1000
+#define MAX_FONT_SIZE 2000
/**
* SECTION:cairo-ft
diff --git a/gfx/thebes/gfxFont.h b/gfx/thebes/gfxFont.h
index 07c00f04c5..ab1677b9c5 100644
--- a/gfx/thebes/gfxFont.h
+++ b/gfx/thebes/gfxFont.h
@@ -47,6 +47,7 @@ class gfxShapedWord;
class gfxSkipChars;
class gfxMathTable;
+// If you change this value, also change MAX_FONT_SIZE in cairo-ft-font.c to match
#define FONT_MAX_SIZE 2000.0
#define NO_FONT_LANGUAGE_OVERRIDE 0