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

Rename 'ebdt' to 'cbdt' since we only support the PNG format

Browse Source
This commit is contained in:
Behdad Esfahbod 2016-12-02 15:11:37 -08:00
parent 831852594b
commit efca7bf97f
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile.sources
View File

@ -20,8 +20,8 @@ HB_BASE_sources = \
hb-object-private.hh \ hb-object-private.hh \
hb-open-file-private.hh \ hb-open-file-private.hh \
hb-open-type-private.hh \ hb-open-type-private.hh \
hb-ot-cbdt-table.hh \
hb-ot-cmap-table.hh \ hb-ot-cmap-table.hh \
hb-ot-ebdt-table.hh \
hb-ot-glyf-table.hh \ hb-ot-glyf-table.hh \
hb-ot-head-table.hh \ hb-ot-head-table.hh \
hb-ot-hhea-table.hh \ hb-ot-hhea-table.hh \

6
src/hb-ot-ebdt-table.hh → src/hb-ot-cbdt-table.hh
View File

@ -24,8 +24,8 @@
* Google Author(s): Seigo Nonaka * Google Author(s): Seigo Nonaka
*/ */
#ifndef HB_OT_EBDT_TABLE_HH #ifndef HB_OT_CBDT_TABLE_HH
#define HB_OT_EBDT_TABLE_HH #define HB_OT_CBDT_TABLE_HH
#include "hb-open-type-private.hh" #include "hb-open-type-private.hh"
@ -190,4 +190,4 @@ struct CBDT
} /* namespace OT */ } /* namespace OT */
#endif /* HB_OT_EBDT_TABLE_HH */ #endif /* HB_OT_CBDT_TABLE_HH */

12
src/hb-ot-font.cc
View File

@ -31,7 +31,7 @@
#include "hb-font-private.hh" #include "hb-font-private.hh"
#include "hb-ot-cmap-table.hh" #include "hb-ot-cmap-table.hh"
#include "hb-ot-ebdt-table.hh" #include "hb-ot-cbdt-table.hh"
#include "hb-ot-glyf-table.hh" #include "hb-ot-glyf-table.hh"
#include "hb-ot-head-table.hh" #include "hb-ot-head-table.hh"
#include "hb-ot-hhea-table.hh" #include "hb-ot-hhea-table.hh"
@ -208,7 +208,7 @@ struct hb_ot_face_glyf_accelerator_t
} }
}; };
struct hb_ot_face_ebdt_accelerator_t struct hb_ot_face_cbdt_accelerator_t
{ {
hb_blob_t *cblc_blob = NULL; hb_blob_t *cblc_blob = NULL;
hb_blob_t *cbdt_blob = NULL; hb_blob_t *cbdt_blob = NULL;
@ -470,7 +470,7 @@ struct hb_ot_font_t
hb_ot_face_metrics_accelerator_t h_metrics; hb_ot_face_metrics_accelerator_t h_metrics;
hb_ot_face_metrics_accelerator_t v_metrics; hb_ot_face_metrics_accelerator_t v_metrics;
hb_lazy_loader_t<hb_ot_face_glyf_accelerator_t> glyf; hb_lazy_loader_t<hb_ot_face_glyf_accelerator_t> glyf;
hb_lazy_loader_t<hb_ot_face_ebdt_accelerator_t> ebdt; hb_lazy_loader_t<hb_ot_face_cbdt_accelerator_t> cbdt;
}; };
@ -487,7 +487,7 @@ _hb_ot_font_create (hb_face_t *face)
ot_font->v_metrics.init (face, HB_OT_TAG_vhea, HB_OT_TAG_vmtx, HB_TAG_NONE, ot_font->v_metrics.init (face, HB_OT_TAG_vhea, HB_OT_TAG_vmtx, HB_TAG_NONE,
ot_font->h_metrics.ascender - ot_font->h_metrics.descender); /* TODO Can we do this lazily? */ ot_font->h_metrics.ascender - ot_font->h_metrics.descender); /* TODO Can we do this lazily? */
ot_font->glyf.init (face); ot_font->glyf.init (face);
ot_font->ebdt.init (face); ot_font->cbdt.init (face);
return ot_font; return ot_font;
} }
@ -499,7 +499,7 @@ _hb_ot_font_destroy (hb_ot_font_t *ot_font)
ot_font->h_metrics.fini (); ot_font->h_metrics.fini ();
ot_font->v_metrics.fini (); ot_font->v_metrics.fini ();
ot_font->glyf.fini (); ot_font->glyf.fini ();
ot_font->ebdt.fini (); ot_font->cbdt.fini ();
free (ot_font); free (ot_font);
} }
@ -559,7 +559,7 @@ hb_ot_get_glyph_extents (hb_font_t *font HB_UNUSED,
const hb_ot_font_t *ot_font = (const hb_ot_font_t *) font_data; const hb_ot_font_t *ot_font = (const hb_ot_font_t *) font_data;
bool ret = ot_font->glyf->get_extents (glyph, extents); bool ret = ot_font->glyf->get_extents (glyph, extents);
if ( !ret ) if ( !ret )
ret = ot_font->ebdt->get_extents (glyph, extents); ret = ot_font->cbdt->get_extents (glyph, extents);
extents->x_bearing = font->em_scale_x (extents->x_bearing); extents->x_bearing = font->em_scale_x (extents->x_bearing);
extents->y_bearing = font->em_scale_y (extents->y_bearing); extents->y_bearing = font->em_scale_y (extents->y_bearing);
extents->width = font->em_scale_x (extents->width); extents->width = font->em_scale_x (extents->width);