renamed OT::cff to OT::cff1 for consistency
along with HB_OT_TAG_cff1
diff --git a/src/hb-ot-cff1-table.hh b/src/hb-ot-cff1-table.hh
index 10a9599..b794bba 100644
--- a/src/hb-ot-cff1-table.hh
+++ b/src/hb-ot-cff1-table.hh
@@ -36,7 +36,7 @@
* CFF -- Compact Font Format (CFF)
* http://www.adobe.com/content/dam/acom/en/devnet/font/pdfs/5176.CFF.pdf
*/
-#define HB_OT_TAG_cff HB_TAG('C','F','F',' ')
+#define HB_OT_TAG_cff1 HB_TAG('C','F','F',' ')
typedef Index<HBUINT16> CFF1Index;
template <typename Type> struct CFF1IndexOf : IndexOf<HBUINT16, Type> {};
@@ -679,9 +679,9 @@
using namespace CFF;
-struct cff
+struct cff1
{
- static const hb_tag_t tableTag = HB_OT_TAG_cff;
+ static const hb_tag_t tableTag = HB_OT_TAG_cff1;
inline bool sanitize (hb_sanitize_context_t *c) const
{
@@ -701,15 +701,15 @@
fontDicts.init ();
privateDicts.init ();
- this->blob = sc.reference_table<cff> (face);
+ this->blob = sc.reference_table<cff1> (face);
/* setup for run-time santization */
sc.init (this->blob);
sc.start_processing ();
- const OT::cff *cff = this->blob->template as<OT::cff> ();
+ const OT::cff1 *cff = this->blob->template as<OT::cff1> ();
- if (cff == &Null(OT::cff))
+ if (cff == &Null(OT::cff1))
{ fini (); return; }
nameIndex = &cff->nameIndex (cff);
@@ -875,7 +875,7 @@
bool success = true;
if (hb_subset_cff1 (plan, &cff_prime)) {
- success = success && plan->add_table (HB_OT_TAG_cff, cff_prime);
+ success = success && plan->add_table (HB_OT_TAG_cff1, cff_prime);
} else {
success = false;
}
diff --git a/src/hb-subset-cff1.cc b/src/hb-subset-cff1.cc
index 228687a..5e54349 100644
--- a/src/hb-subset-cff1.cc
+++ b/src/hb-subset-cff1.cc
@@ -239,14 +239,14 @@
subrRefMaps.fini ();
}
- inline bool create (const OT::cff::accelerator_subset_t &acc,
+ inline bool create (const OT::cff1::accelerator_subset_t &acc,
hb_subset_plan_t *plan)
{
final_size = 0;
orig_fdcount = acc.fdCount;
/* CFF header */
- final_size += OT::cff::static_size;
+ final_size += OT::cff1::static_size;
/* Name INDEX */
offsets.nameIndexOffset = final_size;
@@ -267,7 +267,7 @@
/* Subset global & local subrs */
{
- SubrSubsetter<const OT::cff::accelerator_subset_t, CFF1CSInterpEnv, CFF1CSOpSet_SubrSubset> subsetter(acc, plan->glyphs);
+ SubrSubsetter<const OT::cff1::accelerator_subset_t, CFF1CSInterpEnv, CFF1CSOpSet_SubrSubset> subsetter(acc, plan->glyphs);
if (!subsetter.collect_refs (subrRefMaps))
return false;
@@ -374,7 +374,7 @@
};
static inline bool _write_cff1 (const cff_subset_plan &plan,
- const OT::cff::accelerator_subset_t &acc,
+ const OT::cff1::accelerator_subset_t &acc,
const hb_vector_t<hb_codepoint_t>& glyphs,
unsigned int dest_sz,
void *dest)
@@ -384,7 +384,7 @@
char RETURN_OP[1] = { OpCode_return };
const ByteStr NULL_SUBR (RETURN_OP, 1);
- OT::cff *cff = c.start_serialize<OT::cff> ();
+ OT::cff1 *cff = c.start_serialize<OT::cff1> ();
if (unlikely (!c.extend_min (*cff)))
return false;
@@ -561,7 +561,7 @@
}
static bool
-_hb_subset_cff1 (const OT::cff::accelerator_subset_t &acc,
+_hb_subset_cff1 (const OT::cff1::accelerator_subset_t &acc,
const char *data,
hb_subset_plan_t *plan,
hb_blob_t **prime /* OUT */)
@@ -602,10 +602,10 @@
hb_subset_cff1 (hb_subset_plan_t *plan,
hb_blob_t **prime /* OUT */)
{
- hb_blob_t *cff_blob = hb_sanitize_context_t().reference_table<CFF::cff> (plan->source);
+ hb_blob_t *cff_blob = hb_sanitize_context_t().reference_table<CFF::cff1> (plan->source);
const char *data = hb_blob_get_data(cff_blob, nullptr);
- OT::cff::accelerator_subset_t acc;
+ OT::cff1::accelerator_subset_t acc;
acc.init(plan->source);
bool result = likely (acc.is_valid ()) &&
_hb_subset_cff1 (acc, data, plan, prime);
diff --git a/src/hb-subset.cc b/src/hb-subset.cc
index 98401a4..bf9c399 100644
--- a/src/hb-subset.cc
+++ b/src/hb-subset.cc
@@ -272,8 +272,8 @@
case HB_OT_TAG_post:
result = _subset<const OT::post> (plan);
break;
- case HB_OT_TAG_cff:
- result = _subset<const OT::cff> (plan);
+ case HB_OT_TAG_cff1:
+ result = _subset<const OT::cff1> (plan);
break;
case HB_OT_TAG_cff2:
result = _subset<const OT::cff2> (plan);
