diff --git a/Lib/fontTools/misc/fixedTools.py b/Lib/fontTools/misc/fixedTools.py index 864e6313f..919b2b4fc 100644 --- a/Lib/fontTools/misc/fixedTools.py +++ b/Lib/fontTools/misc/fixedTools.py @@ -47,9 +47,9 @@ def fixedToFloat(value, precisionBits): def floatToFixed(value, precisionBits): """Converts a float to a fixed-point number given the number of - precisionBits. Ie. int(round(value * (1<l", int(round(f * 65536))) + return b"\xff" + pack(">l", round(f * 65536)) def encodeFloat(f): # For CFF only, used in cffLib diff --git a/Lib/fontTools/subset/__init__.py b/Lib/fontTools/subset/__init__.py index c16b680a5..14af6797b 100644 --- a/Lib/fontTools/subset/__init__.py +++ b/Lib/fontTools/subset/__init__.py @@ -2890,7 +2890,7 @@ class Subsetter(object): log.info("%s Unicode ranges pruned: %s", tag, sorted(new_uniranges)) if self.options.recalc_average_width: widths = [m[0] for m in font["hmtx"].metrics.values() if m[0] > 0] - avg_width = int(round(sum(widths) / len(widths))) + avg_width = round(sum(widths) / len(widths)) if avg_width != font[tag].xAvgCharWidth: font[tag].xAvgCharWidth = avg_width log.info("%s xAvgCharWidth updated: %d", tag, avg_width) diff --git a/Lib/fontTools/ttLib/tables/O_S_2f_2.py b/Lib/fontTools/ttLib/tables/O_S_2f_2.py index 6bd666f9e..3e2c30c94 100644 --- a/Lib/fontTools/ttLib/tables/O_S_2f_2.py +++ b/Lib/fontTools/ttLib/tables/O_S_2f_2.py @@ -149,8 +149,8 @@ class table_O_S_2f_2(DefaultTable.DefaultTable): data = sstruct.pack(OS2_format_2, self) elif self.version == 5: d = self.__dict__.copy() - d['usLowerOpticalPointSize'] = int(round(self.usLowerOpticalPointSize * 20)) - d['usUpperOpticalPointSize'] = int(round(self.usUpperOpticalPointSize * 20)) + d['usLowerOpticalPointSize'] = round(self.usLowerOpticalPointSize * 20) + d['usUpperOpticalPointSize'] = round(self.usUpperOpticalPointSize * 20) data = sstruct.pack(OS2_format_5, d) else: from fontTools import ttLib diff --git a/Lib/fontTools/ttLib/tables/_g_l_y_f.py b/Lib/fontTools/ttLib/tables/_g_l_y_f.py index 9dc0b3214..52117129f 100644 --- a/Lib/fontTools/ttLib/tables/_g_l_y_f.py +++ b/Lib/fontTools/ttLib/tables/_g_l_y_f.py @@ -1079,8 +1079,8 @@ class GlyphComponent(object): data = data + struct.pack(">HH", self.firstPt, self.secondPt) flags = flags | ARG_1_AND_2_ARE_WORDS else: - x = int(round(self.x)) - y = int(round(self.y)) + x = round(self.x) + y = round(self.y) flags = flags | ARGS_ARE_XY_VALUES if (-128 <= x <= 127) and (-128 <= y <= 127): data = data + struct.pack(">bb", x, y) @@ -1242,7 +1242,7 @@ class GlyphCoordinates(object): return a = array.array("h") for n in self._a: - a.append(int(round(n))) + a.append(round(n)) self._a = a def relativeToAbsolute(self): diff --git a/Lib/fontTools/ttLib/tables/_h_m_t_x.py b/Lib/fontTools/ttLib/tables/_h_m_t_x.py index 0e02c146a..6673f4aa3 100644 --- a/Lib/fontTools/ttLib/tables/_h_m_t_x.py +++ b/Lib/fontTools/ttLib/tables/_h_m_t_x.py @@ -78,14 +78,14 @@ class table__h_m_t_x(DefaultTable.DefaultTable): lastIndex = 1 break additionalMetrics = metrics[lastIndex:] - additionalMetrics = [int(round(sb)) for _, sb in additionalMetrics] + additionalMetrics = [round(sb) for _, sb in additionalMetrics] metrics = metrics[:lastIndex] numberOfMetrics = len(metrics) setattr(ttFont[self.headerTag], self.numberOfMetricsName, numberOfMetrics) allMetrics = [] for advance, sb in metrics: - allMetrics.extend([int(round(advance)), int(round(sb))]) + allMetrics.extend([round(advance), round(sb)]) metricsFmt = ">" + self.longMetricFormat * numberOfMetrics try: data = struct.pack(metricsFmt, *allMetrics) diff --git a/Lib/fontTools/ttLib/tables/otConverters.py b/Lib/fontTools/ttLib/tables/otConverters.py index 2ef1cfc36..952501dca 100644 --- a/Lib/fontTools/ttLib/tables/otConverters.py +++ b/Lib/fontTools/ttLib/tables/otConverters.py @@ -307,7 +307,7 @@ class DeciPoints(FloatValue): return reader.readUShort() / 10 def write(self, writer, font, tableDict, value, repeatIndex=None): - writer.writeUShort(int(round(value * 10))) + writer.writeUShort(round(value * 10)) class Fixed(FloatValue): staticSize = 4 diff --git a/Lib/fontTools/ttLib/tables/otData.py b/Lib/fontTools/ttLib/tables/otData.py index 6ba41fc62..278650355 100755 --- a/Lib/fontTools/ttLib/tables/otData.py +++ b/Lib/fontTools/ttLib/tables/otData.py @@ -1459,7 +1459,7 @@ otData = [ ]), # If the 'morx' table version is 3 or greater, then the last subtable in the chain is followed by a subtableGlyphCoverageArray, as described below. - # ('Offset', 'MarkGlyphSetsDef', None, 'int(round(Version*0x10000)) >= 0x00010002', 'Offset to the table of mark set definitions-from beginning of GDEF header (may be NULL)'), + # ('Offset', 'MarkGlyphSetsDef', None, 'round(Version*0x10000) >= 0x00010002', 'Offset to the table of mark set definitions-from beginning of GDEF header (may be NULL)'), # diff --git a/Lib/fontTools/varLib/__init__.py b/Lib/fontTools/varLib/__init__.py index 610b2fac8..a6d345e3f 100644 --- a/Lib/fontTools/varLib/__init__.py +++ b/Lib/fontTools/varLib/__init__.py @@ -371,7 +371,7 @@ def _merge_TTHinting(font, model, master_ttfs, tolerance=0.5): deltas = model.getDeltas(all_cvs) supports = model.supports for i,(delta,support) in enumerate(zip(deltas[1:], supports[1:])): - delta = [int(round(d)) for d in delta] + delta = [round(d) for d in delta] if all(abs(v) <= tolerance for v in delta): continue var = TupleVariation(support, delta) diff --git a/Lib/fontTools/varLib/interpolatable.py b/Lib/fontTools/varLib/interpolatable.py index 41f91c3e9..d4feed277 100644 --- a/Lib/fontTools/varLib/interpolatable.py +++ b/Lib/fontTools/varLib/interpolatable.py @@ -146,7 +146,7 @@ def test(glyphsets, glyphs=None, names=None): print('%s: %s+%s: Glyph has wrong contour/component order: %s' % (glyph_name, names[i], names[i+1], matching)) #, m0, m1) break upem = 2048 - item_cost = int(round((matching_cost / len(m0) / len(m0[0])) ** .5 / upem * 100)) + item_cost = round((matching_cost / len(m0) / len(m0[0])) ** .5 / upem * 100) hist.append(item_cost) threshold = 7 if item_cost >= threshold: diff --git a/Lib/fontTools/varLib/merger.py b/Lib/fontTools/varLib/merger.py index 3b28699e8..80f959ea5 100644 --- a/Lib/fontTools/varLib/merger.py +++ b/Lib/fontTools/varLib/merger.py @@ -727,7 +727,7 @@ def merge(merger, self, lst): assert dev.DeltaFormat == 0x8000 varidx = (dev.StartSize << 16) + dev.EndSize - delta = int(round(instancer[varidx])) + delta = round(instancer[varidx]) attr = v+'Coordinate' setattr(self, attr, getattr(self, attr) + delta) @@ -750,7 +750,7 @@ def merge(merger, self, lst): assert dev.DeltaFormat == 0x8000 varidx = (dev.StartSize << 16) + dev.EndSize - delta = int(round(instancer[varidx])) + delta = round(instancer[varidx]) setattr(self, name, getattr(self, name) + delta) diff --git a/Lib/fontTools/varLib/mutator.py b/Lib/fontTools/varLib/mutator.py index e86272749..73d5fe171 100644 --- a/Lib/fontTools/varLib/mutator.py +++ b/Lib/fontTools/varLib/mutator.py @@ -87,7 +87,7 @@ def instantiateVariableFont(varfont, location, inplace=False): if c is not None: deltas[i] = deltas.get(i, 0) + scalar * c for i, delta in deltas.items(): - cvt[i] += int(round(delta)) + cvt[i] += round(delta) if 'MVAR' in varfont: log.info("Mutating MVAR table") @@ -99,7 +99,7 @@ def instantiateVariableFont(varfont, location, inplace=False): if mvarTag not in MVAR_entries: continue tableTag, itemName = MVAR_entries[mvarTag] - delta = int(round(varStoreInstancer[rec.VarIdx])) + delta = round(varStoreInstancer[rec.VarIdx]) if not delta: continue setattr(varfont[tableTag], itemName, diff --git a/Lib/fontTools/varLib/varStore.py b/Lib/fontTools/varLib/varStore.py index 63b4a1774..985aa2580 100644 --- a/Lib/fontTools/varLib/varStore.py +++ b/Lib/fontTools/varLib/varStore.py @@ -49,7 +49,7 @@ class OnlineVarStoreBuilder(object): return self._store def storeMasters(self, master_values): - deltas = [int(round(d)) for d in self._model.getDeltas(master_values)] + deltas = [round(d) for d in self._model.getDeltas(master_values)] base = deltas.pop(0) inner = len(self._data.Item) self._data.Item.append(deltas)