9be01b6bff
[paint] Pass hb_paint_context_t along
...
Replace the font argument with a hb_paint_context_t
that carries the font, the palette index and the
foreground color.
The hb_font_paint_glyph() api now takes the palette
index and the foreground color as extra arguments.
Update all callers and regenerate test results.
2022-12-23 13:37:59 -07:00
6c71c530ca
[paint] Rename hb_paint_context_t to hb_ot_paint_context_t
2022-12-23 13:37:59 -07:00
8495395397
[paint] Fix slant
2022-12-23 13:37:59 -07:00
97224f3b63
[paint] Pass font to all callbacks
...
This will lead to easier implementations.
At the same time, we change the push_clip_glyph
callback to use the font as-is, no unscaling needed.
Update all callers and expected test results.
2022-12-23 13:37:59 -07:00
32ce29f99e
[font] Move hb_font_t typedef
...
This is needed to avoid circular header dependencies.
2022-12-23 13:37:59 -07:00
8364d9130f
Document hb_font_set_draw_glyph_func
2022-12-23 13:37:59 -07:00
a20999b9df
[font] Fix a few documentation mistakes
2022-12-23 13:37:59 -07:00
2333a566ed
Drop the deprecation
...
No need to drop hb_font_get_glyph_shape, just
because hb_font_draw_glyph does the same.
Its fine to keep both around.
2022-12-23 13:37:59 -07:00
14b026ff86
[draw] Add hb_font_draw_glyph
...
hb_font_draw_glyph(), hb_font_draw_glyph_func_t and
hb_font_funcs_set_draw_glyph_func() are just alternative
names for hb_font_get_glyph_shape and friends, to better
align with hb_font_paint_glyph.
2022-12-23 13:37:59 -07:00
08da126523
[docs] Linkify links
2022-12-23 13:37:59 -07:00
9437f719a7
[paint] Document hb_paint_extend_t
2022-12-23 13:37:59 -07:00
3a2634e27c
[paint] Document hb_font_paint_glyph_func_t
2022-12-23 13:37:59 -07:00
0f287e75ec
[paint] Rename hb_font_get_glyph_paint_func_t
...
The 'get' was just there due to implementation
choices. Work around that and call the vfunc
what it should be: hb_font_paint_glyph_func_t.
2022-12-23 13:37:59 -07:00
ddd2039265
[paint] Improve the docs
2022-12-23 13:37:59 -07:00
3a219cfa6a
[config] Make HB_LEAN imply HB_NO_PAINT
2022-12-23 13:37:59 -07:00
0ef2dc9be5
Drop a TODO
...
This was addressed in 61bd602791d801
2022-12-23 13:37:59 -07:00
96cda3886c
[paint] Clarify docs
...
Spell out where the different datas originate.
2022-12-23 13:37:59 -07:00
0800d1879c
Try to fix autotools build
2022-12-23 13:37:59 -07:00
5ac218865a
[paint] A doc fix
2022-12-23 13:37:59 -07:00
7c12db46ff
Try to fix msvc build
2022-12-23 13:37:59 -07:00
5d1fc9ee9d
[paint] Fix annotations
2022-12-23 13:37:59 -07:00
ee2204469e
[paint] Add get_empty / [sg]et_user_data
2022-12-23 13:37:59 -07:00
21a9db875e
[draw] Add get_empty / [sg]et_user_data
2022-12-23 13:37:59 -07:00
9a7422c5fb
[font] Minor doc fix
2022-12-23 13:37:59 -07:00
a9b37206eb
[font] Minor rename
2022-12-23 13:37:59 -07:00
815544a1f7
[font] Adapt paint_glyph to parent transform
2022-12-23 13:37:59 -07:00
85917e5b21
[paint] Fix docs
2022-12-23 13:37:59 -07:00
14bf3aaa8d
[colr] Make paint_image work again
2022-12-23 13:37:59 -07:00
7accbe97d8
[util] Fix argument order and root transform PNGs
2022-12-23 13:37:59 -07:00
f1f8d1e855
Small documentation addition
2022-12-23 13:37:59 -07:00
021618e91a
[colr] Add hb_ot_color_has_paint
...
This is a counterpart to hb_ot_color_has_layers
for COLRv1 data.
2022-12-23 13:37:59 -07:00
63fcb26c9b
Add some more docs
2022-12-23 13:37:59 -07:00
451414a27e
[paint] Documentation fixes
2022-12-23 13:37:59 -07:00
0c77f1d9ab
[paint] Documentation tweaks
2022-12-23 13:37:59 -07:00
0a2f3673b9
[paint] Use tags for image formats
...
This fits better with the rest of the
HarfBuzz API.
2022-12-23 13:37:59 -07:00
4c728e952b
[colr] Add a todo
2022-12-23 13:37:59 -07:00
4b0285bae6
[colr] Use slant_xy
2022-12-23 13:37:59 -07:00
b9314400ec
[colr] Hook up color-line variation
2022-12-23 13:37:59 -07:00
a935e4b0c2
[paint] Add synthetic slant to root transform
2022-12-23 13:37:59 -07:00
edf2738263
[colr] Try fixing bot build
...
I don't get the error. Let's see.
../../src/harfbuzz/src/hb-ot-color-colr-table.hh:574:66: error: incomplete definition of type 'OT::NoVariable<OT::ColorLine<OT::NoVariable>>'
2022-12-23 13:37:59 -07:00
686e627bdf
[paint] Set up root transform in one place
...
Instead of spreading this in all the tables,
make hb_paint_funcs_t provide a push/pop_root_transform
that does all the setup.
2022-12-23 13:37:59 -07:00
c6dd56cc64
[colr] Simplify color-stop handling
2022-12-23 13:37:59 -07:00
485ba9beb3
[paint] Spell out rectangle in the API
...
No need to abbreviate this.
2022-12-23 13:37:59 -07:00
37f3f0fcc2
[paint] Change the image callback
...
Instead of passing the glyph ID, give
it the image blob, a mimetype, and
glyph extents (if available).
Update all callers.
2022-12-23 13:37:59 -07:00
ea48d6c292
Move hb_glyph_extents_t definition
2022-12-23 13:37:59 -07:00
b722039c48
[colr] Simplify
2022-12-23 13:37:59 -07:00
452cfb9599
[colr] Simplify loop using iterators
...
Or complexify?!
2022-12-23 13:37:59 -07:00
601a596ca0
[paint] Fix include path
2022-12-23 13:37:59 -07:00
8a9069d55f
[colr] Fix radial gradient
...
Broke it when adding variations.
2022-12-23 13:37:59 -07:00
e799c33bb5
[paint] Fix function prototype
2022-12-23 13:37:59 -07:00
1953d26a8a
[colr] Limit recursion depth
2022-12-23 13:37:59 -07:00
378bbeea01
Add more docs
2022-12-23 13:37:59 -07:00
6079173a52
Try paint_glyph for more tables
...
If the COLR table does not paint the glyph,
try SVG, CBDT and sbix too, before giving up
on color.
2022-12-23 13:37:59 -07:00
e6c5a616aa
SVG Implement paint-glyph
2022-12-23 13:37:59 -07:00
23c60fd9b2
sbix: Implement paint_glyph
2022-12-23 13:37:59 -07:00
7996ae4c3d
CBDT: Implement paint glyph
2022-12-23 13:37:59 -07:00
82e23f322a
paint: Add a paint-image callback
...
This will be used for image blobs like pngs and svgs.
FIXME: nail down and document sizing.
2022-12-23 13:37:59 -07:00
56b02b6599
Update the docs
...
Mention that the color index will always be 0xFFFF
when using hb_paint API with fonts that don't have
color palettes.
And add an outline about which kinds of glyphs
require which callbacks.
2022-12-23 13:37:59 -07:00
9461ab7088
Try paint_glyph for more tables
...
If the COLR table can't paint the glyph,
try glyf, cff1 and cff2 too.
2022-12-23 13:37:59 -07:00
3e39dd492b
cff2: Implement paint_glyph
2022-12-23 13:37:59 -07:00
df89b52130
cff1: Implement paint_glyph
2022-12-23 13:37:59 -07:00
2edd771cf5
glyf: Implement paint_glyph
2022-12-23 13:37:59 -07:00
0b33b35eb0
COLRv1: Return bool from paint_glyph
...
This will let hb_ot_font_paint_glyph() try
multiple tables in turn.
2022-12-23 13:37:59 -07:00
0d890061d1
Rename 'solid' to 'color'
...
'solid' does not really describe well what
the function does, and there is no strong
reason to stick 1:1 to the terminology used
in the spec.
2022-12-23 13:37:59 -07:00
46286275f7
[colr] More dispatch functionality
2022-12-23 13:37:59 -07:00
81f232afb5
[colr] Use dispatch machinery for paint_glyph context
2022-12-23 13:37:59 -07:00
a96300d42c
[colr] Hide internal symbols
2022-12-23 13:37:59 -07:00
b4cab86d94
Fix autotools build
2022-12-23 13:37:59 -07:00
0757519092
[colr] Add variation to rest of the paints
2022-12-23 13:37:59 -07:00
5bce005346
[colr] Flesh out variations for a few paints
2022-12-23 13:37:59 -07:00
9d3440b742
[colr] Add variation infrastructure to paint_glyph
...
No paint applies variations yet.
2022-12-23 13:37:59 -07:00
5c6329555e
Apply root transform
...
This commit applies scale, slant is still missing.
2022-12-23 13:37:59 -07:00
5afca91ff2
Add some docs
2022-12-23 13:37:59 -07:00
44c68594f1
Some docs
2022-12-23 13:37:59 -07:00
d7c2eacf45
Handle COLRv0 layers in paint_glyph
2022-12-23 13:37:59 -07:00
55ca6ed230
minor fixes
2022-12-23 13:37:59 -07:00
1880e54753
Assorted fixes
2022-12-23 13:37:59 -07:00
684df8a82a
add some todos
2022-12-23 13:37:59 -07:00
a6f813b680
Implement hb_color_line_get_extend
2022-12-23 13:37:59 -07:00
3937d6b0aa
Implement hb_color_line_t
2022-12-23 13:37:59 -07:00
64f1b55d01
api fixes: use floats consistently
2022-12-23 13:37:59 -07:00
627c857f8b
rename pop_group_and_composite
2022-12-23 13:37:59 -07:00
c9350838c7
assorted fixes and changes
2022-12-23 13:37:59 -07:00
42324aef2b
hb-paint: annotation fix
2022-12-23 13:37:59 -07:00
8377341b28
wip: implement paint_glyph
2022-12-23 13:37:59 -07:00
efe13a191d
fix introspection
2022-12-23 13:37:59 -07:00
6a48ac42f4
COLR implementation
2022-12-23 13:37:59 -07:00
71efa0dcf1
wip: hb_font_paint_glyph
2022-12-23 13:37:59 -07:00
83d0a49f71
wip: hb-paint
2022-12-23 13:37:59 -07:00
30c5402e3d
Make hb-features.h usable standalone
...
The intended use for hb-features.h is to
be included standalone, so we can't put
the single-include guards in here.
2022-12-23 12:33:28 -07:00
d628aff9db
[ft] Apply slant in get_glyph_extents
2022-12-22 10:53:37 -07:00
9a0ebd2b2a
[glyf] Fix slant-scaling in GlyphHeader too
2022-12-22 10:21:50 -07:00
392463bff5
[cff] Fix extent rounding
...
I broke it in b0abbfd868
2022-12-22 08:34:01 -07:00
897c102703
[font] Fix scale_glyph_extents
2022-12-22 08:15:01 -07:00
9194e13e25
[font] Apply slant to glyph extents
...
Fixes https://github.com/harfbuzz/harfbuzz/issues/3952
hb-ft not fixed since doesn't use this code.
2022-12-22 07:32:29 -07:00
b0abbfd868
[font] Centralize glyph-extents scaling
...
Needs more testing...
Some rounding was removed, namely in cff1 and cff2.
2022-12-22 07:32:15 -07:00
97b8ada865
[varc] Reset component coordinates to that of the font
...
Fixes https://github.com/harfbuzz/boring-expansion-spec/issues/78
2022-12-21 19:52:20 -07:00
40342c9437
[subset] check for addition overflow in hdmx size calculation.
...
Fixes https://oss-fuzz.com/testcase-detail/4877336988483584 .
2022-12-21 16:44:06 -07:00
d77fca997e
[subset] when subsetting preprocessor fails, reference the returned face.
...
The caller of the method is expected to destroy the returned result.
2022-12-21 15:04:27 -07:00
9b5b4da0e4
[varc] Set coordinates as absolute values
2022-12-20 09:58:04 -07:00
80e68f09c5
[VarC] Change rotation/skew representation
...
Fixes https://github.com/harfbuzz/boring-expansion-spec/issues/77
2022-12-19 19:17:04 -07:00
1840b02e6a
[subset] Don't gate access to the table repacker.
...
Any table with an object graph should repack correctly.
2022-12-19 17:57:33 -07:00
03a1685693
[VarC] Change representation of scale from 4.12 to 6.10
...
Fixes https://github.com/harfbuzz/boring-expansion-spec/issues/76
2022-12-19 17:12:09 -07:00
c292e577ff
Fix a typo
2022-12-19 20:04:36 +02:00
b795246fff
[draw] Clarify the docs
...
Disambiguate the origin of draw_data and user_data,
this had me confused a few times.
Fixes: https://github.com/harfbuzz/harfbuzz/issues/3955
2022-12-19 20:04:36 +02:00
eddb408f9c
[draw] Small doc fix
2022-12-19 20:03:57 +02:00
bc4c290b75
[doc] Workaround gtk-doc limitation with HB_DEPRECATED_FOR
...
See https://github.com/harfbuzz/harfbuzz/issues/3957#issuecomment-1356890525
2022-12-19 00:59:50 +02:00
f9e1192d58
[ot-tag] Document two deprecated symbols
...
See https://github.com/harfbuzz/harfbuzz/issues/3957
2022-12-18 23:58:36 +02:00
947e01a7c1
[subset] Suppress gtk-doc warning
2022-12-18 23:40:01 +02:00
7be06f6377
meson: Override dependencies to improve usage as a subproject
...
With this change, harfbuzz can be consumed as a subproject without
making any changes to the build files of a project. All you need to do
is provide a wrap file with a `[provide]` section:
https://mesonbuild.com/Wrap-dependency-system-manual.html#provide-section
This is also necessary because otherwise projects need to hard-code
the subproject name, which might be `harfbuzz` when using `wrap-git` or
`harfbuzz-6.0.0` when using `wrap-file` (to build from a release
tarball). This can cause conflicts between different subprojects that
consume harfbuzz differently.
Other projects like glib, cairo, pango, etc already do this.
2022-12-18 08:28:55 +02:00
206957aee4
[COLR] Change recursion limit back to 128
2022-12-17 08:57:56 -07:00
afcae83a06
6.0.0
2022-12-16 23:35:26 +02:00
a98c6fdd92
Mark an argument as unused
2022-12-16 13:23:01 -07:00
601d3806c9
COLRv1: Revamp extents variation
...
Try to do this a cleaner way.
2022-12-16 13:23:01 -07:00
51a17201a7
[open-type] In to_float() take offset as float
2022-12-16 12:28:50 -07:00
f252cf80e1
[open-type] Allow passing an offset to to_float()
2022-12-16 12:03:51 -07:00
6ae35365f8
Fix build
2022-12-16 11:43:38 -07:00
e957391efe
[colr] Add NoVariable::varIdxBase
2022-12-16 11:33:04 -07:00
e06de98c36
[var-common] Make VarInstancer take an offset
2022-12-16 11:31:00 -07:00
251f9f6213
[open-type] Add VarIdx::add()
2022-12-16 11:29:51 -07:00
bf2ae3f0ca
[open-type] Add static_assert for NO_VARIATION
2022-12-16 11:26:24 -07:00
d4496e6405
COLRv1: Apply variations correctly
...
The variations are for xMin, yMin, xMAx, yMax.
Apply them before converting to extents..
2022-12-16 11:14:42 -07:00
193e0e3e8e
Cosmetic: typo fix
2022-12-14 22:34:06 -07:00
b5acde43ed
[subset] check pending/subsetted tag sets for alloc failure.
2022-12-13 15:31:40 -07:00
79285a9983
VarC: cast ints ( #3934 )
...
msvc is rightfully complaining that the types on the sides of
the ternary are not matching:
```
C:\pango\subprojects\harfbuzz\src\OT\glyf\VarCompositeGlyph.hh(317): error C2446: ':': no conversion from 'const OT::HBUINT16' to 'const OT::HBUINT8'
```
2022-12-13 11:14:20 -07:00
300d82ce2e
Fix compiler warning
2022-12-13 11:01:03 -07:00
199345eb29
Merge pull request #3928 from harfbuzz/colrv1-extents
...
COLRv1: use ClipBoxes for extents
2022-12-12 18:37:10 -07:00
bd7cb384cf
[VarC] Remove unused variable
2022-12-12 14:10:48 -07:00
51d3ce39ba
Merge pull request #3933 from googlefonts/cff
...
[subset] Fix infinite loop when instancing CFF fonts
2022-12-12 14:07:44 -07:00
1b278c7658
[VarC] Update for new format
...
https://github.com/harfbuzz/boring-expansion-spec/issues/71
2022-12-12 13:57:05 -07:00
64cbe8b962
[subset] Also note that only full instancing works.
2022-12-12 20:41:40 +00:00
0da59f86a8
[subset] note that CFF/CFF2 instancing is not yet supported.
2022-12-12 20:26:11 +00:00
38a9628885
[subset] simplify handling of table subsetting depedencies.
...
Allow the dependency checker to see all tables that will be subset. Use this to fix the HMTX/VMTX dep check against glyf. Don't delay hmtx/vmtx subsetting if no glyf table is present.
2022-12-12 20:13:17 +00:00
0853e5d9d7
[subset] if table dependencies can't be resolved fail the subset.
...
Avoids getting stuck in an infinite loop.
2022-12-12 19:43:31 +00:00
6bb478eeeb
[VarC] Clamp after addition
2022-12-12 11:39:06 -07:00
80a5011eb6
[VarC] Fix coord setting
...
Those are additive.
2022-12-12 11:37:59 -07:00
4e9a6cfb49
[COLR] Use VarStoreInstancer
2022-12-12 10:20:51 -07:00
a3a3d37b95
[var] Add VarStoreInstancer
2022-12-12 10:17:41 -07:00
c64661b2f8
[COLR] Fix variation code
2022-12-12 10:11:02 -07:00
ff332b14ea
[COLR] Handle HB_OT_LAYOUT_NO_VARIATIONS_INDEX
2022-12-11 21:05:14 -07:00
9a3f0be291
[COLR] Apply variations in get_extent
2022-12-11 13:40:53 -07:00
68964efa55
[COLR] Use bsearch in get_extents
2022-12-11 13:21:01 -07:00
d0ee5a452f
[COLR] Return false from get_extents if table version not 1
2022-12-11 13:13:35 -07:00
b3d6a5ef86
[colr] Minor no behavior change
2022-12-11 13:12:30 -07:00
7a748ad4ac
COLRv1: use ClipBoxes for extents
...
This is a first step; ultimatively, we
should compute the extents is ClipBoxes
are missing.
2022-12-11 13:12:30 -07:00
d36a0f8c42
[COLR] Add TODO
2022-12-11 13:12:19 -07:00
a306820681
[colr] Use SortedArray instead of Array
2022-12-11 13:03:55 -07:00
b9d5e7a8bb
[colr] Set HB_COLRV1_MAX_NESTING_LEVEL to 16
...
Was 100. That seemed excessive.
2022-12-11 12:54:19 -07:00
c17afa48de
[colr] Remove COLRV1_ENABLE_SUBSETTING
2022-12-11 12:53:55 -07:00
9ab2c8034e
Revert "[glyf] Use component phantom points after transformation"
...
This reverts commit a756bd1944https://github.com/harfbuzz/harfbuzz/issues/3929
2022-12-11 12:04:29 -07:00
Matthias Clasen
Behdad Esfahbod
Garret Rieger
Khaled Hosny
Nirbheek Chauhan
Jordan Petridis