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

[justify] Fix compiler warnings

This commit is contained in:
Behdad Esfahbod 2023-03-02 10:38:12 -07:00
parent be64cae164
commit 7897173870
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/hb-shape.cc
View File

@ -324,9 +324,9 @@ hb_shape_justify (hb_font_t *font,
double a, b, ya, yb; double a, b, ya, yb;
if (*advance < min_target_advance) if (*advance < min_target_advance)
{ {
ya = *advance; ya = (double) *advance;
a = axis_info.default_value; a = (double) axis_info.default_value;
b = axis_info.max_value; b = (double) axis_info.max_value;
hb_font_set_variation (font, tag, (float) b); hb_font_set_variation (font, tag, (float) b);
reset_buffer (buffer, text); reset_buffer (buffer, text);
@ -334,7 +334,7 @@ hb_shape_justify (hb_font_t *font,
features, num_features, features, num_features,
shaper_list)) shaper_list))
return false; return false;
yb = buffer_advance (buffer); yb = (double) buffer_advance (buffer);
if (yb <= 0) if (yb <= 0)
{ {
*advance = (float) yb; *advance = (float) yb;
@ -343,9 +343,9 @@ hb_shape_justify (hb_font_t *font,
} }
else else
{ {
yb = *advance; yb = (double) *advance;
a = axis_info.min_value; a = (double) axis_info.min_value;
b = axis_info.default_value; b = (double) axis_info.default_value;
hb_font_set_variation (font, tag, (float) a); hb_font_set_variation (font, tag, (float) a);
reset_buffer (buffer, text); reset_buffer (buffer, text);
@ -353,7 +353,7 @@ hb_shape_justify (hb_font_t *font,
features, num_features, features, num_features,
shaper_list)) shaper_list))
return false; return false;
ya = buffer_advance (buffer); ya = (double) buffer_advance (buffer);
if (ya >= 0) if (ya >= 0)
{ {
*advance = (float) ya; *advance = (float) ya;
@ -376,7 +376,7 @@ hb_shape_justify (hb_font_t *font,
return (double) min_target_advance; return (double) min_target_advance;
} }
double w = buffer_advance (buffer); double w = (double) buffer_advance (buffer);
DEBUG_MSG (JUSTIFY, nullptr, "Trying '%c%c%c%c' axis parameter %f. Advance %g. Target: min %g max %g", DEBUG_MSG (JUSTIFY, nullptr, "Trying '%c%c%c%c' axis parameter %f. Advance %g. Target: min %g max %g",
HB_UNTAG (tag), x, w, HB_UNTAG (tag), x, w,
(double) min_target_advance, (double) max_target_advance); (double) min_target_advance, (double) max_target_advance);
@ -387,7 +387,7 @@ hb_shape_justify (hb_font_t *font,
double itp = solve_itp (f, double itp = solve_itp (f,
a, b, a, b,
epsilon, epsilon,
min_target_advance, max_target_advance, (double) min_target_advance, (double) max_target_advance,
ya, yb, y); ya, yb, y);
hb_free (text_info); hb_free (text_info);