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

[GX] Break out early if factor is zero

Browse Source 
Also disable sanity-checking of variation records.
This commit is contained in:
Behdad Esfahbod 2016-03-01 19:42:24 +09:00
parent ca28670316
commit a0c2366075
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/hb-ot-layout-common-private.hh
View File

@ -1244,6 +1244,8 @@ struct VariationAxis
int coord = i < coord_len ? coords[i] : 0; int coord = i < coord_len ? coords[i] : 0;
int start = startCoord, peak = peakCoord, end = endCoord; int start = startCoord, peak = peakCoord, end = endCoord;
//if (coord == 0) return 0;
//if (start < 0 && end > 0) return 0.;
if (coord < start || coord > end) return 0.; if (coord < start || coord > end) return 0.;
if (coord == peak) return 1.; if (coord == peak) return 1.;
/* Interpolate */ /* Interpolate */
@ -1275,7 +1277,12 @@ struct VariationTuple
float v = 1.; float v = 1.;
unsigned int count = axes.len; unsigned int count = axes.len;
for (unsigned int i = 0; i < count; i++) for (unsigned int i = 0; i < count; i++)
v *= (this+axes[i]).evaluate (coords, coord_len); {
float factor = (this+axes[i]).evaluate (coords, coord_len);
v *= factor;
if (factor == 0.)
break;
}
return v; return v;
} }