Bug 1287552 - part 1 - backport upstream Cairo fix for computing transform of bitmap fonts. r?jrmuizel draft
authorLee Salzman <lsalzman@mozilla.com>
Mon, 18 Jul 2016 15:27:40 -0400
changeset 389229 b19518a894db6b1bb11e22cd665352833a407cb9
parent 387623 08f8a5aacd8308a73f6040fe522be7ba38497561
child 389230 a9a8957855f5d7cee90e0a092a6e96d924e1ba1b
push id23325
push userbmo:lsalzman@mozilla.com
push dateMon, 18 Jul 2016 19:31:04 +0000
reviewersjrmuizel
bugs1287552
milestone50.0a1
Bug 1287552 - part 1 - backport upstream Cairo fix for computing transform of bitmap fonts. r?jrmuizel MozReview-Commit-ID: GFHoPOJEaxG
gfx/cairo/cairo/src/cairo-ft-font.c
--- a/gfx/cairo/cairo/src/cairo-ft-font.c
+++ b/gfx/cairo/cairo/src/cairo-ft-font.c
@@ -736,17 +736,17 @@ static cairo_status_t
 	double min_distance = DBL_MAX;
 	cairo_bool_t magnify = TRUE;
 	int i;
 	int best_i = 0;
 	double best_x_size = 0;
 	double best_y_size = 0;
 
 	for (i = 0; i < unscaled->face->num_fixed_sizes; i++) {
-	    double x_size = unscaled->face->available_sizes[i].y_ppem / 64.;
+	    double x_size = unscaled->face->available_sizes[i].x_ppem / 64.;
 	    double y_size = unscaled->face->available_sizes[i].y_ppem / 64.;
 	    double distance = y_size - y_scale;
 
 	    /*
 	     * distance is positive if current strike is larger than desired
 	     * size, and negative if smaller.
 	     *
 	     * We like to prefer down-scaling to upscaling.