summaryrefslogtreecommitdiff
path: root/Build/source/texk/lcdf-typetools/libefont/otf.cc
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/lcdf-typetools/libefont/otf.cc')
-rw-r--r--Build/source/texk/lcdf-typetools/libefont/otf.cc52
1 files changed, 26 insertions, 26 deletions
diff --git a/Build/source/texk/lcdf-typetools/libefont/otf.cc b/Build/source/texk/lcdf-typetools/libefont/otf.cc
index 80702ee2901..c62d7ebf5e4 100644
--- a/Build/source/texk/lcdf-typetools/libefont/otf.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/otf.cc
@@ -42,7 +42,7 @@ Font::Font(const String &s, ErrorHandler *errh)
: _str(s)
{
_str.align(4);
- _error = parse_header(errh ? errh : ErrorHandler::ignore_handler());
+ _error = parse_header(errh ? errh : ErrorHandler::silent_handler());
}
int
@@ -84,7 +84,7 @@ Font::parse_header(ErrorHandler *errh)
return errh->error("OTF data for '%s' out of range", Tag(tag).text().c_str()), -EFAULT;
last_tag = tag;
}
-
+
return 0;
}
@@ -136,7 +136,7 @@ uint32_t
Font::table_checksum(Tag tag) const
{
if (error() < 0)
- return String();
+ return 0;
const uint8_t *entry = tag.table_entry(data() + HEADER_SIZE, USHORT_AT(data() + 4), TABLE_DIR_ENTRY_SIZE);
if (entry)
return ULONG_AT(entry + 4);
@@ -168,7 +168,7 @@ Font::checksum(const uint8_t *begin, const uint8_t *end)
leftover = (leftover << 8) + (begin < end ? *begin++ : 0);
return sum + leftover;
}
-
+
uint32_t
Font::checksum(const String &s)
{
@@ -220,7 +220,7 @@ Font::make(bool truetype, const Vector<Tag>& tags, const Vector<String>& data)
uint32_t l[TABLE_DIR_ENTRY_SIZE / 4];
} tdir;
tdir.l[0] = htonl(tags[*tp].value());
-
+
// discount current checksum adjustment in head table
uint32_t sum = checksum(data[*tp]);
if (tags[*tp] == Tag("head") && data[*tp].length() >= 12) {
@@ -228,7 +228,7 @@ Font::make(bool truetype, const Vector<Tag>& tags, const Vector<String>& data)
sum -= (x[0] << 24) + (x[1] << 16) + (x[2] << 8) + x[3];
}
tdir.l[1] = htonl(sum);
-
+
tdir.l[2] = htonl(offset);
tdir.l[3] = htonl(data[*tp].length());
sa.append(&tdir.c[0], TABLE_DIR_ENTRY_SIZE);
@@ -364,7 +364,7 @@ ScriptList::assign(const String &str, ErrorHandler *errh)
{
_str = str;
_str.align(4);
- int result = check_header(errh ? errh : ErrorHandler::ignore_handler());
+ int result = check_header(errh ? errh : ErrorHandler::silent_handler());
if (result < 0)
_str = String();
return result;
@@ -446,7 +446,7 @@ ScriptList::language_systems(Vector<Tag> &script, Vector<Tag> &langsys, ErrorHan
{
script.clear();
langsys.clear();
-
+
const uint8_t *data = _str.udata();
int nscripts = USHORT_AT(data);
for (int i = 0; i < nscripts; i++) {
@@ -463,7 +463,7 @@ ScriptList::language_systems(Vector<Tag> &script, Vector<Tag> &langsys, ErrorHan
script.push_back(script_tag), langsys.push_back(langsys_tag);
}
}
-
+
return 0;
}
@@ -473,7 +473,7 @@ ScriptList::features(Tag script, Tag langsys, int &required_fid, Vector<int> &fi
required_fid = -1;
if (clear_fids)
fids.clear();
-
+
int offset = langsys_offset(script, langsys);
if (offset <= 0)
return offset;
@@ -493,7 +493,7 @@ ScriptList::features(Tag script, Tag langsys, int &required_fid, Vector<int> &fi
data += offset + 6;
for (int i = 0; i < featureCount; i++, data += FEATURE_RECSIZE)
fids.push_back(USHORT_AT(data));
-
+
return 0;
}
@@ -509,7 +509,7 @@ FeatureList::assign(const String &str, ErrorHandler *errh)
{
_str = str;
_str.align(2);
- int result = check_header(errh ? errh : ErrorHandler::ignore_handler());
+ int result = check_header(errh ? errh : ErrorHandler::silent_handler());
if (result < 0)
_str = String();
return result;
@@ -545,7 +545,7 @@ FeatureList::params(int fid, int length, ErrorHandler *errh, bool old_style_offs
if (_str.length() == 0 || length < 0)
return String();
if (errh == 0)
- errh = ErrorHandler::ignore_handler();
+ errh = ErrorHandler::silent_handler();
const uint8_t *data = _str.udata();
int len = _str.length();
@@ -629,13 +629,13 @@ FeatureList::filter(Vector<int> &fids, const Vector<Tag> &sorted_ftags) const
fids.clear();
else {
std::sort(fids.begin(), fids.end()); // sort fids
-
+
int i = 0, j = 0;
while (i < fids.size() && fids[i] < 0)
fids[i++] = 0x7FFFFFFF;
// XXX check that feature list is in alphabetical order
-
+
const uint8_t *data = _str.udata();
int nfeatures = USHORT_AT(data);
while (i < fids.size() && j < sorted_ftags.size() && fids[i] < nfeatures) {
@@ -665,7 +665,7 @@ FeatureList::lookups(int fid, Vector<int> &results, ErrorHandler *errh, bool cle
if (_str.length() == 0)
return -1;
if (errh == 0)
- errh = ErrorHandler::ignore_handler();
+ errh = ErrorHandler::silent_handler();
const uint8_t *data = _str.udata();
int len = _str.length();
@@ -766,7 +766,7 @@ Coverage::Coverage(const String &str, ErrorHandler *errh, bool do_check) throw (
{
_str.align(2);
if (do_check) {
- if (check(errh ? errh : ErrorHandler::ignore_handler()) < 0)
+ if (check(errh ? errh : ErrorHandler::silent_handler()) < 0)
_str = String();
} else { // check()'s shorten-string side effect
const uint8_t *data = _str.udata();
@@ -834,7 +834,7 @@ Coverage::coverage_index(Glyph g) const throw ()
{
if (_str.length() == 0)
return -1;
-
+
const uint8_t *data = _str.udata();
int count = USHORT_AT(data + 2);
if (data[1] == T_LIST) {
@@ -874,7 +874,7 @@ Coverage::operator[](int cindex) const throw ()
{
if (_str.length() == 0 || cindex < 0)
return 0;
-
+
const uint8_t *data = _str.udata();
int count = USHORT_AT(data + 2);
if (data[1] == T_LIST)
@@ -1026,7 +1026,7 @@ bool
Coverage::iterator::forward_to(Glyph find)
{
// XXX really should check that this works
-
+
if (find <= _value)
return find == _value;
else if (_pos >= _str.length())
@@ -1042,7 +1042,7 @@ Coverage::iterator::forward_to(Glyph find)
_value = USHORT_AT(data + _pos);
return find == _value;
}
-
+
// otherwise, binary search over remaining area
int l = ((_pos - HEADERSIZE) / LIST_RECSIZE) + 1;
int r = (_str.length() - HEADERSIZE) / LIST_RECSIZE - 1;
@@ -1166,7 +1166,7 @@ ClassDef::ClassDef(const String &str, ErrorHandler *errh) throw ()
: _str(str)
{
_str.align(2);
- if (check(errh ? errh : ErrorHandler::ignore_handler()) < 0)
+ if (check(errh ? errh : ErrorHandler::silent_handler()) < 0)
_str = String();
}
@@ -1206,10 +1206,10 @@ ClassDef::lookup(Glyph g) const throw ()
{
if (_str.length() == 0)
return -1;
-
+
const uint8_t *data = _str.udata();
int coverageFormat = USHORT_AT(data);
-
+
if (coverageFormat == T_LIST) {
Glyph start = USHORT_AT(data + 2);
int count = USHORT_AT(data + 4);
@@ -1331,7 +1331,7 @@ ClassDef::class_iterator::increment_class0()
const uint8_t *data = _str.udata();
int len = _str.length();
bool is_list = (data[1] == T_LIST);
-
+
if (_pos != 0)
_coviter++;
else
@@ -1377,7 +1377,7 @@ ClassDef::class_iterator::operator++(int)
increment_class0();
return;
}
-
+
const uint8_t *data = _str.udata();
int len = _str.length();
bool is_list = (data[1] == T_LIST);