53806e5b83
Tiny improvement on previous commit
...
Functionally the same.
2020-11-25 11:51:37 -07:00
a5f6f869e8
Drop layout table if layout lookup accelerator allocation failed
...
If the table is kept, when the table is present but only the accelerator
allocation failed, then we run into nullptr dereferences downstream in
hb_ot_map_t::apply when trying to access proxy.accels[i].
To fix this, instead of only setting lookup_count of accelerator_t
itself, drop the whole table to avoid hb-ot-map construction assuming
that the lookups will work correctly despite accelerator allocation
having failed.
Fixes:
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=24490
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=24490
2020-11-25 10:18:04 -08:00
718bf5aab3
[subset] only keep features reachable from script in the final subset.
...
Matches fontTools behaviour.
2020-09-29 13:16:01 -07:00
e583505334
[subset] Use plan->glyphset_gsub instead of plan->glyphset for GSUB/GPOS
...
This matches fontTools behaviour. glyphset_gsub does not contain gids added from closing over composite glyphs in glyf, since these cannot particpate in GSUB/GPOS processing.
2020-09-29 11:16:15 -07:00
940e1c6f98
[subset] ChainContextFormat3 - don't subset glyph sequences.
...
The backtrack, input, and lookahead sequence must be matched in their entirety so these sequences should not be subset. If any of the coverage tables in a sequence subsets to empty then the whole subtable should be dropped since it's not possible for this lookup to be activated.
2020-09-28 17:22:01 -07:00
e31c2690f8
[subset] remove unnecessary returns.
2020-09-28 16:51:25 -07:00
ad241f9917
[subset] check that sub rules in ChainContextFormat 1 and 2 intersect the glyphs set before recursing during closure lookups.
2020-09-28 15:26:13 -07:00
9fad540245
[subset] check that sub rules in ContextFormat 1 and 2 intersect the glyphs set before recursing during closure lookups.
2020-09-28 13:24:25 -07:00
a5c0ec7516
[subset] For [Chain]ContextFormat3 make sure the sub table intersects the retained glyphset before recursing to its lookups.
...
Otherwise the lookup closure will potentially pull in lookups which cannot be accessed via the retained glyph set.
2020-09-25 14:57:20 -07:00
dc375559fd
[subset] shrink the serialize buffer when pruning empty offsets in ChainContextFormat2.
...
Currently the code reduces the array length, but does not trim back the space allocated in the serializer for those empty offsets.
2020-09-25 13:08:46 -07:00
90eb1a40eb
[subset] In ChainContextFormat3 don't skip subsetting if backtrack or lookahead are empty.
...
It's valid to have a ChainContextFormat3 with either an empty backtrack or lookahead. Only drop the lookup if the input sequence is empty.
2020-09-25 12:36:32 -07:00
8c3d4de796
[subset] Fix integer underflow in ContextFormat2.
2020-09-11 15:52:46 -07:00
1e4fe10b98
[ENOMEM] check for error in visited map during closure features.
2020-08-13 01:43:11 +04:30
9562239f05
[ENOMEM] check for error in lookup visited set.
2020-08-13 01:43:11 +04:30
9748ae7299
Revert "Reordering fails when GDEF table is absent #2140 "
...
This reverts commit f4cd99f28ehttps://github.com/harfbuzz/harfbuzz/issues/2516#issuecomment-670969185
2020-08-11 22:51:48 +04:30
06dbb6acbb
[ENOMEM] in GSUB ChainContext subsetting check maps for allocation errors.
2020-08-01 09:21:22 +04:30
5a7cc7fd8b
minor spacing tweak
2020-07-29 08:33:38 +04:30
d0e2addd43
minor
2020-07-18 22:16:02 +04:30
26111a11ad
[dagger] Minor cleanup using hb_enumerate
2020-06-28 13:26:38 -07:00
1535440b48
[dispatch] Fix debug builds
2020-06-19 08:32:57 -07:00
70d6696cc6
[dispatch] Don't require debug_depth for untraced objects
2020-06-18 17:09:39 -07:00
dc492d7c8a
[dispatch] Comment
2020-06-18 17:03:05 -07:00
25aec0265c
[dispatch] Default return type to hb_empty_t
2020-06-18 16:58:01 -07:00
8d0a90ac1b
[dispatch] Default debug level to 0
2020-06-18 16:53:54 -07:00
d7d8604ec8
Remove excessive trace routes
2020-06-18 16:51:24 -07:00
e47a2ab8f8
Remove unused dispatcher names
2020-06-18 16:48:07 -07:00
b2a1acccd9
Simplify get_glyph_alternates() dispatcher
...
Trying to make it **very simple** to add a specialized dispatcher for
one API to be routed to just a few objects (one in this case).
2020-06-18 16:41:31 -07:00
ffe8d3f39d
Use dispatch for get_glyph_alternates_t
...
First time we do this in a way that if target object doesn't have the matching
function we basically "ignore". Risky but I feel like is the right decision
for this case.
I'm going to put back the template varargs and use those, which would make
the dispatcher be just that: "dispatcher", and wouldn't need to carry the
call context. That would be a refreshing change I think.
2020-06-18 16:31:39 -07:00
973c47f6c9
[subset] Move 2 experimental public api methods to be private methods in GSUB/GPOS.
...
2 methods are: hb_ot_layout_closure_lookups and hb_ot_layout_closure_features
2020-06-12 01:20:30 +04:30
56719474c2
s/blacklist/blocklist/g
2020-06-05 12:57:23 -07:00
593e58c842
[subset] ChainContext subsetting fix: add lookup index remapping
2020-05-27 16:58:15 -07:00
d7c012a08e
[subset] GDEF Variation Store: step 2
...
do subset based on variation indices collected in step 1
2020-05-21 12:43:24 -07:00
8200e48ffc
[subset] GDEF Variation Store: step 1
...
closure device variation indexes, create old->new variation idx mapping
and store them in subset-plan
2020-05-21 12:43:24 -07:00
a79d0e405b
[subset] minor, use a better type in iteration
...
In file included from hb-ot-face.cc:34:
In file included from ./hb-ot-kern-table.hh:30:
In file included from ./hb-aat-layout-kerx-table.hh:31:
In file included from ./hb-kern.hh:32:
In file included from ./hb-ot-layout-gpos-table.hh:32:
./hb-ot-layout-gsubgpos.hh:1878:63: error: loop variable '_' binds to a temporary value produced by a range of type 'decltype((hb_forward<hb_filter_iter_factory_t<hb_map_t &, const (anonymous struct at ./hb-algs.hh:331:1) &>>(rhs)(hb_forward<hb_zip_iter_t<hb_iota_iter_t<unsigned int, unsigned int>, hb_array_t<const OT::OffsetTo<OT::RuleSet, OT::IntType<unsigned short, 2>, true>>>>(lhs))))' (aka 'hb_filter_iter_t<hb_zip_iter_t<hb_iota_iter_t<unsigned int, unsigned int>, hb_array_t<const OT::OffsetTo<OT::RuleSet, OT::IntType<unsigned short, 2>, true>>>, hb_map_t &, const (anonymous struct at ./hb-algs.hh:331:1) &>') [-Werror,-Wrange-loop-bind-reference]
for (const hb_pair_t<unsigned, const OffsetTo<RuleSet>&>& _ : + hb_enumerate (ruleSet)
^
./hb-ot-layout-gsubgpos.hh:1878:10: note: use non-reference type 'hb_pair_t<unsigned int, const OffsetTo<OT::RuleSet> &>'
for (const hb_pair_t<unsigned, const OffsetTo<RuleSet>&>& _ : + hb_enumerate (ruleSet)
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2020-05-21 07:32:58 +04:30
8b5d3ebd96
[subset] GSUB5/GPOS7 Contextual Subst/Pos Subtbale Subsetting support
2020-05-20 15:12:54 -07:00
44d88cff95
[subset] fix intersects () for Context/ChainContext tables
...
return true only when all values in array are intersected with input
2020-05-11 15:25:17 -07:00
08428a15c3
minor, spacing
2020-04-24 23:45:17 +04:30
89ad3c6cc5
Rename add_class to collect_class
2020-04-24 08:16:03 -07:00
5cf53c06e6
Rename add_coverage to collect_coverage
2020-04-24 08:16:03 -07:00
0c65a232fa
minor, add unlikely around lookup_limit_exceeded checks
...
addresses https://github.com/harfbuzz/harfbuzz/pull/2294#issuecomment-618022488
2020-04-23 11:23:54 +04:30
f4cd99f28e
Reordering fails when GDEF table is absent #2140
...
Preserve glyph class if there's no GDEF and no guess.
Fixes https://github.com/harfbuzz/harfbuzz/issues/2140
2020-04-22 14:45:57 -07:00
2dda6dd744
minor, tweak spacing
...
turn 8 spaces to tab, add space before Null/Crap
2020-04-20 16:18:29 +04:30
e0c3979af1
typo fix
2020-04-02 12:05:57 +04:30
014e038b2c
[subset] Bail out of context lookup expansion once the lookup limit is encountered.
2020-04-01 11:14:41 +04:30
2e1bf61dd5
[gsubgpos] Use FeatureVariations::NOT_FOUND_INDEX instead Index::
...
As noted by https://github.com/harfbuzz/harfbuzz/issues/2280#issuecomment-604386389
Added on b143e342571891Closes #2280
2020-03-26 22:59:28 +04:30
25718913d4
[gsubgpos] minor build fix
2020-03-26 14:04:37 +04:30
b143e34ee1
[gsubgpos] Initialize variation index on HB_NO_VAR
...
hb_shape_plan_key_t::equal expects hb_ot_shape_plan_key_t be initialized by
hb_ot_layout_table_find_feature_variations calls but it won't get initialized
when HB_NO_VAR build config is used.
Related to https://github.com/harfbuzz/harfbuzz/issues/2280
2020-03-26 12:06:12 +04:30
071e2e345f
minor
2020-03-26 12:03:07 +04:30
cc977b6e5c
[gsubgpos] Minor simplification
...
Just changed the order, no functional change
2020-03-26 11:19:43 +04:30
1a48278511
[gsubgpos] Minor style improve
2020-03-26 11:15:09 +04:30
4ad686b9c0
[subset] fix fuzzer timeout in layout closure
...
Bail out of chain context lookup expansion once the lookup limit is encountered.
2020-03-26 06:32:28 +00:00
834a224a50
[subset] Put a limit on the number of lookup indices that can be visited during closures
...
Fixes https://crbug.com/oss-fuzz/21025
2020-03-12 13:32:36 +03:30
ba22df36ad
minor
...
makes search for sanitize calls easier for me
2020-03-10 10:43:27 +03:30
07acd1a042
[subset] Rename src_base args to base to match sanitize methods
...
So it will become easier to follow that serialize methods signatures should
match with their sanitize methods counterparts.
2020-03-08 23:39:26 +03:30
188a0a47c2
removed default base; replaced w/ bias if required
2020-03-08 22:59:43 +03:30
f745777c60
minor, debug bit, ops
2020-03-03 19:14:41 +03:30
f253f06cf3
[fuzz] Add another fixed case
...
https://crbug.com/oss-fuzz/14626
another numerous subtables count which is fixed by d38360397
2020-03-03 19:12:04 +03:30
414529e45a
[subset] Limit the number of feature indices processed during script subsetting.
2020-02-28 16:10:14 -08:00
75622b0d24
[subset] Limit the number of features processed in the feature closure.
2020-02-28 16:10:14 -08:00
ff5223ba60
remove invalid glyphs from closure ( #2188 )
...
fix issue #2186
2020-02-23 15:53:21 -08:00
e565d1f9bc
[subset] subset lookup/feature/script lists for GSUB/GPOS
2020-01-15 14:04:33 -08:00
8ffc9add22
[subset] layout closure_features and store them in subset-plan
2020-01-14 07:24:48 +03:30
0b39c48064
[subset] closure lookups for GSUB/GPOS
2020-01-10 13:11:06 -08:00
ce114d6b27
minor, tweak spaces
2019-12-31 15:53:02 +03:30
a061e47fcc
Change a few HB_INTERNAL static methods to static inline
2019-12-10 13:31:50 -06:00
858b627984
[machinery] Remove CastR<>()
2019-12-10 13:18:32 -06:00
64a45be519
[ubsan] Don't decrease pointer if match_glyph_data is null ( #2048 )
...
Similar to fix on https://github.com/harfbuzz/harfbuzz/pull/2022
Fixes https://crbug.com/1023070
2019-11-09 12:25:33 +03:30
aca6390281
[gpos] Don't move pointer when match_glyph_data is not set
2019-10-28 22:17:48 +03:30
b2fcca6e14
fuzzer crash fix
...
https://oss-fuzz.com/testcase-detail/5643107869917184
2019-10-24 16:11:30 -07:00
05bcdb39d8
Add a specialization of array_t:hash for hb_bytes_t and hb_ubytes_t.
2019-10-22 13:33:50 -07:00
95ab110cd9
Optimize intersects_array to fix fuzzer timeout.
2019-10-22 13:33:50 -07:00
b66094ada0
[subset] GSUB Lookup Type 6: ChainContextSubst
2019-10-18 16:52:55 -07:00
7dcf8e126e
[config] Fix build with HB_NO_OT_LAYOUT
2019-06-26 13:44:23 -07:00
8e3cde67df
Fix MSVC build
...
MSVC warning:
c:\projects\harfbuzz\src\hb-ot-layout-gsubgpos.hh(2732): error C2121: '#': invalid character: possibly the result of a macro expansion [C:\projects\harfbuzz\build\harfbuzz.vcxproj]
Clang warning for it:
./hb-ot-layout-gsubgpos.hh:2729:2: error: embedding a directive within macro arguments has undefined behavior [-Werror,-Wembedded-directive]
2019-06-19 19:59:26 -07:00
a849873124
[config] Add HB_NO_VAR to disable variations support, enabled by HB_TINY
...
Part of https://github.com/harfbuzz/harfbuzz/issues/1652
2019-06-19 19:26:22 -07:00
1834cf86d4
[serialize] Pass offset to serialize_subset()
2019-05-31 14:39:32 -07:00
9260441624
[serialize] Pass offset to serialize_copy()
2019-05-31 14:35:01 -07:00
2376867649
Use hb_map(hb_add(this)) to dereference OffsetTo<>'s
2019-05-15 22:01:44 -07:00
78d35f0e78
Reduce captures of lambdas
2019-05-15 18:15:05 -07:00
d0df996cdc
Use implicit lambda return type
2019-05-15 00:32:41 -07:00
7df3ecfb40
[meta] hb_void_t -> hb_empty_t
2019-05-10 20:43:26 -07:00
4d67743ffd
[subset] Use more auto typing
2019-05-10 18:43:48 -07:00
5d773ec600
Minor
2019-05-10 13:53:15 -07:00
ac737f8c9e
Minor again
2019-05-10 13:51:12 -07:00
cd9bc732a7
[gsubgpos] Minor
2019-05-10 13:17:41 -07:00
83e3eabd84
Whitespace
2019-05-07 20:58:43 -07:00
41248cce0e
Remove MIN/MAX in favor of hb_min/hb_max
2019-05-07 20:54:31 -07:00
e33ad25222
[serialize] FeatureVariations subset->copy
2019-05-07 15:46:24 -07:00
36bb24f7b4
[dispatch] Forward arguments in all dispatch multiplexers
2019-05-05 10:14:17 -07:00
c14efb8e68
Fix previous commit
...
Priority should be given to specific over dispatch. Broke sanitize before.
This fixes it, by moving prioritization to the context implementation, since
the correct priority cannot be done in the dispatch implementation. Done
for subset and sanitize only, which need it.
2019-05-05 09:54:58 -07:00
ac350c92fd
[dispatch] Try obj.dispatch(c) before trying c->dispatch(obj)
2019-05-05 09:10:46 -07:00
92588782d7
Remove space between right angle brackets now that we have C++11 ( #1689 )
2019-04-30 13:05:10 -07:00
085793d6cd
Remove wrong TODOs
2019-04-24 10:15:59 -04:00
95df00aec1
Hide a few static methods
...
Looks like static methods that do not get inlined end up exported.
We have a lot more. Need to protect all at some point. Wish there
was an easier way, like the visibility flag we pass that automatically
hides all inline methods.
Was exposed by check-symbols.sh when compiling on OS X 10.14 with:
$ make CPPFLAGS=-Oz CXXFLAGS=-flto=thin LDFLAGS=-lc++
2019-04-12 17:51:14 -04:00
e530692799
[iter] Fix bug in hb_any() and hb_none()
2019-03-29 23:31:39 -07:00
f505b5d5c9
[iter] Port remaining "for (auto" instances to daggers
2019-03-29 22:55:02 -07:00
668d2d562f
[iter] One more dagger
2019-03-29 22:48:38 -07:00
05f2130a1c
[iter] More daggers
2019-03-29 22:43:12 -07:00
22ec4c3aa5
[iter] More daggers
2019-03-29 22:29:00 -07:00
90b60bd690
Remove HB_DEBUG_WOULD_APPLY
...
Not that useful.
2019-03-29 22:12:42 -07:00
11456b2d9c
WHitespace
2019-02-15 16:58:43 -08:00
b8b3b3e38b
[iter] Add hb_enumerate() and use it
2019-02-15 16:05:36 -08:00
5b99c92d4c
[iter] Use more
2019-02-14 17:10:04 -08:00
72c1b59588
[iter] Use in more places
2019-02-14 15:43:20 -08:00
40cce41eae
[iter] Use in a couple more intersects() calls
2019-02-14 15:14:37 -08:00
bafdf1829d
[iter] Use in a couple more closure() calls
2019-02-14 15:13:16 -08:00
090fe56dc6
Merge branch 'master' into iter
2019-01-25 16:06:52 +01:00
3d9a6e6266
Whitespace
2019-01-22 12:17:26 +01:00
934d3fa2a7
Use more iter pipelines
2019-01-20 20:12:12 -05:00
ede1a71b31
Minor rename
2019-01-20 20:12:12 -05:00
af6c190235
Use hb_zip() some moore
2019-01-20 20:12:12 -05:00
a46874f1ab
[iter] Revert back uses of C++11 auto type deduction
2019-01-20 20:12:12 -05:00
d6024794fb
Change hb_void_t implementation
2019-01-20 20:12:12 -05:00
e16884248f
[iter] Port Coverage iterator to hb_iter_t
2019-01-20 20:12:12 -05:00
89bcfb204c
Remove TRACE_COLLECT_GLYPHS
2019-01-18 14:59:18 -05:00
0772c06f96
Remove tracing from closure
2019-01-18 12:53:47 -05:00
fa333e34d6
[vector] Remove static_array
...
Was good idea, but with C++ types with constructor/destructor, was getting in
the way as compiler was destructing those items where it was not desired.
Since C++ does not allow zero-sized arrays, just remove it...
2018-12-27 17:56:22 -05:00
474a12058d
[array/vector] Rename len to length
2018-12-21 18:53:01 -05:00
e412008599
Remove redundant void from C++ sources ( #1486 )
2018-12-17 13:01:01 -05:00
b2ebaa9afa
Remove redundant 'inline' from methods ( #1483 )
2018-12-16 14:08:10 -05:00
1b6d0c44b3
[subset] Sketch GDEF subsetting
2018-12-13 18:10:48 -05:00
c78e4784fb
[dispatch] Minor
2018-12-12 09:50:18 -05:00
fb05908213
Revert ugly fixes
...
Now that we have 6daf45e0, revert cryptic hacks...
This reverts commit abd81ed4f59c6921c08cd39760cabffedd8e6c17https://github.com/harfbuzz/harfbuzz/issues/1374
2018-11-30 20:56:15 -05:00
9c6921c08c
More...
...
hb-ot-layout-gsubgpos.hh:1707: error: ISO C++ says that these are ambiguous, even though the worst conversion for the first is better than the worst conversion for the second:
...
2018-11-30 15:16:57 -05:00
574d888c8a
[aat] Ignore GSUB table of Muthu Foundry if they have morx table
...
Fixes https://github.com/harfbuzz/harfbuzz/issues/1410
2018-11-25 16:51:22 -05:00
aa06574823
Minor
2018-11-16 14:31:05 -08:00
11aa0468ac
[subset] minor, adjust spaces
2018-11-16 00:02:47 +03:30
da6aa3b033
Add hb_blob_ptr_t.destroy()
2018-11-11 11:40:57 -05:00
5d0078a48b
Add hb_blob_ptr_t
...
Use in a couple of places. Push to bots to see how many unhappy before
I convert the rest.
2018-11-10 23:52:15 -05:00
33b006cc51
[ot-layout] Simplify some access
2018-11-05 23:19:04 -05:00
0b0b38ec1e
Fix null accelerator's
...
Fixes all except for cmap. To be done separately.
Part of https://github.com/harfbuzz/harfbuzz/issues/1146
2018-11-03 16:16:31 -04:00
0382b7184a
Use as_array in more places
2018-11-02 12:23:26 -04:00
f7a08cd41d
Fix extra semicolon issues and test that on CI ( #1330 )
2018-10-30 11:29:09 +03:30
ca5e5a4979
Port Coverage::Iter off hb_auto_t<>
2018-10-29 22:30:21 -07:00
3a4e5dd425
Remove a few unnecessary hb_auto_t<>'s
...
See a85641446c30247c4e948263f0f8c1147ed4efb9
2018-10-29 22:27:20 -07:00
5a24ea15e0
Make more 'coords' params const.
2018-10-19 19:15:42 -07:00
4594730f64
Remove redundant return at end of void-returning function.
2018-10-19 18:17:18 +02:00
257d0e5aa3
Fix typos.
2018-10-19 19:24:05 +03:30
63109432cf
Cosmetic and minor changes
2018-10-13 07:23:33 -04:00
b3390990f5
Add per-subtable set-digests
...
This speeds up Roboto shaping by ~10%. I was hoping for more.
Still, good defense against lookups with many subtables.
2018-10-10 12:13:25 -04:00
e78549edfb
Move apply down into subtables accel
2018-10-10 11:54:48 -04:00
78c09bf213
Move subtable array into lookup accel
2018-10-10 11:50:46 -04:00
97e5913d5a
Move more code
2018-10-10 11:41:05 -04:00
c8f2d9334c
Move code
...
In preparation to move add per-subtable set digests...
2018-10-10 11:36:28 -04:00
9efddb9de8
Treat a base+mark... ligature as base, not ligature
...
Fixes https://github.com/harfbuzz/harfbuzz/issues/746
2018-10-02 16:05:26 +02:00
3cca978723
Move code around
2018-10-02 15:02:35 +02:00
d748dc7664
More iter inits
2018-09-24 18:30:50 -04:00
3583fb03b1
Simplify ZWJ-skipping a bit
...
Towards disabling ZWJ-skipping in certain GPOS contexts.
Part of https://github.com/flutter/flutter/issues/16886
2018-09-23 22:33:38 -04:00
9516cbd3df
Reinit skippy iters when auto_zwj / auto_zwnj change
...
Ouch. How did we not hit this bug before...
2018-09-23 22:00:34 -04:00
effc7ced72
Rename HeadlessArrayOf::len to lenP1
...
So it doesn't accidentally match our templates, etc.
2018-09-13 20:21:54 +02:00
Behdad Esfahbod
Dominik Röttsches
Garret Rieger
Ebrahim Byagowi
Qunxin Liu
ariza
Behdad Esfahbod
Bruce Mitchener