Fix more double-promotion errors
WHy do only some of the clang bots catch this I have no idea :(.
diff --git a/src/hb-aat-layout-trak-table.hh b/src/hb-aat-layout-trak-table.hh
index 2688270..2eace2a 100644
--- a/src/hb-aat-layout-trak-table.hh
+++ b/src/hb-aat-layout-trak-table.hh
@@ -133,8 +133,8 @@
if (size_table[size_index].to_float () >= csspx)
break;
- return round (interpolate_at (size_index ? size_index - 1 : 0, csspx,
- *trackTableEntry, base));
+ return roundf (interpolate_at (size_index ? size_index - 1 : 0, csspx,
+ *trackTableEntry, base));
}
bool sanitize (hb_sanitize_context_t *c, const void *base) const
diff --git a/src/hb-font.hh b/src/hb-font.hh
index aaa0fd9..4f5aa8a 100644
--- a/src/hb-font.hh
+++ b/src/hb-font.hh
@@ -607,7 +607,7 @@
return (hb_position_t) (scaled / upem);
}
hb_position_t em_scalef (float v, int scale)
- { return (hb_position_t) round (v * scale / face->get_upem ()); }
+ { return (hb_position_t) roundf (v * scale / face->get_upem ()); }
float em_fscale (int16_t v, int scale)
{ return (float) v * scale / face->get_upem (); }
};
diff --git a/src/hb-open-type.hh b/src/hb-open-type.hh
index 5c015af..1129bd0 100644
--- a/src/hb-open-type.hh
+++ b/src/hb-open-type.hh
@@ -110,7 +110,7 @@
F2DOT14& operator = (uint16_t i ) { HBINT16::operator= (i); return *this; }
// 16384 means 1<<14
float to_float () const { return ((int32_t) v) / 16384.f; }
- void set_float (float f) { v = round (f * 16384.f); }
+ void set_float (float f) { v = roundf (f * 16384.f); }
public:
DEFINE_SIZE_STATIC (2);
};
@@ -121,7 +121,7 @@
Fixed& operator = (uint32_t i) { HBINT32::operator= (i); return *this; }
// 65536 means 1<<16
float to_float () const { return ((int32_t) v) / 65536.f; }
- void set_float (float f) { v = round (f * 65536.f); }
+ void set_float (float f) { v = roundf (f * 65536.f); }
public:
DEFINE_SIZE_STATIC (4);
};
diff --git a/src/hb-ot-color-cbdt-table.hh b/src/hb-ot-color-cbdt-table.hh
index 96b14bd..7955cf6 100644
--- a/src/hb-ot-color-cbdt-table.hh
+++ b/src/hb-ot-color-cbdt-table.hh
@@ -442,12 +442,12 @@
}
/* Convert to font units. */
- double x_scale = upem / (double) strike.ppemX;
- double y_scale = upem / (double) strike.ppemY;
- extents->x_bearing = round (extents->x_bearing * x_scale);
- extents->y_bearing = round (extents->y_bearing * y_scale);
- extents->width = round (extents->width * x_scale);
- extents->height = round (extents->height * y_scale);
+ float x_scale = upem / (float) strike.ppemX;
+ float y_scale = upem / (float) strike.ppemY;
+ extents->x_bearing = roundf (extents->x_bearing * x_scale);
+ extents->y_bearing = roundf (extents->y_bearing * y_scale);
+ extents->width = roundf (extents->width * x_scale);
+ extents->height = roundf (extents->height * y_scale);
return true;
}
diff --git a/src/hb-ot-color-sbix-table.hh b/src/hb-ot-color-sbix-table.hh
index f9739f9..9b725c4 100644
--- a/src/hb-ot-color-sbix-table.hh
+++ b/src/hb-ot-color-sbix-table.hh
@@ -242,11 +242,11 @@
/* Convert to font units. */
if (strike_ppem)
{
- double scale = font->face->get_upem () / (double) strike_ppem;
- extents->x_bearing = round (extents->x_bearing * scale);
- extents->y_bearing = round (extents->y_bearing * scale);
- extents->width = round (extents->width * scale);
- extents->height = round (extents->height * scale);
+ float scale = font->face->get_upem () / (float) strike_ppem;
+ extents->x_bearing = roundf (extents->x_bearing * scale);
+ extents->y_bearing = roundf (extents->y_bearing * scale);
+ extents->width = roundf (extents->width * scale);
+ extents->height = roundf (extents->height * scale);
}
hb_blob_destroy (blob);
diff --git a/src/hb-ot-layout-gpos-table.hh b/src/hb-ot-layout-gpos-table.hh
index 228820a..45de781 100644
--- a/src/hb-ot-layout-gpos-table.hh
+++ b/src/hb-ot-layout-gpos-table.hh
@@ -446,8 +446,8 @@
glyph_anchor.get_anchor (c, buffer->info[glyph_pos].codepoint, &base_x, &base_y);
hb_glyph_position_t &o = buffer->cur_pos();
- o.x_offset = round (base_x - mark_x);
- o.y_offset = round (base_y - mark_y);
+ o.x_offset = roundf (base_x - mark_x);
+ o.y_offset = roundf (base_y - mark_y);
o.attach_type() = ATTACH_TYPE_MARK;
o.attach_chain() = (int) glyph_pos - (int) buffer->idx;
buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_GPOS_ATTACHMENT;
@@ -993,32 +993,32 @@
/* Main-direction adjustment */
switch (c->direction) {
case HB_DIRECTION_LTR:
- pos[i].x_advance = round (exit_x) + pos[i].x_offset;
+ pos[i].x_advance = roundf (exit_x) + pos[i].x_offset;
- d = round (entry_x) + pos[j].x_offset;
+ d = roundf (entry_x) + pos[j].x_offset;
pos[j].x_advance -= d;
pos[j].x_offset -= d;
break;
case HB_DIRECTION_RTL:
- d = round (exit_x) + pos[i].x_offset;
+ d = roundf (exit_x) + pos[i].x_offset;
pos[i].x_advance -= d;
pos[i].x_offset -= d;
- pos[j].x_advance = round (entry_x) + pos[j].x_offset;
+ pos[j].x_advance = roundf (entry_x) + pos[j].x_offset;
break;
case HB_DIRECTION_TTB:
- pos[i].y_advance = round (exit_y) + pos[i].y_offset;
+ pos[i].y_advance = roundf (exit_y) + pos[i].y_offset;
- d = round (entry_y) + pos[j].y_offset;
+ d = roundf (entry_y) + pos[j].y_offset;
pos[j].y_advance -= d;
pos[j].y_offset -= d;
break;
case HB_DIRECTION_BTT:
- d = round (exit_y) + pos[i].y_offset;
+ d = roundf (exit_y) + pos[i].y_offset;
pos[i].y_advance -= d;
pos[i].y_offset -= d;
- pos[j].y_advance = round (entry_y);
+ pos[j].y_advance = roundf (entry_y);
break;
case HB_DIRECTION_INVALID:
default:
