diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-03-27 20:59:54 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-03-27 20:59:54 +0000 |
| commit | 478ecf8db419720cded8d5c3b4f04d67b301f26a (patch) | |
| tree | e5d3d7d808bcb2d33895e53622eb884cbcdc7588 | |
| parent | 0e857862aba6e9d83ed7164e216053a8795b8fc0 (diff) | |
| parent | 2bb48590316289729cb5b2372120c768de65af74 (diff) | |
| download | gtk+-478ecf8db419720cded8d5c3b4f04d67b301f26a.tar.gz | |
Merge branch 'ngl-uninitialized-matrix' into 'master'
Ngl uninitialized matrix
See merge request GNOME/gtk!3358
| -rw-r--r-- | gsk/ngl/gsknglrenderjob.c | 13 | ||||
| -rw-r--r-- | testsuite/reftests/gtk-reftest.c | 4 |
2 files changed, 10 insertions, 7 deletions
diff --git a/gsk/ngl/gsknglrenderjob.c b/gsk/ngl/gsknglrenderjob.c index 8e4246d8b7..026f2be6e7 100644 --- a/gsk/ngl/gsknglrenderjob.c +++ b/gsk/ngl/gsknglrenderjob.c @@ -399,7 +399,6 @@ static void extract_matrix_metadata (GskNglRenderModelview *modelview) { float dummy; - graphene_matrix_t m; gsk_transform_to_matrix (modelview->transform, &modelview->matrix); @@ -428,14 +427,14 @@ extract_matrix_metadata (GskNglRenderModelview *modelview) /* TODO: 90% sure this is incorrect. But we should never hit this code * path anyway. */ graphene_vec3_init (&col1, - graphene_matrix_get_value (&m, 0, 0), - graphene_matrix_get_value (&m, 1, 0), - graphene_matrix_get_value (&m, 2, 0)); + graphene_matrix_get_value (&modelview->matrix, 0, 0), + graphene_matrix_get_value (&modelview->matrix, 1, 0), + graphene_matrix_get_value (&modelview->matrix, 2, 0)); graphene_vec3_init (&col2, - graphene_matrix_get_value (&m, 0, 1), - graphene_matrix_get_value (&m, 1, 1), - graphene_matrix_get_value (&m, 2, 1)); + graphene_matrix_get_value (&modelview->matrix, 0, 1), + graphene_matrix_get_value (&modelview->matrix, 1, 1), + graphene_matrix_get_value (&modelview->matrix, 2, 1)); modelview->scale_x = graphene_vec3_length (&col1); modelview->scale_y = graphene_vec3_length (&col2); diff --git a/testsuite/reftests/gtk-reftest.c b/testsuite/reftests/gtk-reftest.c index 7e2be7ee1d..38a2817ddf 100644 --- a/testsuite/reftests/gtk-reftest.c +++ b/testsuite/reftests/gtk-reftest.c @@ -322,12 +322,16 @@ test_ui_file (GFile *file) if (diff_image) { save_image (diff_image, ui_file, ".diff.png"); + cairo_surface_destroy (diff_image); g_test_fail (); } remove_extra_css (provider); g_free (ui_file); + + cairo_surface_destroy (ui_image); + cairo_surface_destroy (reference_image); } static int |