From 19f54f2cfdede39bb69105f4ff5e23089e164ca9 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Wed, 4 Mar 2026 12:55:54 -0700 Subject: [PATCH] Merge pull request #5784 from harfbuzz/downgrade-cff-hintmask [subset] Fix CFF2->CFF1 specializer hintmask encoding --- src/hb-cff-specializer.hh | 7 +++++++ src/hb-subset-cff-common.hh | 1 + src/hb-subset-cff2.cc | 16 ++++++++++++++++ ...6C,6F,20,57,6F,72,6C,64.wght=400,opsz=20.otf | Bin 0 -> 2968 bytes .../SourceSerif4Variable-Roman-HelloWorld.otf | Bin 0 -> 13944 bytes test/subset/data/profiles/downgrade-cff2.txt | 1 + test/subset/data/tests/downgrade_cff2.tests | 14 ++++++++++++++ test/subset/meson.build | 1 + 8 files changed, 40 insertions(+) create mode 100644 test/subset/data/expected/downgrade_cff2/SourceSerif4Variable-Roman-HelloWorld.downgrade-cff2.48,65,6C,6C,6F,20,57,6F,72,6C,64.wght=400,opsz=20.otf create mode 100644 test/subset/data/fonts/SourceSerif4Variable-Roman-HelloWorld.otf create mode 100644 test/subset/data/profiles/downgrade-cff2.txt create mode 100644 test/subset/data/tests/downgrade_cff2.tests diff --git a/src/hb-cff-specializer.hh b/src/hb-cff-specializer.hh index 005384e84..5b4dce5d0 100644 --- a/src/hb-cff-specializer.hh +++ b/src/hb-cff-specializer.hh @@ -254,6 +254,13 @@ encode_commands (const hb_vector_t &commands, if (cmd.op != OpCode_Invalid) encoder.encode_op (cmd.op); + /* hintmask/cntrmask are followed by raw mask bytes. */ + if (cmd.op == OpCode_hintmask || cmd.op == OpCode_cntrmask) + { + for (const auto &byte : cmd.mask_bytes) + encoder.encode_byte (byte); + } + if (encoder.in_error ()) return false; } diff --git a/src/hb-subset-cff-common.hh b/src/hb-subset-cff-common.hh index 5128459d3..3140b9ca3 100644 --- a/src/hb-subset-cff-common.hh +++ b/src/hb-subset-cff-common.hh @@ -325,6 +325,7 @@ struct cff_font_dict_op_serializer_t : op_serializer_t struct cs_command_t { hb_vector_t args; + hb_vector_t mask_bytes; /* For hintmask/cntrmask payload bytes. */ op_code_t op; cs_command_t () : op (OpCode_Invalid) {} diff --git a/src/hb-subset-cff2.cc b/src/hb-subset-cff2.cc index a92d7528f..59748a4b2 100644 --- a/src/hb-subset-cff2.cc +++ b/src/hb-subset-cff2.cc @@ -218,6 +218,22 @@ struct cff2_cs_opset_flatten_t : cff2_cs_opset_t &env, flatten_param_t& param) { SUPER::flush_hintmask (op, env, param); + /* Preserve hintmask payload in captured commands for specializer re-encoding. */ + if (param.commands && !param.drop_hints && param.commands->length > 0) + { + auto &cmd = param.commands->tail (); + if (cmd.op == op) + { + cmd.mask_bytes.resize (env.hintmask_size); + if (unlikely (cmd.mask_bytes.in_error ())) + { + env.set_error (); + return; + } + for (unsigned int i = 0; i < env.hintmask_size; i++) + cmd.mask_bytes[i] = env.str_ref[i]; + } + } if (!param.drop_hints) { str_encoder_t encoder (param.flatStr); diff --git a/test/subset/data/expected/downgrade_cff2/SourceSerif4Variable-Roman-HelloWorld.downgrade-cff2.48,65,6C,6C,6F,20,57,6F,72,6C,64.wght=400,opsz=20.otf b/test/subset/data/expected/downgrade_cff2/SourceSerif4Variable-Roman-HelloWorld.downgrade-cff2.48,65,6C,6C,6F,20,57,6F,72,6C,64.wght=400,opsz=20.otf new file mode 100644 index 0000000000000000000000000000000000000000..82e2a5a5bb8f1e0b56d11e961a50e34a16f50e3f GIT binary patch literal 2968 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 QJHRzG($4ikD8lG}01oF$3;+NC literal 0 HcmV?d00001 diff --git a/test/subset/data/profiles/downgrade-cff2.txt b/test/subset/data/profiles/downgrade-cff2.txt new file mode 100644 index 000000000..c9bc19846 --- /dev/null +++ b/test/subset/data/profiles/downgrade-cff2.txt @@ -0,0 +1 @@ +--downgrade-cff2 diff --git a/test/subset/data/tests/downgrade_cff2.tests b/test/subset/data/tests/downgrade_cff2.tests new file mode 100644 index 000000000..4a0a7cf97 --- /dev/null +++ b/test/subset/data/tests/downgrade_cff2.tests @@ -0,0 +1,14 @@ +FONTS: +SourceSerif4Variable-Roman-HelloWorld.otf + +PROFILES: +downgrade-cff2.txt + +SUBSETS: +Hello World + +INSTANCES: +wght=400,opsz=20 + +OPTIONS: +no_fonttools diff --git a/test/subset/meson.build b/test/subset/meson.build index 736072d4d..870601830 100644 --- a/test/subset/meson.build +++ b/test/subset/meson.build @@ -62,6 +62,7 @@ tests = [ 'instantiate_colrv1', 'instantiate_glyf', 'instantiate_cff2', + 'downgrade_cff2', 'instantiate_cff2_tsb', 'full_instance', 'instance_feature_variations',