walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[ot-layout] Remove unused members 

We should hang those off somewhere else. For now, the unused ones can go.
This commit is contained in:
Behdad Esfahbod 2018-05-03 21:03:27 -04:00
parent ac92ed7d68
commit 203dc44ebc
4 changed files with 15 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hb-aat-layout-common-private.hh
View File

@ -134,7 +134,7 @@ struct BinSearchArrayOf
protected: protected:
BinSearchHeader header; BinSearchHeader header;
HBUINT8 bytes[VAR]; HBUINT8 bytes[VAR];
public: public:
DEFINE_SIZE_ARRAY (10, bytes); DEFINE_SIZE_ARRAY (10, bytes);
}; };

6
src/hb-aat-layout.cc
View File

@ -44,6 +44,7 @@
* morx/kerx/trak * morx/kerx/trak
*/ */
#if 0
static inline const AAT::ankr& static inline const AAT::ankr&
_get_ankr (hb_face_t *face, hb_blob_t **blob = nullptr) _get_ankr (hb_face_t *face, hb_blob_t **blob = nullptr)
{ {
@ -109,6 +110,7 @@ _get_trak (hb_face_t *face, hb_blob_t **blob = nullptr)
*blob = layout->trak.blob; *blob = layout->trak.blob;
return trak; return trak;
} }
#endif
// static inline void // static inline void
// _hb_aat_layout_create (hb_face_t *face) // _hb_aat_layout_create (hb_face_t *face)
@ -127,16 +129,19 @@ _get_trak (hb_face_t *face, hb_blob_t **blob = nullptr)
void void
hb_aat_layout_substitute (hb_font_t *font, hb_buffer_t *buffer) hb_aat_layout_substitute (hb_font_t *font, hb_buffer_t *buffer)
{ {
#if 0
hb_blob_t *blob; hb_blob_t *blob;
const AAT::morx& morx = _get_morx (font->face, &blob); const AAT::morx& morx = _get_morx (font->face, &blob);
AAT::hb_aat_apply_context_t c (font, buffer, blob); AAT::hb_aat_apply_context_t c (font, buffer, blob);
morx.apply (&c); morx.apply (&c);
#endif
} }
void void
hb_aat_layout_position (hb_font_t *font, hb_buffer_t *buffer) hb_aat_layout_position (hb_font_t *font, hb_buffer_t *buffer)
{ {
#if 0
hb_blob_t *blob; hb_blob_t *blob;
const AAT::ankr& ankr = _get_ankr (font->face, &blob); const AAT::ankr& ankr = _get_ankr (font->face, &blob);
const AAT::kerx& kerx = _get_kerx (font->face, &blob); const AAT::kerx& kerx = _get_kerx (font->face, &blob);
@ -145,4 +150,5 @@ hb_aat_layout_position (hb_font_t *font, hb_buffer_t *buffer)
AAT::hb_aat_apply_context_t c (font, buffer, blob); AAT::hb_aat_apply_context_t c (font, buffer, blob);
kerx.apply (&c, &ankr); kerx.apply (&c, &ankr);
trak.apply (&c); trak.apply (&c);
#endif
} }

6
src/hb-ot-layout-private.hh
View File

@ -173,15 +173,9 @@ struct hb_ot_layout_t
/* TODO Move the following out of this struct. */ /* TODO Move the following out of this struct. */
OT::hb_lazy_table_loader_t<struct OT::BASE> base; OT::hb_lazy_table_loader_t<struct OT::BASE> base;
OT::hb_lazy_table_loader_t<struct OT::COLR> colr;
OT::hb_lazy_table_loader_t<struct OT::CPAL> cpal;
OT::hb_lazy_table_loader_t<struct OT::MATH> math; OT::hb_lazy_table_loader_t<struct OT::MATH> math;
OT::hb_lazy_table_loader_t<struct OT::fvar> fvar; OT::hb_lazy_table_loader_t<struct OT::fvar> fvar;
OT::hb_lazy_table_loader_t<struct OT::avar> avar; OT::hb_lazy_table_loader_t<struct OT::avar> avar;
OT::hb_lazy_table_loader_t<struct AAT::ankr> ankr;
OT::hb_lazy_table_loader_t<struct AAT::kerx> kerx;
OT::hb_lazy_table_loader_t<struct AAT::morx> morx;
OT::hb_lazy_table_loader_t<struct AAT::trak> trak;
unsigned int gsub_lookup_count; unsigned int gsub_lookup_count;
unsigned int gpos_lookup_count; unsigned int gpos_lookup_count;

29
src/hb-ot-layout.cc
View File

@ -30,19 +30,20 @@
#include "hb-open-type-private.hh" #include "hb-open-type-private.hh"
#include "hb-ot-layout-private.hh" #include "hb-ot-layout-private.hh"
#include "hb-ot-map-private.hh"
#include "hb-ot-layout-base-table.hh"
#include "hb-ot-layout-gdef-table.hh" #include "hb-ot-layout-gdef-table.hh"
#include "hb-ot-layout-gsub-table.hh" #include "hb-ot-layout-gsub-table.hh"
#include "hb-ot-layout-gpos-table.hh" #include "hb-ot-layout-gpos-table.hh"
#include "hb-ot-layout-jstf-table.hh" // Just so we compile it; unused otherwise.
#include "hb-ot-name-table.hh" // Just so we compile it; unused otherwise. // Just so we compile them; unused otherwise:
#include "hb-ot-layout-base-table.hh"
#include "hb-ot-layout-jstf-table.hh"
#include "hb-ot-color-colr-table.hh" #include "hb-ot-color-colr-table.hh"
#include "hb-ot-color-cpal-table.hh" #include "hb-ot-color-cpal-table.hh"
#include "hb-ot-color-sbix-table.hh" // Just so we compile it; unused otherwise. #include "hb-ot-color-sbix-table.hh"
#include "hb-ot-color-svg-table.hh" // Just so we compile it; unused otherwise. #include "hb-ot-color-svg-table.hh"
#include "hb-ot-name-table.hh"
#include "hb-ot-map-private.hh"
#ifndef HB_NO_VISIBILITY #ifndef HB_NO_VISIBILITY
@ -66,16 +67,9 @@ _hb_ot_layout_create (hb_face_t *face)
layout->gpos_blob = OT::Sanitizer<OT::GPOS>().sanitize (face->reference_table (HB_OT_TAG_GPOS)); layout->gpos_blob = OT::Sanitizer<OT::GPOS>().sanitize (face->reference_table (HB_OT_TAG_GPOS));
layout->gpos = OT::Sanitizer<OT::GPOS>::lock_instance (layout->gpos_blob); layout->gpos = OT::Sanitizer<OT::GPOS>::lock_instance (layout->gpos_blob);
layout->base.init (face);
layout->colr.init (face);
layout->cpal.init (face);
layout->math.init (face); layout->math.init (face);
layout->fvar.init (face); layout->fvar.init (face);
layout->avar.init (face); layout->avar.init (face);
layout->ankr.init (face);
layout->kerx.init (face);
layout->morx.init (face);
layout->trak.init (face);
{ {
/* /*
@ -222,16 +216,9 @@ _hb_ot_layout_destroy (hb_ot_layout_t *layout)
hb_blob_destroy (layout->gsub_blob); hb_blob_destroy (layout->gsub_blob);
hb_blob_destroy (layout->gpos_blob); hb_blob_destroy (layout->gpos_blob);
layout->base.fini ();
layout->colr.fini ();
layout->cpal.fini ();
layout->math.fini (); layout->math.fini ();
layout->fvar.fini (); layout->fvar.fini ();
layout->avar.fini (); layout->avar.fini ();
layout->ankr.fini ();
layout->kerx.fini ();
layout->morx.fini ();
layout->trak.fini ();
free (layout); free (layout);
} }