[subset] Don't drop anchor device tables when dropping hints. These may contain variation data.

Update subseting expected files to match latest version of fontTools.
pull/2958/head
Garret Rieger 4 years ago
parent 6fddc2bbf9
commit 92757f6809
  1. 20
      src/hb-ot-layout-gpos-table.hh
  2. BIN
      test/subset/data/expected/basics/Comfortaa-Regular-new.default.61,62,63.ttf
  3. BIN
      test/subset/data/expected/basics/Comfortaa-Regular-new.default.61,63.ttf
  4. BIN
      test/subset/data/expected/basics/Comfortaa-Regular-new.default.61.ttf
  5. BIN
      test/subset/data/expected/basics/Comfortaa-Regular-new.default.62.ttf
  6. BIN
      test/subset/data/expected/basics/Comfortaa-Regular-new.default.retain-all-codepoint.ttf
  7. BIN
      test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.61,62,63.ttf
  8. BIN
      test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.61,63.ttf
  9. BIN
      test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.61.ttf
  10. BIN
      test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.62.ttf
  11. BIN
      test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.63.ttf
  12. BIN
      test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.retain-all-codepoint.ttf
  13. BIN
      test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.61,62,63.ttf
  14. BIN
      test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.61,63.ttf
  15. BIN
      test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.61.ttf
  16. BIN
      test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.62.ttf
  17. BIN
      test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.63.ttf
  18. BIN
      test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.retain-all-codepoint.ttf
  19. BIN
      test/subset/data/expected/basics/Comfortaa-Regular-new.gids.61,62,63.ttf
  20. BIN
      test/subset/data/expected/basics/Comfortaa-Regular-new.gids.61,63.ttf
  21. BIN
      test/subset/data/expected/basics/Comfortaa-Regular-new.gids.61.ttf
  22. BIN
      test/subset/data/expected/basics/Comfortaa-Regular-new.gids.62.ttf
  23. BIN
      test/subset/data/expected/basics/Comfortaa-Regular-new.gids.63.ttf
  24. BIN
      test/subset/data/expected/basics/Comfortaa-Regular-new.gids.retain-all-codepoint.ttf
  25. BIN
      test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.61,62,63.ttf
  26. BIN
      test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.61,63.ttf
  27. BIN
      test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.61.ttf
  28. BIN
      test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.62.ttf
  29. BIN
      test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.retain-all-codepoint.ttf
  30. BIN
      test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.61,62,63.ttf
  31. BIN
      test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.61,63.ttf
  32. BIN
      test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.61.ttf
  33. BIN
      test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.62.ttf
  34. BIN
      test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.retain-all-codepoint.ttf
  35. BIN
      test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.61,62,63.ttf
  36. BIN
      test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.61,63.ttf
  37. BIN
      test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.61.ttf
  38. BIN
      test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.62.ttf
  39. BIN
      test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.retain-all-codepoint.ttf
  40. BIN
      test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.61,62,63.ttf
  41. BIN
      test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.61,63.ttf
  42. BIN
      test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.61.ttf
  43. BIN
      test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.62.ttf
  44. BIN
      test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.retain-all-codepoint.ttf
  45. BIN
      test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.61,62,63.ttf
  46. BIN
      test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.61,63.ttf
  47. BIN
      test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.61.ttf
  48. BIN
      test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.63.ttf
  49. BIN
      test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.retain-all-codepoint.ttf
  50. BIN
      test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.61,62,63.ttf
  51. BIN
      test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.61,63.ttf
  52. BIN
      test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.61.ttf
  53. BIN
      test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.63.ttf
  54. BIN
      test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.retain-all-codepoint.ttf
  55. BIN
      test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize-retain-gids.1FC,21,41,20,62,63.otf
  56. BIN
      test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize.1FC,21,41,20,62,63.otf
  57. BIN
      test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-retain-gids.1FC,21,41,20,62,63.otf
  58. BIN
      test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints.1FC,21,41,20,62,63.otf
  59. BIN
      test/subset/data/expected/full-font/Roboto-Regular.drop-hints.D7,D8,D9,DA,DE.ttf
  60. BIN
      test/subset/data/expected/full-font/SourceSerifVariable-Roman.default.1FC,21,41,20,62,63.ttf
  61. BIN
      test/subset/data/expected/full-font/SourceSerifVariable-Roman.default.61,62,63.ttf
  62. BIN
      test/subset/data/expected/full-font/SourceSerifVariable-Roman.drop-hints.1FC,21,41,20,62,63.ttf
  63. BIN
      test/subset/data/expected/full-font/SourceSerifVariable-Roman.drop-hints.61,62,63.ttf
  64. BIN
      test/subset/data/expected/full-font/SourceSerifVariable-Roman.drop-hints.D7,D8,D9,DA,DE.ttf
  65. BIN
      test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41,42,43,57.otf
  66. BIN
      test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41,42,43.otf
  67. BIN
      test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41,42.otf
  68. BIN
      test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41,56,57.otf
  69. BIN
      test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41.otf
  70. BIN
      test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.42,57.otf
  71. BIN
      test/subset/data/expected/layout.gdef/Roboto-Regular.drop-hints.1E00,303.ttf
  72. BIN
      test/subset/data/expected/layout.khmer/Khmer.default.1780.ttf
  73. BIN
      test/subset/data/expected/layout.khmer/Khmer.default.1789,17BB,17C6,1794,17B6,1793,1798,17BE.ttf
  74. BIN
      test/subset/data/expected/layout.khmer/Khmer.default.31.ttf
  75. BIN
      test/subset/data/expected/layout.khmer/Khmer.retain-gids.1780.ttf
  76. BIN
      test/subset/data/expected/layout.khmer/Khmer.retain-gids.1789,17BB,17C6,1794,17B6,1793,1798,17BE.ttf
  77. BIN
      test/subset/data/expected/layout.khmer/Khmer.retain-gids.31.ttf
  78. BIN
      test/subset/data/expected/variable/Fraunces.default.26,66,69,124,125.ttf
  79. BIN
      test/subset/data/expected/variable/Fraunces.default.61.ttf

@ -491,20 +491,18 @@ struct Anchor
bool subset (hb_subset_context_t *c) const
{
TRACE_SUBSET (this);
if (c->plan->drop_hints)
{
// AnchorFormat 2 and 3 just containing extra hinting information, so
// if hints are being dropped convert to format 1.
if (u.format != 1 && u.format != 2 && u.format != 3)
return_trace (false);
return_trace (bool (reinterpret_cast<Anchor *> (u.format1.copy (c->serializer))));
}
switch (u.format) {
case 1: return_trace (bool (reinterpret_cast<Anchor *> (u.format1.copy (c->serializer))));
case 2: return_trace (bool (reinterpret_cast<Anchor *> (u.format2.copy (c->serializer))));
case 2:
if (c->plan->drop_hints)
{
// AnchorFormat 2 just containins extra hinting information, so
// if hints are being dropped convert to format 1.
return_trace (bool (reinterpret_cast<Anchor *> (u.format1.copy (c->serializer))));
}
return_trace (bool (reinterpret_cast<Anchor *> (u.format2.copy (c->serializer))));
case 3: return_trace (bool (reinterpret_cast<Anchor *> (u.format3.copy (c->serializer,
c->plan->layout_variation_idx_map))));
c->plan->layout_variation_idx_map))));
default:return_trace (false);
}
}

Loading…
Cancel
Save