Commit Graph

195 Commits

Author SHA1 Message Date
Aarni Koskela
39ec56c6ea Improve error message when creating TrueType fonts of invalid size
Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com>
2023-11-28 15:09:53 +02:00
Andrew Murray
4bc365547a
Corrected type hint
Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
2023-11-28 21:43:58 +11:00
Andrew Murray
9e8edb42b6 Added type hint 2023-11-28 21:18:58 +11:00
Andrew Murray
ae7958fa8d Handle pathlib.Path in FreeTypeFont 2023-11-27 23:03:10 +11:00
Andrew Murray
524b823c1b Removed unnecessary string length check 2023-11-17 17:41:47 +11:00
Andrew Murray
f016d3079b Determine mask mode in Python instead of C 2023-11-13 14:31:22 +11:00
Andrew Murray
c2d50881ee Added documentation 2023-10-14 11:01:57 +11:00
Andrew Murray
0da7ad7c48 Merge branch 'main' into load_default 2023-10-14 10:33:50 +11:00
Hugo van Kemenade
4d66f9396b
Merge pull request #7247 from radarhere/getmask2_max_image_pixels 2023-10-05 09:28:04 -06:00
Andrew Murray
eccef36948 Added size argument to load_default() 2023-08-26 17:01:01 +10:00
Andrew Murray
1e5aa21fa8 Added improved font to load_default() if FreeType is available 2023-08-26 17:00:34 +10:00
Hugo van Kemenade
62cd236d1a Clarify that a single value is returned, and depends on the text direction 2023-07-25 12:31:58 +03:00
Andrew Murray
74859e965d Moved MAX_IMAGE_PIXELS check to Python 2023-07-01 20:52:44 +10:00
Andrew Murray
39a3b1d83e Fixed deallocating mask images 2023-07-01 18:09:27 +10:00
Andrew Murray
d398fedb9d
Added underscores for readability
Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
2023-07-01 07:25:18 +10:00
Andrew Murray
1fe1bb49c4 Added ImageFont.MAX_STRING_LENGTH 2023-06-30 23:32:26 +10:00
Hugo van Kemenade
8f3ccff8f2
Merge pull request #7206 from radarhere/text_layout 2023-06-13 20:31:24 +03:00
Andrew Murray
1756df4615 Removed unused private method 2023-06-10 20:24:34 +10:00
Andrew Murray
389ad11693 Only call text_layout once in getmask2 2023-06-10 17:10:42 +10:00
Andrew Murray
b2301d70d1 Removed ImageFont.getsize and related functions 2023-04-10 16:56:13 +10:00
Hugo van Kemenade
c9f11565f1 Remove FreeTypeFont.getmask2 fill parameter, deprecated in 9.2.0 2023-04-06 16:11:36 +03:00
Hugo van Kemenade
c8ec15980b Remove constants deprecated in 9.1.0 2023-04-06 16:11:36 +03:00
Hugo van Kemenade
3cfdef395e
Merge pull request #7047 from nulano/freetype-import
Do not discard error message if _imagingft fails to import
2023-04-01 08:43:45 +03:00
nulano
b18efc775d
do not discard ImportError message in ImageFont 2023-03-31 01:48:17 +02:00
Andrew Murray
80edcd18d1 Do not render text if image has zero width or height 2023-03-17 20:11:35 +11:00
Hugo van Kemenade
8ef6503801
Merge pull request #6914 from radarhere/default 2023-03-12 12:39:45 +02:00
Andrew Murray
742aff3718 Replace Python code-blocks with double colons 2023-02-24 08:17:10 +11:00
pre-commit-ci[bot]
24183d652e [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-02-06 19:27:19 +00:00
nulano
73f55b4e01 remove redundant default value
Co-authored-by: Andrew Murray <radarhere@users.noreply.github.com>
2023-01-28 15:35:33 +11:00
Hugo van Kemenade
2ae55ccbda Improve exception traceback readability 2022-12-30 00:07:52 +02:00
Andrew Murray
70c8e342a5 Added "start" argument to docstring 2022-11-16 09:15:56 +11:00
Andrew Murray
5471dc2b26 Use fractional coordinates when drawing text 2022-11-08 11:49:39 +11:00
Hugo van Kemenade
31f66ea963
Merge pull request #6445 from radarhere/set_variation_by_name 2022-10-28 13:21:30 +03:00
Hugo van Kemenade
91e820fb46
Merge pull request #6633 from radarhere/raqm 2022-10-10 09:16:10 +02:00
Andrew Murray
397167569a
Recommend raqm for non-English text
Co-authored-by: Ondrej Baranovič <nulano@nulano.eu>
2022-10-10 09:11:41 +11:00
Andrew Murray
fea604f693
Merge pull request #6556 from radarhere/returns
Improved documentation of ImageDraw return values
2022-10-03 19:06:58 +11:00
Andrew Murray
74f47d8c1a Document that basic layout is faster than raqm 2022-10-03 10:03:13 +11:00
Andrew Murray
ba78f5d0da Document the default layout engine 2022-10-03 09:39:37 +11:00
Andrew Murray
34f61d6d2d Updated redirected URLs 2022-09-23 22:13:50 +10:00
Andrew Murray
17b56b9463 Merge branch 'main' into set_variation_by_name 2022-09-17 00:01:05 +10:00
Andrew Murray
bce9df62f1
Rearranged text
Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
2022-09-06 16:19:47 +10:00
Andrew Murray
7359af91f0
Rearranged text
Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
2022-09-06 16:18:55 +10:00
Andrew Murray
209ec9da47 Use target 2022-09-06 06:43:52 +10:00
Andrew Murray
780de80e5c Added examples for updating code 2022-09-03 22:23:05 +10:00
Andrew Murray
c24b6ef4f0 Document workaround 2022-08-06 23:01:36 +10:00
Andrew Murray
42a5a743c1 Note to Windows users that FreeType will keep the font file open 2022-08-06 22:48:10 +10:00
Andrew Murray
dea30e4c80 Fixed set_variation_by_name offset 2022-07-18 08:39:23 +10:00
Andrew Murray
8a6050ee5b Replaced __internal__ argument with warning filters 2022-07-01 14:10:29 +02:00
Andrew Murray
729fe6f8b0 Updated indentation 2022-07-01 19:45:36 +10:00
nulano
ad5271d62f
Document replacements for individual deprecated font methods 2022-06-30 15:03:55 +02:00
Andrew Murray
65020e7c7c Documented deprecation in individual methods 2022-06-30 15:03:12 +02:00
Ondrej Baranovič
838b1f1598
add replacement for getsize_multiline to deprecation warning 2022-06-30 14:22:07 +02:00
pre-commit-ci[bot]
303ec1a95e [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-06-30 12:21:43 +00:00
Ondrej Baranovič
f57a9d678c
update TransposedFont.getlength error message
Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com>
2022-06-30 14:20:56 +02:00
nulano
93acbcf9e2
add getbbox and getlength to TransposedFont with tests 2022-06-20 02:37:42 +01:00
nulano
c854bf8d1c
add getbbox and getlength to basic ImageFont and update related tests 2022-06-19 22:04:56 +01:00
nulano
406fe59242
deprecate font.getsize and related functions 2022-06-19 22:03:34 +01:00
Hugo van Kemenade
fbb74a6050
Merge pull request #6234 from radarhere/font_variant
If font is file-like object, do not re-read from object to get variant
2022-05-19 23:30:44 +03:00
Andrew Murray
bcded33cee
Merge pull request #6195 from hugovk/cleanup
Cleanup: various
2022-04-26 18:51:44 +10:00
Andrew Murray
a40c7a6bea If font is file-like object, do not re-read from object to get variant 2022-04-22 07:31:20 +10:00
Hugo van Kemenade
bf46c6a648
Fix docstring
Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com>
2022-04-18 07:42:05 +03:00
Andrew Murray
a33dc56560
Merge pull request #6220 from nulano/deprecate-fill
Deprecate FreeTypeFont.getmask2 fill parameter
2022-04-18 08:05:10 +10:00
Ondrej Baranovič
995be34ddb
flip so the conditional is positive
Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
2022-04-17 19:27:14 +02:00
Andrew Murray
c87c2cf5b3 Added removal date for fill parameter 2022-04-17 10:03:50 +02:00
Andrew Murray
2a29b2dba1 Document that fill parameter is optional 2022-04-17 10:03:50 +02:00
nulano
b4b8249c9d
None is also not a valid value 2022-04-16 17:46:43 +02:00
nulano
a766b5b0d5
deprecate fill in imageFont 2022-04-16 17:07:32 +02:00
Andrew Murray
35fbf22250
Merge branch 'main' into cleanup-names 2022-04-16 19:49:40 +10:00
Hugo van Kemenade
7fa92c67b1 [Private] class names should be CamelCase 2022-04-10 23:55:16 +03:00
Hugo van Kemenade
d241e38120 [Private] function names should be snake_case 2022-04-10 23:55:16 +03:00
Hugo van Kemenade
965df6df6f Add missing paramters to docstrings 2022-04-10 23:39:54 +03:00
Hugo van Kemenade
935bdfa516 Use triple-quoted docstrings 2022-04-10 17:47:32 +03:00
Hugo van Kemenade
4cb8e4b3fa Add deprecations helper 2022-04-06 13:19:52 +03:00
Andrew Murray
3c1e7a7f5a Corrected docstring [ci skip] 2022-02-22 10:32:02 +11:00
Andrew Murray
b38a67fa12
Merge branch 'main' into enum 2022-02-10 09:52:24 +11:00
nulano
a278e0aa65
issue warning if Raqm layout is requested, but Raqm is not available 2022-02-07 23:57:35 +00:00
Andrew Murray
ed8073e846 Deprecated constants in favour of enums 2022-01-15 10:07:07 +11:00
Andrew Murray
f8e4e9c2dd Added enums 2022-01-15 09:02:31 +11:00
Hugo van Kemenade
18d34b287f Add support for pickling TrueType fonts 2021-11-10 14:34:20 +02:00
Hugo van Kemenade
606b5ae1e5 Remove support for FreeType 2.7 and older 2021-10-18 09:29:53 +03:00
Andrew Murray
ca3ad49de3 Fixed bug when checking FreeType2 version if it is not installed 2021-04-29 23:10:08 +10:00
Eric Soroos
ba65f0b08e Fix Memory DOS in ImageFont
* A corrupt or specially crafted TTF font could have font metrics that
  lead to unreasonably large sizes when rendering text in
  font. ImageFont.py did not check the image size before allocating
  memory for it.
* Found with oss-fuzz
* This dates from the PIL fork
2021-04-01 17:17:27 +03:00
Andrew Murray
043d8dac0b Do not require packaging just for a DeprecationWarning 2020-12-18 23:42:16 +11:00
Hugo van Kemenade
27bf17009c Deprecate FreeType 2.7, to be removed in Pillow 9 (2022-01-02) 2020-12-17 10:28:06 +02:00
Andrew Murray
4f0b9185a3 Fixed link formatting 2020-11-14 08:41:44 +11:00
nulano
d7a08cbd15 add color support to new text measuring functions 2020-10-12 16:05:19 +01:00
nulano
90e8255ba4 Merge remote-tracking branch 'upstream/master' into anchor-part3
# Conflicts:
#	Tests/test_imagefontctl.py
2020-10-12 15:50:45 +01:00
nulano
067a254366
Apply suggestions from code review
Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
2020-10-11 21:55:32 +02:00
nulano
9b5931f212
typo
Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com>
2020-10-09 16:43:10 +02:00
nulano
c80f123923 document ImageDraw.textlength and ImageDraw.textbbox 2020-10-09 01:43:23 +01:00
nulano
395aa946a9 add getbbox and getlength, with tests
Squashed commits:

[ec9ec31b] add tests for invalid anchor
(cherry picked from commit 9e50a6a47f79876ee56942152047f03fff03c49b)

[386a9170] fix lint and docs
(cherry picked from commit 2d0d5282fcfc3ee332a41e60b865ee766445cc3d)

[29f5d4c9] restore and document previous getsize behaviour
see discussion in issue 4789
(cherry picked from commit 9fbc94571ce0ed42fdd11e99f343a1613c9dc6d3)

[0ffd51a0] add getbbox and getlength, with tests
(cherry picked from commit c5f63737476a998c81e589e5819d21ca69bb7b46)
2020-10-09 00:56:58 +01:00
nulano
82a28d12e2 add support for fonts with COLR data 2020-10-07 05:29:10 +01:00
nulano
a9b8dcba7d write anchor docs
(cherry picked from commit dcaee36941e6cb5e6f93186b6f819fb74887e0d3)
2020-09-22 14:58:17 +02:00
nulano
e6d4c2ce8f implement text anchor for truetype fonts
(cherry picked from commit bac9025918ccf944bac77addc130f33cf9d74701)
2020-09-19 15:17:45 +02:00
Hugo van Kemenade
93d011efb5
Merge pull request #4910 from nulano/anchor-part1 2020-09-19 13:41:15 +03:00
nulano
a501ba9308 update link in comment 2020-09-11 01:14:00 +02:00
nulano
54e067779b fix and add tests
(cherry picked from commit 0b711f10d0490863976699c051f2027b6799d501) (+1 squashed commits)

Squashed commits:

[9d4e6c17] fix tests
2020-09-09 02:12:21 +02:00
Hugo van Kemenade
e0eec1eb56 Merge branch 'master' into rm-3.5 2020-09-01 20:16:46 +03:00
nulano
d36850e037 fix docs typos 2020-08-11 02:14:13 +02:00
Hugo van Kemenade
e42aec8c90 Update Black target to py36 2020-07-27 17:02:10 +03:00