[cairo-commit] 2 commits - src/cairo-ft-font.c src/cairo-pattern.c

[Bryce Harrington]

 src/cairo-ft-font.c |    2 +-
 src/cairo-pattern.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 29a8b4e970379ca04a7db8e63c71bb34c0e349ce
Author: Maks Naumov <maksqwe1 at ukr.net>
Date:   Wed Aug 20 09:52:45 2014 -0700

    Fix _cairo_mesh_pattern_equal() when cairo_mesh_patch_t structs are different
    
    Signed-off-by: Maks Naumov <maksqwe1 at ukr.net>
    Reviewed-by: Bryce Harrington <bryce at osg.samsung.com>

diff --git a/src/cairo-pattern.c b/src/cairo-pattern.c
index 6905e15..e6fdae6 100644
--- a/src/cairo-pattern.c
+++ b/src/cairo-pattern.c
@@ -3911,7 +3911,7 @@ _cairo_mesh_pattern_equal (const cairo_mesh_pattern_t *a,
 
     for (i = 0; i < num_patches_a; i++) {
 	patch_a = _cairo_array_index_const (&a->patches, i);
-	patch_b = _cairo_array_index_const (&a->patches, i);
+	patch_b = _cairo_array_index_const (&b->patches, i);
 	if (memcmp (patch_a, patch_b, sizeof(cairo_mesh_patch_t)) != 0)
 	    return FALSE;
     }
commit e6bf829d8953fac82ccc80618c6cae41346e483f
Author: Maks Naumov <maksqwe1 at ukr.net>
Date:   Wed Aug 20 09:38:37 2014 -0700

    Fix font x_scale value in _compute_transform()
    
    Signed-off-by: Maks Naumov <maksqwe1 at ukr.net>
    Reviewed-by: Bryce Harrington <b.harrington at samsung.com>

diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
index 59df4fc..87e733b 100644
--- a/src/cairo-ft-font.c
+++ b/src/cairo-ft-font.c
@@ -745,7 +745,7 @@ _compute_transform (cairo_ft_font_transform_t *sf,
 	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;